[zi-cvs] packages/com.zzoss.zic.theme.kde footer.php,1.7,1.8 header.php,1.9,1.10 styles.css,1.7,1.8 theme_config.php,1.1,1.2

Sandro Zic <[email protected]> Wed, 24 Mar 2004 09:31:18 +0000
Newsgroups gmane.comp.php.zzoss.installer.cvs
Message-ID <[email protected]>
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic.theme.kde
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10137/com.zzoss.zic.theme.kde

Modified Files:
	footer.php header.php styles.css theme_config.php 
Log Message:
better navigation by highlighting chosen main navigation item and providing breadcrumb path

Index: theme_config.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.theme.kde/theme_config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** theme_config.php	1 Jan 2004 15:27:23 -0000	1.1
--- theme_config.php	24 Mar 2004 09:31:16 -0000	1.2
***************
*** 27,29 ****
--- 27,36 ----
      $zi_theme['logo_title']         = 'ZZ/OSS Installer Homepage';
      $zi_theme['logo_link'] = 'http://www.zzoss.com/projects/installer';
+     
+     function zi_theme_selected($nav)
+     {
+         if(isset($_SESSION['nav_parent']) && $_SESSION['nav_parent'] == $nav){
+             echo '_selected';
+         }
+     }
  ?>
\ No newline at end of file

Index: styles.css
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.theme.kde/styles.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** styles.css	5 Mar 2004 14:25:26 -0000	1.7
--- styles.css	24 Mar 2004 09:31:16 -0000	1.8
***************
*** 73,89 ****
  
  .body {
      margin-left:152px;
!     margin-top:4px;
      border:1px solid #3679ad;
      background-color:#fff;
-     margin-right:4px;
  }
  
! .body_dev {
!     margin-left:152px;
!     margin-top:4px;
      border:1px solid #3679ad;
!     background-color:#e3eaf0;
!     margin-right:4px;
  }
  
--- 73,146 ----
  
  .body {
+     margin-top:8px;
      margin-left:152px;
!     margin-right:4px;
! }
! 
! .toolbar {
!     height:22px;
! }
! 
! .toolbar .item {
!     float:left;
!     border-top:1px solid #3679ad;
!     border-left:1px solid #3679ad;
!     padding-top:2px;
!     padding-bottom:2px;
!     padding-left:4px;
!     padding-right:4px;
! }
! 
! .toolbar .item_dev {
!     float:left;
!     border-top:1px solid #3679ad;
!     border-left:1px solid #3679ad;
!     padding-top:2px;
!     padding-bottom:2px;
!     padding-left:4px;
!     padding-right:4px;
! }
! 
! .toolbar .item_selected {
!     float:left;
!     border-top:1px solid #3679ad;
!     border-left:1px solid #3679ad;
!     padding-top:2px;
!     padding-bottom:2px;
!     padding-left:4px;
!     padding-right:4px;
!     background-color:#fff;
! }
! 
! .toolbar .item_selected_dev {
!     float:left;
!     border-top:1px solid #3679ad;
!     border-left:1px solid #3679ad;
!     padding-top:2px;
!     padding-bottom:2px;
!     padding-left:4px;
!     padding-right:4px;
!     background-color:#fff;
! }
! 
! .toolbar .item_last {
!     float:left;
!     border-top:1px solid #3679ad;
!     border-left:1px solid #3679ad;
!     border-right:1px solid #3679ad;
!     padding-top:2px;
!     padding-bottom:2px;
!     padding-left:4px;
!     padding-right:4px;
! }
! 
! .content_frame {
      border:1px solid #3679ad;
      background-color:#fff;
  }
  
! .content_frame_dev {
      border:1px solid #3679ad;
!     background-color:#fff;
  }
  
***************
*** 95,135 ****
  .body-popup_dev {
      text-align:left;
!     background-color:#e3eaf0;
  }
  
  .menu {
      clear:both;
      float:left;
!     margin-top:4px;
!     /*background-color:#db9513;*/
!     width:130px;
!     /*border-top:1px solid #000;
!     border-right:1px solid #000;
!     border-bottom:1px solid #000;*/
!     margin-right:8px;
!     padding-top:4px;
!     padding-left:8px;
!     padding-right:8px;
!     padding-bottom:8px;
! }
! /*
! .menu h1 {
!     color:#fff;
  }
  
! .menu p {
!     color:#9D2B39;
  }
  
! .menu li {
!     color:#9D2B39;
  }
  
! .menu li.highlight {
!     color:#fff;
! }
! */
! /* Prevent automatic border when image is linked. */
! .menuitem img {
      border:0px;
      float:left;
--- 152,186 ----
  .body-popup_dev {
      text-align:left;
!     background-color:#fff;
  }
  
  .menu {
      clear:both;
+     position:relative;
      float:left;
!     top:29px;
!     width:152px;
!     height:320px;
  }
  
! /* Prevent automatic border when image is linked. */
! .menuitem img {
!     border:0px;
!     float:left;
!     margin-right:4px;
  }
  
! .menuitem {
!     clear:both;
!     margin-bottom:12px;
!     vertical-align:middle;
!     padding-top:4px;
!     padding-left:8px;
!     padding-right:8px;
!     padding-bottom:4px;
!     margin-left:4px;
  }
  
! .menuitem_selected img {
      border:0px;
      float:left;
***************
*** 137,145 ****
  }
  
! .menuitem {
      clear:both;
!     padding-top:12px;
      vertical-align:middle;
  }
  /*
  .menuitem a {
--- 188,206 ----
  }
  
! .menuitem_selected {
      clear:both;
!     margin-bottom:12px;
      vertical-align:middle;
+     background-color:#fff;
+     border-top:1px solid #3679ad;
+     border-left:1px solid #3679ad;
+     border-bottom:1px solid #3679ad;
+     padding-top:4px;
+     padding-left:8px;
+     padding-right:8px;
+     padding-bottom:4px;
+     margin-left:4px;
  }
+ 
  /*
  .menuitem a {
***************
*** 164,169 ****
--- 225,236 ----
  }
  */
+ 
  .content {
      padding:8px;
+     min-height:320px;
+ }
+ 
+ .content .help {
+     float:right;
  }
  
***************
*** 178,198 ****
  }
  
- .content .toolbar {
-     width:578;
-     height:20px;
- }
- 
- .content .toolbar .item {
-     float:left;
-     margin-right:12px;
-     background-color:#d0dfec;
-     border:1px solid #3679ad;
-     padding-top:2px;
-     padding-bottom:2px;
-     padding-left:4px;
-     padding-right:4px;
-     margin-right:4px;
- }
- 
  /* Normal tables */
  /* Must be included in CSS file for MSIE5+ compatibility */
--- 245,248 ----
***************
*** 363,370 ****
  }
  
- .contextmenu .status {
-     float:left;
- }
- 
  .contextlink {
      text-align:center;
--- 413,416 ----
***************
*** 421,424 ****
--- 467,482 ----
  }
  
+ .status {
+     float:left;
+     margin-left:4px;
+     margin-top:2px;
+     vertical-align:middle;
+ }
+ 
+ .status img {
+     border:0px;
+     vertical-align:middle;
+ }
+ 
  /* text specific styles */
  

Index: header.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.theme.kde/header.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** header.php	24 Mar 2004 06:32:23 -0000	1.9
--- header.php	24 Mar 2004 09:31:16 -0000	1.10
***************
*** 63,74 ****
                      if(!strlen($GLOBALS['ZI']['application'])) { 
                      ?>
! 						<div class="menuitem">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>applications.php"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/kcmsystem.png" alt="Manage Applications" title="Manage Applications" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>applications.php">Manage<br/>Applications</a>
  									</td>
  								</tr>
--- 63,74 ----
                      if(!strlen($GLOBALS['ZI']['application'])) { 
                      ?>
! 						<div class="menuitem<?php echo zi_theme_selected('apps'); ?>">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>applications.php?nav_parent=apps&nav_child=applications"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/kcmsystem.png" alt="Manage Applications" title="Manage Applications" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>applications.php?nav_parent=apps&nav_child=applications">Manage<br/>Applications</a>
  									</td>
  								</tr>
***************
*** 152,163 ****
                      if($GLOBALS['ZI']['mode'] == 'dev') {
                          ?>
! 							<div class="menuitem">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>applications.php?mode=dev"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/template_source.png" alt="Develop Applications" title="Develop Applications" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>applications.php?mode=dev">Develop<br/>Applications</a>
  									</td>
  								</tr>
--- 152,163 ----
                      if($GLOBALS['ZI']['mode'] == 'dev') {
                          ?>
! 							<div class="menuitem<?php echo zi_theme_selected('dev'); ?>">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>applications.php?mode=dev&nav_parent=dev&nav_child=applications"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/template_source.png" alt="Develop Applications" title="Develop Applications" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>applications.php?mode=dev&nav_parent=dev&nav_child=applications">Develop<br/>Applications</a>
  									</td>
  								</tr>
***************
*** 168,179 ****
                      if($GLOBALS['ZI']['mode'] != 'setup'){
                      ?>
!                         <div class="menuitem">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>installer.php"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/kcontrol.png" alt="Manage Installer" title="Manage Installer" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>installer.php?mode=installer">Manage<br/>Installer</a>
  									</td>
  								</tr>
--- 168,179 ----
                      if($GLOBALS['ZI']['mode'] != 'setup'){
                      ?>
!                         <div class="menuitem<?php echo zi_theme_selected('installer'); ?>">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>installer.php?mode=installer&nav_parent=installer&nav_child=options"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/kcontrol.png" alt="Manage Installer" title="Manage Installer" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>installer.php?mode=installer&nav_parent=installer&nav_child=options">Manage<br/>Installer</a>
  									</td>
  								</tr>
***************
*** 186,230 ****
              </div>
              
!             <div class="body<?php if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev') echo '_dev'; ?>">
!             
!                 <div class="contextmenu">
!                     <span class="status">
!                     <?php
!                         if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'){
!                     ?>
!                     <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/encrypted.png" border="0" alt="Encrypted" title="Encrypted"/>Encrypted                    
!                     <?php
!                         } else {
!                     ?>
!                     <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/decrypted.png" border="0" alt="Decrypted" title="Decrypted"/>Decrypted
!                     <?php
!                         }
!                 if(is_object($zi_auth)){
!                     ?>&nbsp;
!                         <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/kuser.png" alt="Logged In User" title="Logged In User">
!                         <?php echo $zi_auth->getUsername();
!                 }
!                 ?>
!                     </span>
!                 <?php
!                 // Do we suppress this component because we show the setup header?
!                 if($zi_setup->isInitiated()){
!                     $zi_help_pathinfo = pathinfo(getenv('SCRIPT_FILENAME'));
!                     //print_r($help_pathinfo);
!                     $zi_help_file = str_replace($zi_help_pathinfo['extension'], 'html', $zi_help_pathinfo['basename']);
!                     if(file_exists('help/'.$zi_help_file)){
!                         ?>
!                         <a href="help.php?file=<?php echo rawurlencode($zi_help_file); ?>" onclick="javascript:window.open('help.php?file=<?php echo rawurlencode($zi_help_file); ?>', 'Help', 'width=320,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="Help"><!--<img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/contexthelp.png" border="0" alt="Help" title="Help"/>-->Help</a><?php
!                         }
!                         ?>
!                     <?php
!                 }       
!                 ?>
!                 <a href="about.php" onclick="javascript:window.open('about.php', 'About', 'width=400,height=400,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="About"><!--<img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/info.png" alt="About Installer" title="About Installer">-->About</a>
!                 </div>
!                 
!                 <div class="content">
!                     <?php
!                     require_once 'inc/toolbar.php';
!                     ?>
!                     <form method="POST" action="<?php echo $_SERVER['PHP_SELF']; ?>" enctype="multipart/form-data">
\ No newline at end of file
--- 186,211 ----
              </div>
              
!             <div class="body"><?php
!                 require_once 'inc/toolbar.php';
!                 ?>  
!     
!                 <div class="content_frame<?php if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev') echo '_dev'; ?>">
! 
!                     <div class="content">
!                         <form method="POST" action="<?php echo $_SERVER['PHP_SELF']; ?>" enctype="multipart/form-data">
!                         <?php
!                         // Do we suppress this component because we show the setup header?
!                         if($zi_setup->isInitiated()){
!                             $zi_help_pathinfo = pathinfo(getenv('SCRIPT_FILENAME'));
!                             //print_r($help_pathinfo);
!                             $zi_help_file = str_replace($zi_help_pathinfo['extension'], 'html', $zi_help_pathinfo['basename']);
!                             if(file_exists('help/'.$zi_help_file)){
!                                 ?>
!                                 <div class="help">
!                                 <a href="help.php?file=<?php echo rawurlencode($zi_help_file); ?>" onclick="javascript:window.open('help.php?file=<?php echo rawurlencode($zi_help_file); ?>', 'Help', 'width=320,height=500,resizable=1,status=0,scrollbars=1,toolbar=0,location=0,directories=0,menubar=0,dependent=0');void(0);javascript:return(false);" target="_blank" title="Help"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/help.png" border="0" alt="Help" title="Help"/></a>
!                                 </div><?php
!                                 }
!                                 ?>
!                             <?php
!                         }       
!                         ?>
\ No newline at end of file

Index: footer.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.theme.kde/footer.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** footer.php	18 Mar 2004 09:41:39 -0000	1.7
--- footer.php	24 Mar 2004 09:31:16 -0000	1.8
***************
*** 27,32 ****
                  
                  <div class="buttons-bottom">
                      <?php
!                         $fields = array('id', 'distribution', 'application', 'package', 'mode', 'update_old', 'type');
                          if(!$zi_hide['profile']){
                              $fields[] = 'profile';
--- 27,50 ----
                  
                  <div class="buttons-bottom">
+                 <span class="status">
                      <?php
!                         if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on'){
!                     ?>
!                     <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/encrypted.png" border="0" alt="Encrypted" title="Encrypted"/>Encrypted                    
!                     <?php
!                         } else {
!                     ?>
!                     <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/decrypted.png" border="0" alt="Decrypted" title="Decrypted"/>Decrypted
!                     <?php
!                         }
!                 if(is_object($zi_auth)){
!                     ?>&nbsp;
!                         <img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/16x16/kuser.png" alt="Logged In User" title="Logged In User">
!                         <?php echo $zi_auth->getUsername();
!                 }
!                 ?>
!                     </span>
!                     <?php
!                         $fields = array('id', 'distribution', 'application', 'package', 'mode', 'update_old', 'type', 'nav');
                          if(!$zi_hide['profile']){
                              $fields[] = 'profile';
***************
*** 62,65 ****
--- 80,85 ----
                  
              </div>
+             
+             </div>
          
          </div>



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click