[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    www/media
From:       Ingo Malchow <ingomalchow () googlemail ! com>
Date:       2011-04-27 8:11:05
Message-ID: 20110427081105.593F9AC866 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1229467 by imalchow:

add new edu theme, named derry

 AM            images/background.png  
 AM            images/bg-content.png  
 AM            images/bg-grunge.png  
 AM            images/bg-menu.png  
 AM            images/border-breadcrumb.png  
 M             images/footer.png  
 A             images/header (directory)  
 AM            images/header.png  
 AM            images/header/input-search.png  
 AM            images/header/label-search.png  
 AM            images/news.png  
 A             images/plasmaMenuEdu (directory)  
 AM            images/plasmaMenuEdu/btn-sep.png  
 AM            images/plasmaMenuEdu/menu-arrow.png  
 AM            images/plasmaMenuEdu/menubox_a-over.png  
 AM            images/plasmaMenuEdu/menubox_body.png  
 AM            images/plasmaMenuEdu/menubox_bottom.png  
 AM            images/plasmaMenuEdu/menubox_top.png  
 AM            images/plasmaMenuEdu/submenubox_body_1.png  
 AM            images/plasmaMenuEdu/submenubox_body_2.png  
 AM            images/plasmaMenuEdu/submenubox_bottom.png  
 AM            images/plasmaMenuEdu/submenubox_top.png  
 AM            images/under-h2.png  
 AM            images/vertical-sep.png  
 M  +11 -12    includes/classes/class_appdata.inc  
 A             includes/derry (directory)  
 A             includes/derry/css.php  
 A             includes/derry/template-bottom1.inc  
 A             includes/derry/template-bottom2.inc  
 A             includes/derry/template-header.inc  
 A             includes/derry/template-top1.inc  
 A             includes/derry/template-top2.inc  
 A             includes/derry/toolbox.inc  
 M  +6 -4      includes/header.inc  


--- trunk/www/media/includes/classes/class_appdata.inc #1229466:1229467
@@ -41,7 +41,7 @@
         }
 
         function listToHtml($list) {
-            $html = '<ul>';
+            $html = '<ul class="features">';
             $liOpen = false;
             foreach($list as $item) {
                 if (is_array($item)) {
@@ -81,7 +81,7 @@
             $html = '<p><strong>Authors:</strong></p>';
             $html .= '<ul>';
             foreach($this->data['authors'] as $author) {
-                $html.= '<li>'.$author[0];
+                $html.= '<li><span>'.$author[0].'</span>';
                 if (strlen($author[2])) {
                     $html .= ' <a \
href="mailto:'.htmlspecialchars($author[2]).'">&lt;'.htmlspecialchars($author[2]).'&gt;</a>';
  }
@@ -96,7 +96,7 @@
                 $html .= '<p><strong>Thanks To:</strong></p>';
                 $html .= '<ul>';
                 foreach($this->data['credits'] as $author) {
-                    $html.= '<li>'.$author[0];
+                    $html.= '<li><span>'.$author[0].'</span>';
                     if (strlen($author[2])) {
                         $html .= ' <a \
href="mailto:'.htmlspecialchars($author[2]).'">&lt;'.htmlspecialchars($author[2]).'&gt;</a>';
  }
@@ -201,7 +201,7 @@
             if ($this->data['repository'][0] == 'svn') {
                 return '<p><a \
href="http://websvn.kde.org/'.$this->data['repository'][1].'">Browse \
'.$this->name().' source code on WebSVN</a></p>';  } else \
                if($this->data['repository'][0] == 'git') {
-                return '<p><a \
href="http://projects.kde.org/'.$this->data['repository'][1].'">Browse \
'.$this->name().' source code on projects.kde.org</a></p>'; +                ///TODO
             }
             return '';
         }
@@ -209,8 +209,8 @@
         function checkoutSourcesHtml() {
             if ($this->data['repository'][0] == 'svn') {
                 return '<p>Checkout '.$this->name().' source code:</p><p><code>svn \
                co svn://anonsvn.kde.org/home/kde/'.$this->data['repository'][1].'</code></p>';
                
-            } else if($this->data['repository'][0] == 'git' && \
                !empty($this->data['repository'][2])) {
-                return '<p>Checkout '.$this->name().' source code:</p><p><code>git \
clone git://anongit.kde.org/'.$this->data['repository'][2].'</code></p>'; +           \
} else if($this->data['repository'][0] == 'git') { +                ///TODO
             }
             return '';
         }
@@ -230,8 +230,8 @@
 
         //Returns true if the application has an external bugtracker (!bugs.k.o)
         function isBugTrackerExternal() {
-            $string = is_array($this->data['bugs']) ? $this->data['bugs'][0] : \
                $this->data['bugs'];
-	    return (substr($string, 0, 7) == "http://" || substr($string, 0, 8) == \
"https://"); +            return (substr($this->data['bugs'], 0, 7) == "http://" ||
+                substr($this->data['bugs'], 0, 8) == "https://");
         }
 
         function bugzillaProduct() {
@@ -252,7 +252,7 @@
             return true;
         }
 
-        function ebnUrlBase( $activaterepospecial = false ) {
+        function ebnUrlBase() {
             // examples:
             // KDE/kdeedu/parley:               \
                http://englishbreakfastnetwork.org/krazy/reports/kde-4.x/kdeedu/parley/index.html
                
             // KDE/kdebase/apps/dolphin:        \
http://englishbreakfastnetwork.org/krazy/reports/kde-4.x/kdebase-apps/dolphin/index.html
 @@ -285,7 +285,7 @@
                     $ebn = "extragear/multimedia/amarok-git";
                 }
                 if ($this->name() == "Konversation") {
-                    $ebn = "extragear/network/konversation-git";
+                    $ebn = "extragear/network/konversation-git/";
                 }
             }
 
@@ -299,7 +299,6 @@
 
         function ebnDocCheckingUrl() 
         {
-            $docurl = $this->ebnUrlBase();
-            return 'http://englishbreakfastnetwork.org/sanitizer/reports/'.str_replace( \
"-git", "", $docurl ).'/index.html'; +            return \
'http://englishbreakfastnetwork.org/sanitizer/reports/'.$this->ebnUrlBase().'/index.html';
  }
 }
--- trunk/www/media/includes/header.inc #1229466:1229467
@@ -48,8 +48,6 @@
   if (file_exists ("$document_root/site.inc"))
     include_once ("$document_root/site.inc");
 
-  $page_title = i18n_var($page_title);
-
   // figure out if we are external
   if (isset($site) && $site != "www")
     $site_external = true;
@@ -82,6 +80,10 @@
 	}
   }
   
+  // initialize the teaser class and it's object
+  include_once("classes/class_teaser.inc");
+  $teaserImages = new teaserImageBuilder();
+
   if (isset($_REQUEST['sitestyle']))
     $site_style = $_REQUEST['sitestyle'];
   else if (isset($_REQUEST['site_style']))
@@ -147,12 +149,12 @@
 <a name="cp-content"></a>
 <?php
   if (isset ($_REQUEST ['edit']))
-    print "<h1>Edit Page: \"$page_title\"</h1>\n";
+    print "<h2>Edit Page: \"$page_title\"</h2>\n";
   elseif (isset($page_title) && ($page_title != "")) {
     if (isset($page_title_extra_html)) {
       print $page_title_extra_html;
     }
-    print "<h1>$page_title</h1>\n";
+    print "<h2>$page_title</h2>\n";
   }
 
 if (isset ($templatepath))


[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic