[zi-cvs] packages/com.zzoss.zic.theme.kde footer.php,1.8,1.9 header.php,1.11,1.12

Sandro Zic <[email protected]> Sun, 04 Apr 2004 15:53:44 +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-serv23152/com.zzoss.zic.theme.kde

Modified Files:
	footer.php header.php 
Log Message:
optimise for setup and single app mode

Index: header.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.theme.kde/header.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** header.php	4 Apr 2004 08:42:12 -0000	1.11
--- header.php	4 Apr 2004 15:53:42 -0000	1.12
***************
*** 77,96 ****
                          <?php 
                      }
!                     if(strlen($GLOBALS['ZI']['application']) && strlen($GLOBALS['ZI']['distribution'])) {
!                         $application = $zi_registry->getApplication($GLOBALS['ZI']['application'], $GLOBALS['ZI']['distribution']);
!                         $_REQUEST['id'] = $application['id'];
                          $_REQUEST['distribution'] = $GLOBALS['ZI']['distribution'];
                          $_REQUEST['application'] = $GLOBALS['ZI']['application'];
                          
!                         if(!strlen($application['installed'])){
                              ?>
! 							<div class="menuitem">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>application_settings.php<?php echo zi_form_querystr(); ?>"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/kcmsystem.png" alt="Install Application" title="Install Application" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>application_settings.php<?php echo zi_form_querystr(); ?>">Install<br/>Application</a>
  									</td>
  								</tr>
--- 77,101 ----
                          <?php 
                      }
!                     if($GLOBALS['ZI']['is_single_app']) {
!                         
!                         $_REQUEST['mode'] = '';
!                         
!                         if(is_object($zi_registry)){
!                             $application = $zi_registry->getApplication($GLOBALS['ZI']['application'], $GLOBALS['ZI']['distribution']);
!                         }
!                         
                          $_REQUEST['distribution'] = $GLOBALS['ZI']['distribution'];
                          $_REQUEST['application'] = $GLOBALS['ZI']['application'];
                          
!                         if(!isset($application['installed']) || !strlen($application['installed'])){
                              ?>
! 							<div class="menuitem<?php echo zi_theme_selected('app_install'); ?>">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>applications.php<?php echo zi_form_querystr(); ?>action=install&nav_parent=app_install"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/kcmsystem.png" alt="Install Application" title="Install Application" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>applications.php<?php echo zi_form_querystr(); ?>&action=install&nav_parent=app_install">Install<br/>Application</a>
  									</td>
  								</tr>
***************
*** 99,111 ****
                              <?php
                          } elseif($GLOBALS['ZI']['mode'] != 'setup') {
                              ?>
! 						<div class="menuitem">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>application_update.php<?php echo zi_form_querystr(); ?>"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/rebuild.png" alt="Update Application" title="Update Application" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>application_update.php<?php echo zi_form_querystr(); ?>">Update Application</a>
  									</td>
  								</tr>
--- 104,129 ----
                              <?php
                          } elseif($GLOBALS['ZI']['mode'] != 'setup') {
+                             $_REQUEST['widget_type'] = '_self';
                              ?>
!                             <div class="menuitem<?php echo zi_theme_selected('app_info'); ?>">
!                                 <table>
!                                     <tr>
!                                         <td valign="middle">
!                                             <a href="<?php echo $chdir; ?>info.php<?php echo zi_form_querystr(); ?>&nav_parent=app_info"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/kcmsystem.png" alt="Application Information" title="Application Information" align="left"></a>
!                                         </td>
!                                         <td valign="middle">
!                                             <a href="<?php echo $chdir; ?>info.php<?php echo zi_form_querystr(); ?>&nav_parent=app_info">Application<br>Information</a>
!                                         </td>
!                                     </tr>
!                                 </table>
!                             </div>
! 						<div class="menuitem<?php echo zi_theme_selected('app_update'); ?>">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>application_update.php<?php echo zi_form_querystr(); ?>&nav_parent=app_update"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/rebuild.png" alt="Update Application" title="Update Application" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>application_update.php<?php echo zi_form_querystr(); ?>&nav_parent=app_update">Update<br/>Application</a>
  									</td>
  								</tr>
***************
*** 117,128 ****
                              </div>
                              -->
! 						<div class="menuitem">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>application_delete.php<?php echo zi_form_querystr(); ?>"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/trashcan_empty.png" alt="Delete Application" title="Delete Application" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>application_delete.php<?php echo zi_form_querystr(); ?>">Delete Application</a>
  									</td>
  								</tr>
--- 135,146 ----
                              </div>
                              -->
! 						<div class="menuitem<?php echo zi_theme_selected('app_delete'); ?>">
  							<table>
  								<tr>
  									<td valign="middle">
! 										<a href="<?php echo $chdir; ?>application_delete.php<?php echo zi_form_querystr(); ?>&nav_parent=app_delete"><img src="<?php echo $chdir; ?>themes/share/icons/org.kde.icons.crystalsvg/32x32/trashcan_empty.png" alt="Delete Application" title="Delete Application" align="left"></a>
  									</td>
  									<td valign="middle">
! 			                            <a href="<?php echo $chdir; ?>application_delete.php<?php echo zi_form_querystr(); ?>&nav_parent=app_delete">Delete Application</a>
  									</td>
  								</tr>
***************
*** 166,170 ****
                          <?php
                      }
!                     if($GLOBALS['ZI']['mode'] != 'setup'){
                      ?>
                          <div class="menuitem<?php echo zi_theme_selected('installer'); ?>">
--- 184,188 ----
                          <?php
                      }
!                     if($GLOBALS['ZI']['mode'] != 'setup' && !$GLOBALS['ZI']['is_single_app']){
                      ?>
                          <div class="menuitem<?php echo zi_theme_selected('installer'); ?>">

Index: footer.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic.theme.kde/footer.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** footer.php	24 Mar 2004 09:31:16 -0000	1.8
--- footer.php	4 Apr 2004 15:53:42 -0000	1.9
***************
*** 46,50 ****
                      </span>
                      <?php
!                         $fields = array('id', 'distribution', 'application', 'package', 'mode', 'update_old', 'type', 'nav');
                          if(!$zi_hide['profile']){
                              $fields[] = 'profile';
--- 46,50 ----
                      </span>
                      <?php
!                         $fields = array('id', 'distribution', 'application', 'package', 'mode', 'update_old', 'type', 'nav', 'widget_type');
                          if(!$zi_hide['profile']){
                              $fields[] = 'profile';



-------------------------------------------------------
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