[Fusionforge-commits] FusionForge branch master updated. v6.0.5-2136-g9333b84

Franck Villaume nerville at libremir.placard.fr.eu.org
Thu Sep 7 11:51:18 CEST 2017


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  9333b849f4760a03db0e8713b592d172a63fd8d7 (commit)
      from  17f1e000356cd0c043d00bf299040d5eed77b5be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=9333b849f4760a03db0e8713b592d172a63fd8d7

commit 9333b849f4760a03db0e8713b592d172a63fd8d7
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Thu Sep 7 09:51:12 2017 +0000

    fix tab display with multiscm support

diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index ee08b67..c6a4850 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -173,14 +173,14 @@ control over it to the project's administrator.");
 				ngettext('Only project developers can access the Git repository via this method.',
 				'Only project developers can access the Git repositories via this method.',
 				count($repo_list)));
-		$b .= '<div id="tabber">';
+		$b .= '<div id="tabber-git">';
 		$b .= '<ul>';
 		if (forge_get_config('use_ssh', 'scmgit')) {
-			$b .= '<li><a href="#tabber-ssh">'._('via SSH').'</a></li>';
+			$b .= '<li><a href="#tabber-gitssh">'._('via SSH').'</a></li>';
 			$configuration = 1;
 		}
 		if (forge_get_config('use_smarthttp', 'scmgit')) {
-			$b .= '<li><a href="#tabber-smarthttp">'._('via "smart HTTP"').'</a></li>';
+			$b .= '<li><a href="#tabber-gitsmarthttp">'._('via "smart HTTP"').'</a></li>';
 			$configuration = 1;
 		}
 		$b .= '</ul>';
@@ -195,7 +195,7 @@ control over it to the project's administrator.");
 			$u = user_get_object(user_getid());
 			$d = $u->getUnixName();
 			if (forge_get_config('use_ssh', 'scmgit')) {
-				$b .= '<div id="tabber-ssh" class="tabbertab" >';
+				$b .= '<div id="tabber-gitssh" class="tabbertab" >';
 				$b .= html_e('p', array(), _('SSH must be installed on your client machine.'));
 				$htmlRepo = '';
 				foreach ($repo_list as $repo_name) {
@@ -205,7 +205,7 @@ control over it to the project's administrator.");
 				$b .= '</div>';
 			}
 			if (forge_get_config('use_smarthttp', 'scmgit')) {
-				$b .= '<div id="tabber-smarthttp" class="tabbertab" >';
+				$b .= '<div id="tabber-gitsmarthttp" class="tabbertab" >';
 				$b .= html_e('p', array(), _('Enter your site password when prompted.'));
 				$htmlRepo = '';
 				$protocol = forge_get_config('use_ssl', 'scmgit') ? 'https' : 'http';
@@ -217,7 +217,7 @@ control over it to the project's administrator.");
 			}
 		} else {
 			if (forge_get_config('use_ssh', 'scmgit')) {
-				$b .= '<div id="tabber-ssh" class="tabbertab" >';
+				$b .= '<div id="tabber-gitssh" class="tabbertab" >';
 				$b .= html_e('p', array(),
 					ngettext('Only project developers can access the Git repository via this method.',
 						'Only project developers can access the Git repositories via this method.',
@@ -233,7 +233,7 @@ control over it to the project's administrator.");
 			}
 			if (forge_get_config('use_smarthttp', 'scmgit')) {
 				$protocol = forge_get_config('use_ssl', 'scmgit')? 'https' : 'http';
-				$b .= '<div id="tabber-smarthttp" class="tabbertab" >';
+				$b .= '<div id="tabber-gitsmarthttp" class="tabbertab" >';
 				$b .= html_e('p', array(),
 					ngettext('Only project developers can access the Git repository via this method.',
 						'Only project developers can access the Git repositories via this method.',
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php b/src/plugins/scmhg/common/HgPlugin.class.php
index 01a515f..a0019cd 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -100,14 +100,14 @@ Offer DAV or SSH access.");
 				ngettext('Only project developers can access the Hg repository via this method.',
 				'Only project developers can access the Hg repositories via this method.',
 				count($repo_list)));
-		$b .= '<div id="tabber">';
+		$b .= '<div id="tabber-hg">';
 		$b .= '<ul>';
 		if (forge_get_config('use_ssh', 'scmhg')) {
-			$b .= '<li><a href="#tabber-ssh">'._('via SSH').'</a></li>';
+			$b .= '<li><a href="#tabber-hgssh">'._('via SSH').'</a></li>';
 			$configuration = 1;
 		}
 		if (forge_get_config('use_dav', 'scmhg')) {
-			$b .= '<li><a href="#tabber-dav">'._('via "DAV"').'</a></li>';
+			$b .= '<li><a href="#tabber-hgdav">'._('via "DAV"').'</a></li>';
 			$configuration = 1;
 		}
 		$b .= '</ul>';
@@ -118,7 +118,7 @@ Offer DAV or SSH access.");
 			$u = user_get_object(user_getid());
 			$d = $u->getUnixName();
 			if (forge_get_config('use_ssh', 'scmhg')) {
-				$b .= '<div id="tabber-ssh" class="tabbertab" >';
+				$b .= '<div id="tabber-hgssh" class="tabbertab" >';
 				$b .= html_e('p', array(), _('SSH must be installed on your client machine.'));
 				$htmlRepo = '';
 				foreach ($repo_list as $repo_name) {
@@ -130,7 +130,7 @@ Offer DAV or SSH access.");
 				$b .= '</div>';
 			}
 			if (forge_get_config('use_dav', 'scmhg')) {
-				$b .= '<div id="tabber-dav" class="tabbertab" >';
+				$b .= '<div id="tabber-hgdav" class="tabbertab" >';
 				$b .= html_e('p', array(), _('Enter your site password when prompted.'));
 				$htmlRepo = '';
 				$protocol = forge_get_config('use_ssl', 'scmhg') ? 'https' : 'http';
@@ -142,7 +142,7 @@ Offer DAV or SSH access.");
 			}
 		} else {
 			if (forge_get_config('use_ssh', 'scmhg')) {
-				$b .= '<div id="tabber-ssh" class="tabbertab" >';
+				$b .= '<div id="tabber-hgssh" class="tabbertab" >';
 				$b .= html_e('p', array(),
 					ngettext('Only project developers can access the Hg repository via this method.',
 						'Only project developers can access the Hg repositories via this method.',
@@ -160,7 +160,7 @@ Offer DAV or SSH access.");
 			}
 			if (forge_get_config('use_dav', 'scmhg')) {
 				$protocol = forge_get_config('use_ssl', 'scmhg')? 'https' : 'http';
-				$b .= '<div id="tabber-dav" class="tabbertab" >';
+				$b .= '<div id="tabber-hgdav" class="tabbertab" >';
 				$b .= html_e('p', array(),
 					ngettext('Only project developers can access the Hg repository via this method.',
 						'Only project developers can access the Hg repositories via this method.',
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index 05d1655..48f36a1 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -138,15 +138,16 @@ some control over it to the project's administrator.");
 		$b = '';
 
 		$module = $this->topModule($project);
+		$b .= html_e('h2', array(), _('Developer Access'));
 		$b .= sprintf(_('Only project developers can access the %s tree via this method.'), 'Subversion');
-		$b .= '<div id="tabber">';
+		$b .= '<div id="tabber-svn">';
 		$b .= '<ul>';
 		if (forge_get_config('use_ssh', 'scmsvn')) {
-			$b .= '<li><a href="#tabber-ssh">'._('via SSH').'</a></li>';
+			$b .= '<li><a href="#tabber-svnssh">'._('via SSH').'</a></li>';
 			$configuration = 1;
 		}
 		if (forge_get_config('use_dav', 'scmsvn')) {
-			$b .= '<li><a href="#tabber-dav">'._('via DAV').'</a></li>';
+			$b .= '<li><a href="#tabber-svndav">'._('via DAV').'</a></li>';
 			$configuration = 1;
 		}
 		$b .= '</ul>';
@@ -154,7 +155,7 @@ some control over it to the project's administrator.");
 			$u = user_get_object(user_getid());
 			$d = $u->getUnixName();
 			if (forge_get_config('use_ssh', 'scmsvn')) {
-				$b .= '<div id="tabber-ssh" class="tabbertab" >';
+				$b .= '<div id="tabber-svnssh" class="tabbertab" >';
 				$b .= '<p>';
 				$b .= _('SSH must be installed on your client machine.');
 				$b .= ' ';
@@ -168,7 +169,7 @@ some control over it to the project's administrator.");
 				$b .= '</div>';
 			}
 			if (forge_get_config('use_dav', 'scmsvn')) {
-				$b .= '<div id="tabber-dav" class="tabbertab" >';
+				$b .= '<div id="tabber-svndav" class="tabbertab" >';
 				$b .= '<p>';
 				$b .= _('Enter your site password when prompted.');
 				$b .= '</p>';
@@ -177,7 +178,7 @@ some control over it to the project's administrator.");
 			}
 		} else {
 			if (forge_get_config('use_ssh', 'scmsvn')) {
-				$b .= '<div id="tabber-ssh" class="tabbertab" >';
+				$b .= '<div id="tabber-svnssh" class="tabbertab" >';
 				$b .= '<p>';
 				$b .= _('SSH must be installed on your client machine.');
 				$b .= ' ';
@@ -192,7 +193,7 @@ some control over it to the project's administrator.");
 				$b .= '<p><span class="tt">svn '.$ssh_port.'checkout svn+ssh://<i>'._('developername').'</i>@' . forge_get_config('scm_host') . $this->svn_root_fs .'/'. $project->getUnixName().$module.'</span></p>' ; $b .= '</div>';
 			}
 			if (forge_get_config('use_dav', 'scmsvn')) {
-				$b .= '<div id="tabber-dav" class="tabbertab" >';
+				$b .= '<div id="tabber-svndav" class="tabbertab" >';
 				$b .= '<p>';
 				$b .= _('Substitute <em>developername</em> with the proper value.');
 				$b .= ' ';
diff --git a/src/www/themes/funky/Theme.class.php b/src/www/themes/funky/Theme.class.php
index 3d69324..bbd5cdb 100644
--- a/src/www/themes/funky/Theme.class.php
+++ b/src/www/themes/funky/Theme.class.php
@@ -74,7 +74,7 @@ class Theme_Funky extends Layout {
 				jQuery(":submit").button();
 				jQuery(":reset").button();
 				jQuery(":button").button();
-				jQuery("#tabber").tabs();
+				jQuery("[id^=tabber").tabs();
 			});
 			//]]>'."\n";
 		if ($use_tooltips) {

-----------------------------------------------------------------------

Summary of changes:
 src/plugins/scmgit/common/GitPlugin.class.php | 14 +++++++-------
 src/plugins/scmhg/common/HgPlugin.class.php   | 14 +++++++-------
 src/plugins/scmsvn/common/SVNPlugin.class.php | 15 ++++++++-------
 src/www/themes/funky/Theme.class.php          |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list