[evolvis-commits] r17616: [#2158] theme-evolvis pending merges:↵ Thorsten Glaser 2011-10-21 introduce Prototype.js and the Tango icon theme, from 4.8↵ Thorsten Glaser 2011-10-21 index_std improvements:

mirabilos at evolvis.org mirabilos at evolvis.org
Fri Oct 21 16:16:01 CEST 2011


Author: mirabilos
Date: 2011-10-21 16:16:01 +0200 (Fri, 21 Oct 2011)
New Revision: 17616

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
   trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2
   trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php
Log:
[#2158] theme-evolvis pending merges:
  Thorsten Glaser 2011-10-21 introduce Prototype.js and the Tango icon theme, from 4.8
    Thorsten Glaser 2011-10-21 index_std improvements:


Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-10-21 14:15:56 UTC (rev 17615)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2011-10-21 14:16:01 UTC (rev 17616)
@@ -15,12 +15,13 @@
   * Change art_cust* prefs to use JSON serialisation
   * Move php-htmlpurifier dependency to gforge-common package
   * [#2204] Tracker dropdown “Quick Browse” onchange event activation
+  * [#2158] Some theming improvements
 
   [ Mike Esser ]
   * [#1850] Fix merge glitch
   * [#1859] [#1906] Port code from Evolvis 4.8 to 5.1
 
- -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 21 Oct 2011 15:23:45 +0200
+ -- Thorsten Glaser <t.glaser at tarent.de>  Fri, 21 Oct 2011 15:46:42 +0200
 
 fusionforge (5.1.1-1+) UNRELEASED; urgency=low
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2011-10-21 14:15:56 UTC (rev 17615)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2011-10-21 14:16:01 UTC (rev 17616)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -web-apache2
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, libphp-simplepie, libjs-yui, libjs-scriptaculous, libjs-jquery, libjs-jquery-tipsy, libphp-jpgraph, toilet, ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, php-htmlpurifier (>= 4.0), libphp-simplepie, libjs-prototype, libjs-yui, libjs-scriptaculous, libjs-jquery, libjs-jquery-tipsy, libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
 Recommends: locales | locales-all
 Provides: @OLDPACKAGE at -web
 Conflicts: @OLDPACKAGE at -web

Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2	2011-10-21 14:15:56 UTC (rev 17615)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2	2011-10-21 14:16:01 UTC (rev 17616)
@@ -4,3 +4,4 @@
 usr/share/javascript/scriptaculous usr/share/@OLDPACKAGE@/www/scripts/scriptaculous
 usr/share/javascript/jquery usr/share/@OLDPACKAGE@/www/scripts/jquery
 usr/share/javascript/jquery-tipsy usr/share/@OLDPACKAGE@/www/scripts/jquery-tipsy
+usr/share/icons/Tango/16x16/apps/office-calendar.png usr/share/gforge/www/images/office-calendar.png

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php	2011-10-21 14:15:56 UTC (rev 17615)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/index_std.php	2011-10-21 14:16:01 UTC (rev 17616)
@@ -5,26 +5,30 @@
 <table id="bd" class="width-100p100" summary="">
 <tr>
 <td id="bd-col1">
-	<?php if (forge_get_config ('default_theme') != "evolvis") { ?>
-	<h2 id="title-home-page"><img src="<?php echo util_make_uri ('/images/fusionforge-resized.png') ?>" alt="FusionForge"/></h2>
-	  <h3><?php print _('FusionForge helps you manage the entire development life cycle'); ?></h3>
-<p>
+<?php
+echo $HTML->boxTop(_('Latest News'), 'Latest_News');
+echo news_show_latest(forge_get_config('news_group'),5,true,false,false,5);
+echo $HTML->boxBottom();
 
-	  <?php print _('FusionForge has tools to help your team collaborate, like message forums and mailing lists; tools to create and control access to Source Code Management repositories like CVS and Subversion. FusionForge automatically creates a repository and controls access to it depending on the role settings of the project.'); ?>
-<?php }
-else { ?>
-	<h2 id="title-home-page"><img src="<?php echo util_make_uri ('/themes/evolvis/images/logo_internal_repo.png') ?>" alt="EvolvisForge"/></h2>
-	  <h3><?php print _('Evolvis – Make it into a project!'); ?></h3>
+echo $HTML->boxTop(_('About the Evolvis software'), 'about_the_software');
+if (forge_get_config ('default_theme') != "evolvis") {
+?>
+<h2 id="title-home-page"><img src="<?php echo util_make_uri ('/images/fusionforge-resized.png') ?>" alt="FusionForge"/></h2>
+<h3><?php print _('FusionForge helps you manage the entire development life cycle'); ?></h3>
 <p>
+<?php
+	print _('FusionForge has tools to help your team collaborate, like message forums and mailing lists; tools to create and control access to Source Code Management repositories like CVS and Subversion. FusionForge automatically creates a repository and controls access to it depending on the role settings of the project.');
+} else { ?>
+<h3 id="title-home-page"><?php print _('Evolvis – Make it into a project!'); ?></h3>
+<p>
 <?php print _('evolvis stems from the latin verb "evolvere" and means "you evolve". "Evolution" as well traces back to this word.<br />evolvis.org is a free project platform for free software projects, the publicly available instance of the Evolvis platform provided by tarent GmbH. Here developers and other project participants can find everything that is needed for a free software project:<br />source code management, discussion board, bug tracking, release and document management, downloads and <a href="http://info.evolvis.org/">more</a>.'); ?>
 </p>
-	  <h3><?php print _('EvolvisForge helps you manage the entire development life cycle'); ?></h3>
+<h3><?php print _('EvolvisForge helps you manage the entire development life cycle'); ?></h3>
 <p>
-
-	  <?php print _('EvolvisForge has tools to help your team collaborate, like message forums and mailing lists; tools to create and control access to Source Code Management repositories like CVS and Subversion. EvolvisForge automatically creates a repository and controls access to it depending on the role settings of the project.'); ?>
-
-<?php } ?>
-
+<?php
+	print _('EvolvisForge has tools to help your team collaborate, like message forums and mailing lists; tools to create and control access to Source Code Management repositories like CVS and Subversion. EvolvisForge automatically creates a repository and controls access to it depending on the role settings of the project.');
+}
+?>
 </p>
 <p><?php print _('Additional Features:'); ?></p>
 <ul>
@@ -54,11 +58,8 @@
 </ul>
 
 <?php
-echo $HTML->boxTop(_('Latest News'), 'Latest_News');
-echo news_show_latest(forge_get_config('news_group'),5,true,false,false,5);
 echo $HTML->boxBottom();
 ?>
-
 </td>
 
 <td id="bd-col2">



More information about the evolvis-commits mailing list