Parcourir la source

added link and option for new feature request site to replace feathub

CauseFX il y a 5 ans
Parent
commit
f5355397e8
5 fichiers modifiés avec 55 ajouts et 10 suppressions
  1. 8 1
      api/classes/organizr.class.php
  2. 1 0
      api/config/default.php
  3. 4 1
      css/organizr.css
  4. 0 0
      css/organizr.min.css
  5. 42 8
      js/functions.js

+ 8 - 1
api/classes/organizr.class.php

@@ -1301,6 +1301,12 @@ class Organizr
 					'label' => 'Show GitHub Repo Link',
 					'value' => $this->config['githubMenuLink']
 				),
+				array(
+					'type' => 'switch',
+					'name' => 'organizrFeatureRequestLink',
+					'label' => 'Show Organizr Feature Request Link',
+					'value' => $this->config['organizrFeatureRequestLink']
+				),
 				array(
 					'type' => 'switch',
 					'name' => 'organizrSupportMenuLink',
@@ -3481,7 +3487,8 @@ class Organizr
 				'githubMenuLink' => $this->config['githubMenuLink'],
 				'organizrSupportMenuLink' => $this->config['organizrSupportMenuLink'],
 				'organizrDocsMenuLink' => $this->config['organizrDocsMenuLink'],
-				'organizrSignoutMenuLink' => $this->config['organizrSignoutMenuLink']
+				'organizrSignoutMenuLink' => $this->config['organizrSignoutMenuLink'],
+				'organizrFeatureRequestLink' => $this->config['organizrFeatureRequestLink']
 			)
 		);
 	}

+ 1 - 0
api/config/default.php

@@ -453,6 +453,7 @@ return array(
 	'organizrSupportMenuLink' => true,
 	'organizrDocsMenuLink' => true,
 	'organizrSignoutMenuLink' => true,
+	'organizrFeatureRequestLink' => true,
 	'breezometerToken' => 'd95ab607392d4fa5bf64bb26a5cb2a06',
 	'customForgotPasswordText' => '',
 	'disableRecoverPassword' => false

+ 4 - 1
css/organizr.css

@@ -1192,6 +1192,9 @@ ul.nav.customtab.nav-tabs.nav-low-margin {
 #menu-Organizr-Docs i {
     color: #707cd2;
 }
+#menu-Feature-Request i {
+    color: #2cabe3;
+}
 .ping {
     position: relative;
     margin-top: 0;
@@ -4548,4 +4551,4 @@ html {
     background: #1f1f1f;
     padding-right: 0px !important;
     padding-left: 0px !important;
-}
+}

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
css/organizr.min.css


+ 42 - 8
js/functions.js

@@ -2665,14 +2665,48 @@ function userMenu(user){
 	console.info("%c "+window.lang.translate('Welcome')+" %c ".concat(user.data.user.username, " "), "color: white; background: #AD80FD; font-weight: 700;", "color: #AD80FD; background: white; font-weight: 700;");
 }
 function menuExtras(active){
-    var supportFrame = buildFrameContainer('Organizr Support','https://organizr.app/support',1);
-    var docsFrame = buildFrameContainer('Organizr Docs','https://docs.organizr.app',1);
-    var adminMenu = '<li class="devider"></li>';
-    adminMenu += (activeInfo.user.groupID <= 1 && activeInfo.settings.menuLink.githubMenuLink) ? buildMenuList('GitHub Repo','https://github.com/causefx/organizr',2,'fontawesome::github') : '';
-    adminMenu += (activeInfo.user.groupID <= 1 && activeInfo.settings.menuLink.organizrSupportMenuLink) ? buildMenuList('Organizr Support','https://organizr.app/support',1,'fontawesome::life-ring') : '';
-    adminMenu += (activeInfo.user.groupID <= 1 && activeInfo.settings.menuLink.organizrDocsMenuLink) ? buildMenuList('Organizr Docs','https://docs.organizr.app',1,'simpleline::docs') : '';
-    $(supportFrame).appendTo($('.iFrame-listing'));
-    $(docsFrame).appendTo($('.iFrame-listing'));
+	let adminMenu = '<li class="devider"></li>';
+	let extraOrganizrLinks = [
+		{
+			'type':2,
+			'group_id':1,
+			'name':'Github Repo',
+			'url':'https://github.com/causefx/organizr',
+			'icon':'fontawesome::github',
+			'active':activeInfo.settings.menuLink.githubMenuLink
+		},
+		{
+			'type':1,
+			'group_id':1,
+			'name':'Organizr Support',
+			'url':'https://organizr.app/support',
+			'icon':'fontawesome::life-ring',
+			'active':activeInfo.settings.menuLink.organizrSupportMenuLink
+		},
+		{
+			'type':2,
+			'group_id':1,
+			'name':'Organizr Docs',
+			'url':'https://docs.organizr.app',
+			'icon':'simpleline::docs',
+			'active':activeInfo.settings.menuLink.organizrDocsMenuLink
+		},
+		{
+			'type':1,
+			'group_id':1,
+			'name':'Feature Request',
+			'url':'https://vote.organizr.app',
+			'icon':'simpleline::arrow-up-circle',
+			'active':activeInfo.settings.menuLink.organizrFeatureRequestLink
+		}
+	];
+	$.each(extraOrganizrLinks, function(i,v) {
+		if(v.type == 1){
+			let frame = buildFrameContainer(v.name,v.url,v.type);
+			$(frame).appendTo($('.iFrame-listing'));
+		}
+		adminMenu += (activeInfo.user.groupID <= v.group_id && v.active) ? buildMenuList(v.name,v.url,v.type,v.icon) : '';
+	});
 	if(active === true){
 		return (activeInfo.settings.menuLink.organizrSignoutMenuLink) ? `
 			<li class="devider"></li>

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff