[evolvis-commits] r17693: [#2030] pending merges:↵ Thorsten Glaser 2011-11-02 lightbox eye candy for our QA dept↵ Thorsten Glaser 2011-11-02 Mediawiki → Wiki in the projectTabs, we have only one Wiki implementa...↵ Thorsten Glaser 2011-11-02 improve test a bit and add comments

mirabilos at evolvis.org mirabilos at evolvis.org
Wed Nov 2 17:07:17 CET 2011


Author: mirabilos
Date: 2011-11-02 17:07:17 +0100 (Wed, 02 Nov 2011)
New Revision: 17693

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
   trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
Log:
[#2030] pending merges:
  Thorsten Glaser 2011-11-02 lightbox eye candy for our QA dept
    Thorsten Glaser 2011-11-02 Mediawiki → Wiki in the projectTabs, we have only one Wiki implementa...
    Thorsten Glaser 2011-11-02 improve test a bit and add comments


Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2011-11-02 16:07:13 UTC (rev 17692)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/mediawiki/common/MediaWikiPlugin.class.php	2011-11-02 16:07:17 UTC (rev 17693)
@@ -37,7 +37,7 @@
 	function MediaWikiPlugin () {
 		$this->Plugin() ;
 		$this->name = "mediawiki" ;
-		$this->text = "Mediawiki" ; // To show in the tabs, use...
+		$this->text = "Wiki" ; // To show in the tabs, use...
 		$this->hooks[] = "groupmenu" ;	// To put into the project tabs
 		$this->hooks[] = "groupisactivecheckbox" ; // The "use ..." checkbox in editgroupinfo
 		$this->hooks[] = "groupisactivecheckboxpost" ; //
@@ -94,7 +94,7 @@
 			echo " /><br/>";
 			echo "</td>";
 			echo "<td>";
-			echo "<strong>Use ".$this->text." Plugin</strong>";
+			echo "<strong>Use Mediawiki Plugin</strong>";
 			echo "</td>";
 			echo "</tr>";
 		} elseif ($hookname == "groupisactivecheckboxpost") {

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php	2011-11-02 16:07:13 UTC (rev 17692)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/themes/tests/jstest.php	2011-11-02 16:07:17 UTC (rev 17693)
@@ -21,7 +21,9 @@
  * with FusionForge; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *-
- * Test embedding ECMAscript libraries in FusionForge
+ * Test embedding both ECMAscript libraries we use in FusionForge at
+ * the same time (jQuery in noConflice mode, plus Prototype), as well
+ * as their plugins (jQuery-Tipsy, jQuery UI, Scriptaculous, Lightbox).
  */
 
 require_once('../../env.inc.php');
@@ -74,14 +76,15 @@
 jQuery(function() {
 	if (typeof(jQuery(window).tipsy) == 'function') {
 		jQuery('#tipsytest').tipsy({
-			"gravity": "n",
+			"gravity": "s",
 			"html": true,
 			"delayIn": 1000,
 			"delayOut": 500,
 			"fade": true
 		});
 	} else {
-		jQuery('#tipsytest').append(" In fact, it is not working.");
+		jQuery('#tipsytest').append(" In fact, it is not working, " +
+		    "the jQuery-Tipsy library seems to not have been loaded.");
 	}
 });
 //]]></script>
@@ -98,13 +101,14 @@
 
 <h2>Prototype</h2>
 <p style="display:none;">You should not see this; if you do, CSS
- hiding is broken for you.</p>
+ hiding is broken for you. (#1)</p>
 <p id="protoon" style="display:none;">You should see this. If
- you don’t, Prototype failed to unhide.</p>
+ you don’t, Prototype failed to unhide. (#2)</p>
 <p id="protooff">You should not see this. If you do, Prototype
- failed to hide.</p>
+ failed to hide. (#3)</p>
 <p>You should see this. There are three paragraphs above, but
- you should <em>not</em> see all of them, only one and this.</p>
+ you should <em>not</em> see all of them, only one (#2) and
+ this. (#4)</p>
 <script language="JavaScript" type="text/javascript">//<![CDATA[
 $("protoon").show();
 $("protooff").hide();
@@ -127,7 +131,7 @@
 Event.observe(window, "load", createTestPicker);
 //]]></script>
 
-<h3>Lightbox2</h3>
+<h3>Lightbox2 with script.aculo.us</h3>
 <p>Show the <a href="/themes/evolvis/images/logo_internal_repo.png"
  rel="lightbox" title="Unser tolles Logo">Evolvis Repository logo</a>
  image in a lightbox.</p>

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php	2011-11-02 16:07:13 UTC (rev 17692)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/detail.php	2011-11-02 16:07:17 UTC (rev 17693)
@@ -28,6 +28,7 @@
        $sort_comments_chronologically = true;
 }
 
+html_use_lightbox();
 $ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
 
 echo notepad_func();

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-11-02 16:07:13 UTC (rev 17692)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/include/ArtifactTypeHtml.class.php	2011-11-02 16:07:17 UTC (rev 17693)
@@ -280,12 +280,18 @@
 			echo $GLOBALS['HTML']->listTableTop($title_arr);
 			
 			foreach ($file_list as $file) {
+				if (strncasecmp($file_list[$i]->getType(),
+				    "image/", 6) === 0) {
+					$lightbox = ' rel="lightbox"';
+				} else {
+					$lightbox = "";
+				}
 				echo '<tr>';
 				echo '<td>'.human_readable_bytes($file->getSize()).'</td>';
 				echo '<td>'.htmlspecialchars($file->getName()).'</td>';
 				echo '<td>'.date(_('Y-m-d H:i'), $file->getDate()).'</td>';
 				echo '<td>'.$file->getSubmittedUnixName().'</td>';
-				echo '<td><a href="/tracker/download.php/'.$group_id.'/'. $this->getID().'/'. $ah->getID() .'/'.$file->getID().'/'.$file->getName() .'">'. htmlspecialchars($file->getName()) .'</a></td>';
+				echo '<td><a' . $lightbox . ' href="/tracker/download.php/'.$group_id.'/'. $this->getID().'/'. $ah->getID() .'/'.$file->getID().'/'.$file->getName() .'">'. htmlspecialchars($file->getName()) .'</a></td>';
 //				<td><input type="checkbox" name="delete_file[]" value="'. $file->getID() .'">'._("Delete").' </td>
 				echo '</tr>';
 			}

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php	2011-11-02 16:07:13 UTC (rev 17692)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod-limited.php	2011-11-02 16:07:17 UTC (rev 17693)
@@ -28,6 +28,7 @@
        $sort_comments_chronologically = true;
 }
 
+html_use_lightbox();
 $ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
 
 echo notepad_func();

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-11-02 16:07:13 UTC (rev 17692)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/tracker/mod.php	2011-11-02 16:07:17 UTC (rev 17693)
@@ -29,6 +29,7 @@
        $sort_comments_chronologically = true;
 }
 
+html_use_lightbox();
 $ath->header(array ('title'=>'[#'. $ah->getID(). '] ' . $ah->getSummary(), 'atid'=>$ath->getID()));
 
 echo notepad_func();



More information about the evolvis-commits mailing list