Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b1d1885 authored by theronakpatel's avatar theronakpatel
Browse files

help patch

parent 7262df97

HelpController-new.php

0 → 100644
+61 −0
Original line number Original line Diff line number Diff line 
.help-includes {

	overflow: hidden !important;

}



.help-list__link {

	display: flex;

	align-items: center;

	height: var(--default-clickable-area);

	margin: 0 8px;

	background-position: left center;

}



.help-list__text {

	margin-left: 20px;

}



.help-iframe {

	width: 100%;

	height: 100%;

	margin: 0;

	padding: 0;

	border: 0;

	overflow: auto;

}



.help-wrapper {

	display: flex;

	justify-content: center;

	align-items: center;

	height: 100%;

	width: 100%;

}



.help-content__heading {

	text-align: center;

	padding: 20px;

}



.help-content {

	display: block;

	padding: 20px;

}



.help-content__body {

	display: flex;

	justify-content: center;

	align-items: center;

	flex-wrap: wrap;

}



.help-content__body > .button {

	margin: 20px;

}

#content #app-navigation {

       transform: none;   

       width: max-content;

}



#app-navigation:not(.vue) > ul > li > a {

       padding: 0 12px 0 44px;

}
 
 No newline at end of file

HelpController.patch

0 → 100644
+16 −0
Original line number Original line Diff line number Diff line 
--- HelpController.php	2025-03-07 11:20:41

+++ HelpController-new.php	2025-03-07 11:20:56

@@ -50,4 +50,12 @@

 

 .help-content__body > .button {

 	margin: 20px;

+}

+#content #app-navigation {

+       transform: none;   

+       width: max-content;

+}

+

+#app-navigation:not(.vue) > ul > li > a {

+       padding: 0 12px 0 44px;

 }

\ No newline at end of file

HelpController.php

0 → 100644
+53 −0
Original line number Original line Diff line number Diff line 
.help-includes {

	overflow: hidden !important;

}



.help-list__link {

	display: flex;

	align-items: center;

	height: var(--default-clickable-area);

	margin: 0 8px;

	background-position: left center;

}



.help-list__text {

	margin-left: 20px;

}



.help-iframe {

	width: 100%;

	height: 100%;

	margin: 0;

	padding: 0;

	border: 0;

	overflow: auto;

}



.help-wrapper {

	display: flex;

	justify-content: center;

	align-items: center;

	height: 100%;

	width: 100%;

}



.help-content__heading {

	text-align: center;

	padding: 20px;

}



.help-content {

	display: block;

	padding: 20px;

}



.help-content__body {

	display: flex;

	justify-content: center;

	align-items: center;

	flex-wrap: wrap;

}



.help-content__body > .button {

	margin: 20px;

}
 
 No newline at end of file

patches/009-help-links.patch

+36 −42
Original line number Original line Diff line number Diff line 
From: Akhil <akhil@e.email>

From: Ronak <ronak.patel@e.email>

Date: Thu, 10 Aug 2021 17:30:00 +0530

Date: Fri, 07 March 2025 17:30:00 +0530

Subject: [PATCH] Changes help links to point to the correct links

Subject: [PATCH] Changes help links to point to the correct links





This patch adds changes to the "Settings" app's help template, controller and stylesheet to make sure the correct

This patch updated/adds changes to the "Settings" app's help template, controller and stylesheet to make sure the correct

help links are shown

help links are shown





--- ./apps/settings/lib/Controller/HelpController.php	2024-07-25 16:11:57 +0530

--- ./apps/settings/lib/Controller/HelpController.php	2025-03-07 11:04:18

+++ ./apps/settings/lib/Controller/HelpController-new.php	2024-07-25 16:12:51 +0530

+++ ./apps/settings/lib/Controller/HelpController-new.php	2025-03-07 11:04:21

@@ -114,6 +114,7 @@

@@ -123,6 +123,7 @@

 			'urlAdminDocs' => $urlAdminDocs,

 			'urlAdminDocs' => $urlAdminDocs,

 			'mode' => $mode,

 			'mode' => $mode,

 			'pageTitle' => $pageTitle,

 			'pageTitle' => $pageTitle,

+			'ncVersion' => \OCP\Util::getVersion()[0],

+			'ncVersion' => \OCP\Util::getVersion()[0],

 			'knowledgebaseEmbedded' => $knowledgebaseEmbedded,

 			'knowledgebaseEmbedded' => $knowledgebaseEmbedded,

 		]);

 			'legalNoticeUrl' => $legalNoticeUrl,

 		$policy = new ContentSecurityPolicy()

 			'privacyUrl' => $privacyUrl,

--- ./apps/settings/templates/help.php	2024-07-25 16:17:46 +0530

--- /apps/settings/templates/help.php	2025-03-07 11:09:00

+++ ./apps/settings/templates/help-new.php	2024-07-25 17:13:16 +0530

+++ /apps/settings/templates/help-new.php	2025-03-07 11:19:01

@@ -5,72 +5,49 @@

@@ -5,72 +5,45 @@

 	<div id="app-navigation" role="navigation" tabindex="0">

 	<div id="app-navigation" role="navigation" tabindex="0">

 		<ul>

 		<ul>

 			<li>

 			<li>
@@ -30,13 +30,12 @@ help links are shown 
+				<a class="icon-user"

+				<a class="icon-user"

+					href="https://docs.nextcloud.com/server/<?php print_unescaped($_['ncVersion']); ?>/user_manual/en/" target="_blank" rel="noreferrer noopener">

+					href="https://docs.nextcloud.com/server/<?php print_unescaped($_['ncVersion']); ?>/user_manual/en/" target="_blank" rel="noreferrer noopener">

 					<span class="help-list__text">

 					<span class="help-list__text">

-						<?php p($l->t('User documentation')); ?>

-						<?php p($l->t('Account documentation')); ?>

+						<?php p('Nextcloud ' . $_['ncVersion'] . ' ' . $l->t('User documentation')); ?> ↗

+						<?php p('Nextcloud ' . $_['ncVersion'] . ' ' . $l->t('User documentation')); ?> ↗

 					</span>

 					</span>

 				</a>

 				</a>

 			</li>

 			</li>

-		<?php if ($_['admin']) { ?>

-		<?php if ($_['admin']) { ?>

+		

 			<li>

 			<li>

-				<a class="help-list__link icon-user-admin <?php if ($_['mode'] === 'admin') {

-				<a class="help-list__link icon-user-admin <?php if ($_['mode'] === 'admin') {

-					p('active');

-					p('active');
@@ -44,38 +43,32 @@ help links are shown 
-					print_unescaped('aria-current="page"');

-					print_unescaped('aria-current="page"');

-				} ?>

-				} ?>

-					href="<?php print_unescaped($_['urlAdminDocs']); ?>">

-					href="<?php print_unescaped($_['urlAdminDocs']); ?>">

-					<span class="help-list__text">

-						<?php p($l->t('Administrator documentation')); ?>

-					</span>

+				<a href="https://doc.e.foundation/support-topics/e-cloud-e-email-account" class="icon-category-office" target="_blank" rel="noreferrer noopener">

+				<a href="https://doc.e.foundation/support-topics/e-cloud-e-email-account" class="icon-category-office" target="_blank" rel="noreferrer noopener">

+						<span class="help-list__text">

 					<span class="help-list__text">

-						<?php p($l->t('Administration documentation')); ?>

+						<?php p('/e/' . ' ' . $l->t('Documentation'));  ?>

+						<?php p('/e/' . ' ' . $l->t('Documentation'));  ?>

+						</span>

 					</span>

 				</a>

 				</a>

 			</li>

 			</li>

-		<?php } ?>

-		<?php } ?>

+	

-

 

 			<li>

 			<li>

-				<a href="https://docs.nextcloud.com" class="help-list__link icon-category-office" target="_blank" rel="noreferrer noopener">

-				<a href="https://docs.nextcloud.com" class="help-list__link icon-category-office" target="_blank" rel="noreferrer noopener">

-					<span class="help-list__text">

+				<a href="https://community.e.foundation" class="icon-comment" target="_blank" rel="noreferrer noopener">

 					<span class="help-list__text">

-						<?php p($l->t('Documentation')); ?> ↗

-						<?php p($l->t('Documentation')); ?> ↗

-					</span>

-					</span>

+				<a href="https://community.e.foundation" class="icon-comment" target="_blank" rel="noreferrer noopener">

-				</a>

+						<span class="help-list__text">

-			</li>

+								<?php p($l->t('Forum')); ?> ↗

+						</span>

 				</a>

 			</li>

-			<li>

-			<li>

-				<a href="https://help.nextcloud.com" class="help-list__link icon-comment" target="_blank" rel="noreferrer noopener">

-				<a href="https://help.nextcloud.com" class="help-list__link icon-comment" target="_blank" rel="noreferrer noopener">

-					<span class="help-list__text">

-					<span class="help-list__text">

-						<?php p($l->t('Forum')); ?> ↗

 						<?php p($l->t('Forum')); ?> ↗

-					</span>

 					</span>

-				</a>

 				</a>

-			</li>

 			</li>

 	</div>

 	</div>

 

-

-	<div id="app-content" class="help-includes">

-	<div id="app-content" class="help-includes">

-		<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe" tabindex="0">

-		<iframe src="<?php print_unescaped($_['url']); ?>" class="help-iframe" tabindex="0">

-		</iframe>

-		</iframe>
@@ -85,7 +78,7 @@ help links are shown 
 		<div class="help-wrapper">

 		<div class="help-wrapper">

 			<div class="help-content">

 			<div class="help-content">

 				<h2 class="help-content__heading">

 				<h2 class="help-content__heading">

-					<?php p($l->t('Nextcloud help resources')); ?>

-					<?php p($l->t('Nextcloud help & privacy resources')); ?>

+					<?php p($l->t('Murena Workspace help resources')); ?>

+					<?php p($l->t('Murena Workspace help resources')); ?>

 				</h2>

 				</h2>

 				<div class="help-content__body">

 				<div class="help-content__body">
@@ -108,14 +101,14 @@ help links are shown 
+				<a href="https://community.e.foundation" class="button" target="_blank" rel="noreferrer noopener">

+				<a href="https://community.e.foundation" class="button" target="_blank" rel="noreferrer noopener">

 					<?php p($l->t('Forum')); ?> ↗

 					<?php p($l->t('Forum')); ?> ↗

 				</a>

 				</a>

 			</div>

 				<?php if ($_['legalNoticeUrl']) { ?>

--- ./apps/settings/css/help.css    2021-08-20 14:16:57.951439620 +0530

--- ./apps/settings/css/help.css    2021-08-20 14:16:57.951439620 +0530

+++ ./apps/settings/css/help-new.css        2021-08-20 17:02:43.549016337 +0530

+++ ./apps/settings/css/help-new.css        2021-08-20 17:02:43.549016337 +0530

@@ -10,3 +10,12 @@

@@ -50,4 +50,12 @@

        border: 0;

 

        overflow: auto;

 .help-content__body > .button {

 }

 	margin: 20px;

+

+}

+#content #app-navigation {

+#content #app-navigation {

+       transform: none;   

+       transform: none;   

+       width: max-content;

+       width: max-content;
@@ -123,4 +116,5 @@ help links are shown 
+

+

+#app-navigation:not(.vue) > ul > li > a {

+#app-navigation:not(.vue) > ul > li > a {

+       padding: 0 12px 0 44px;

+       padding: 0 12px 0 44px;

+}
 
 }