[zi-cvs] packages/com.zzoss.zic/inc form.php,1.7,1.8 init.php,1.7,1.8 toolbar.php,1.2,1.3 toolbar_apps.php,1.2,1.3 toolbar_dev.php,1.1,1.2 toolbar_installer.php,1.2,1.3
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/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10137/com.zzoss.zic/inc
Modified Files:
form.php init.php toolbar.php toolbar_apps.php toolbar_dev.php
toolbar_installer.php
Log Message:
better navigation by highlighting chosen main navigation item and providing breadcrumb path
Index: form.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/form.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** form.php 15 Mar 2004 12:28:09 -0000 1.7
--- form.php 24 Mar 2004 09:31:15 -0000 1.8
***************
*** 116,120 ****
function zi_form_querystr()
{
! $fields = array('id', 'distribution', 'application', 'package', 'mode', 'update_old', 'type', 'dev', 'profile');
$querystr = '';
foreach($fields as $field){
--- 116,120 ----
function zi_form_querystr()
{
! $fields = array('id', 'distribution', 'application', 'package', 'mode', 'update_old', 'type', 'dev', 'profile', 'nav');
$querystr = '';
foreach($fields as $field){
Index: init.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/init.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** init.php 19 Mar 2004 12:18:16 -0000 1.7
--- init.php 24 Mar 2004 09:31:15 -0000 1.8
***************
*** 168,170 ****
--- 168,178 ----
// routines to process form input
require_once 'inc/form.php';
+
+ if(isset($_REQUEST['nav_parent'])){
+ $_SESSION['nav_parent'] = $_REQUEST['nav_parent'];
+ }
+
+ if(isset($_REQUEST['nav_child'])){
+ $_SESSION['nav_child'] = $_REQUEST['nav_child'];
+ }
?>
Index: toolbar_apps.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/toolbar_apps.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** toolbar_apps.php 24 Mar 2004 06:32:23 -0000 1.2
--- toolbar_apps.php 24 Mar 2004 09:31:15 -0000 1.3
***************
*** 24,47 ****
*/
?>
! <p>
! <div class="toolbar">
! <div class="item">
! <a href="applications.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>" title="Applications">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/run.png" align="absmiddle" border="0" alt="Install" title="Install"> Applications</a>
! </div>
! <?php
! if(!strlen($GLOBALS['ZI']['application'])) {
! ?>
! <div class="item">
! <a href="distribution_download.php" title="Download">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/network.png" align="absmiddle" border="0" alt="Download" title="Download"> Download</a>
! </div>
! <?php
! }
! ?>
! <div class="item">
! <a href="bundle.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>" title="Bundle">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/kpackage.png" align="absmiddle" border="0" alt="Bundle" title="Bundle"> Bundle</a>
! </div>
</div>
! </p>
\ No newline at end of file
--- 24,43 ----
*/
?>
! <div class="item<?php zi_toolbar_selected('applications'); ?>">
! <a href="applications.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>&nav_child=applications" title="Applications">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/run.png" align="absmiddle" border="0" alt="Install" title="Install"> -->Applications</a>
</div>
! <?php
! if(!strlen($GLOBALS['ZI']['application'])) {
! ?>
! <div class="item<?php zi_toolbar_selected('download'); ?>">
! <a href="distribution_download.php?nav_child=download" title="Download">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/network.png" align="absmiddle" border="0" alt="Download" title="Download"> -->Download</a>
! </div>
! <?php
! }
! ?>
! <div class="item<?php zi_toolbar_selected('bundle'); ?>">
! <a href="bundle.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>&nav_child=bundle" title="Bundle">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/kpackage.png" align="absmiddle" border="0" alt="Bundle" title="Bundle"> -->Bundle</a>
! </div>
\ No newline at end of file
Index: toolbar_dev.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/toolbar_dev.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** toolbar_dev.php 5 Mar 2004 14:25:25 -0000 1.1
--- toolbar_dev.php 24 Mar 2004 09:31:15 -0000 1.2
***************
*** 24,45 ****
*/
?>
! <p>
! <div class="toolbar">
! <div class="item">
! <a href="applications.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>" title="Applications">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/run.png" align="absmiddle" border="0" alt="Install" title="Install"> Applications</a>
! </div>
! <div class="item">
! <a href="bundle.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>" title="Bundle">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/kpackage.png" align="absmiddle" border="0" alt="Bundle" title="Bundle"> Bundle</a>
! </div>
! <div class="item">
! <a href="dev_import_xml.php?mode=dev" title="Descriptors">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/make.png" align="absmiddle" border="0" alt="Descriptors" title="Descriptors"> Descriptors</a>
! </div>
! <div class="item">
! <a href="dev_package.php?mode=dev" title="Packages">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/package.png" align="absmiddle" border="0" alt="Packages" title="Packages"> Packages</a>
! </div>
</div>
! </p>
\ No newline at end of file
--- 24,41 ----
*/
?>
! <div class="item<?php zi_toolbar_selected('applications'); ?>">
! <a href="applications.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>&nav_child=applications" title="Applications">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/run.png" align="absmiddle" border="0" alt="Install" title="Install"> -->Applications</a>
</div>
! <div class="item<?php zi_toolbar_selected('bundle'); ?>">
! <a href="bundle.php<?php if(isset($_REQUEST['mode'])) echo '?mode='.$_REQUEST['mode']; ?>&nav_child=bundle" title="Bundle">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/kpackage.png" align="absmiddle" border="0" alt="Bundle" title="Bundle"> -->Bundle</a>
! </div>
! <div class="item<?php zi_toolbar_selected('descriptors'); ?>">
! <a href="dev_import_xml.php?mode=dev&nav_child=descriptors" title="Descriptors">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/make.png" align="absmiddle" border="0" alt="Descriptors" title="Descriptors"> -->Descriptors</a>
! </div>
! <div class="item<?php zi_toolbar_selected('packages'); ?>">
! <a href="dev_package.php?mode=dev&nav_child=packages" title="Packages">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/package.png" align="absmiddle" border="0" alt="Packages" title="Packages"> -->Packages</a>
! </div>
\ No newline at end of file
Index: toolbar.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/toolbar.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** toolbar.php 19 Mar 2004 12:18:16 -0000 1.2
--- toolbar.php 24 Mar 2004 09:31:15 -0000 1.3
***************
*** 23,40 ****
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
! if(isset($_REQUEST['mode'])){
! switch($_REQUEST['mode']){
! case 'dev':
! require_once 'inc/toolbar_dev.php';
! break;
! case 'installer':
! require_once 'inc/toolbar_installer.php';
! break;
! default:
! if($_REQUEST['mode'] != 'setup'){
! require_once 'inc/toolbar_apps.php';
! }
! break;
}
! }
! ?>
\ No newline at end of file
--- 23,56 ----
@license http://opensource.org/licenses/lgpl-license.php GNU Lesser General Public License
*/
!
! function zi_toolbar_selected($nav)
! {
! if(isset($_SESSION['nav_child']) && $_SESSION['nav_child'] == $nav){
! echo '_selected';
}
! if(isset($_REQUEST['mode']) && $_REQUEST['mode'] == 'dev'){
! echo '_dev';
! }
! }
!
! ?><div class="toolbar"><?php
! if(isset($_REQUEST['mode'])){
! switch($_REQUEST['mode']){
! case 'dev':
! require_once 'inc/toolbar_dev.php';
! break;
! case 'installer':
! require_once 'inc/toolbar_installer.php';
! break;
! default:
! if($_REQUEST['mode'] != 'setup'){
! require_once 'inc/toolbar_apps.php';
! }
! break;
! }
! }
! ?>
! <div class="item_last">
! <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>
\ No newline at end of file
Index: toolbar_installer.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/inc/toolbar_installer.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** toolbar_installer.php 9 Mar 2004 06:06:15 -0000 1.2
--- toolbar_installer.php 24 Mar 2004 09:31:15 -0000 1.3
***************
*** 24,59 ****
*/
?>
! <p>
! <div class="toolbar">
! <div class="item">
! <a href="options.php?distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer" title="Options">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/package_settings.png" align="absmiddle" border="0" alt="options" title="Options"> Options</a>
! </div>
! <div class="item">
! <a href="application_update.php?distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer" title="Options">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/rebuild.png" align="absmiddle" border="0" alt="Update" title="Update"> Update</a>
! </div>
! <div class="item">
! <a href="packages.php?type=plugin&distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer" title="Plugins">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/blockdevice.png" align="absmiddle" border="0" alt="Plugins" title="Plugins"> Plugins</a>
! </div>
! <div class="item">
! <a href="installer_user.php?mode=installer" title="User">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/kuser.png" align="absmiddle" border="0" alt="User" title="User"> User</a>
! </div>
! <?php
! if($GLOBALS['ZI']['installer_dev']) {
! ?>
! <div class="item">
! <a href="dev_application_import.php?distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer" title="Descriptors">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/make.png" align="absmiddle" border="0" alt="Descriptors" title="Descriptors"> Descriptors</a>
! </div>
! <?php
! }
?>
! <div class="item">
! <a href="installer_remove.php?mode=installer" title="Remove">
! <img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/trashcan_empty.png" align="absmiddle" border="0" alt="Remove" title="Remove"> Remove</a>
</div>
! </div>
! </p>
\ No newline at end of file
--- 24,55 ----
*/
?>
! <div class="item<?php zi_toolbar_selected('options'); ?>">
! <a href="options.php?distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer&nav_child=options" title="Options">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/package_settings.png" align="absmiddle" border="0" alt="options" title="Options"> -->Options</a>
! </div>
! <div class="item<?php zi_toolbar_selected('update'); ?>">
! <a href="application_update.php?distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer&nav_child=update" title="Options">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/rebuild.png" align="absmiddle" border="0" alt="Update" title="Update"> -->Update</a>
! </div>
! <div class="item<?php zi_toolbar_selected('plugins'); ?>">
! <a href="packages.php?type=plugin&distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer&nav_child=plugins" title="Plugins">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/blockdevice.png" align="absmiddle" border="0" alt="Plugins" title="Plugins"> -->Plugins</a>
! </div>
! <div class="item<?php zi_toolbar_selected('user'); ?>">
! <a href="installer_user.php?mode=installer&nav_child=user" title="User">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/kuser.png" align="absmiddle" border="0" alt="User" title="User"> -->User</a>
! </div>
! <?php
! if($GLOBALS['ZI']['installer_dev']) {
?>
! <div class="item<?php zi_toolbar_selected('descriptors'); ?>">
! <a href="dev_application_import.php?distribution=<?php echo $GLOBALS['ZI']['installer_distribution']; ?>&application=<?php echo $GLOBALS['ZI']['installer_application']; ?>&mode=installer&nav_child=descriptors" title="Descriptors">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/make.png" align="absmiddle" border="0" alt="Descriptors" title="Descriptors"> -->Descriptors</a>
</div>
! <?php
! }
! ?>
! <div class="item<?php zi_toolbar_selected('remove'); ?>">
! <a href="installer_remove.php?mode=installer&nav_child=remove" title="Remove">
! <!--<img src="themes/share/icons/org.kde.icons.crystalsvg/16x16/trashcan_empty.png" align="absmiddle" border="0" alt="Remove" title="Remove"> -->Remove</a>
! </div>
\ No newline at end of file
-------------------------------------------------------
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