changeset
First pass to add icons to the menus.
Fri, 26 Apr 2019 22:52:15 +0200
- author
- Michiel Broek <mbroek@mbse.eu>
- date
- Fri, 26 Apr 2019 22:52:15 +0200
- changeset 344
- e25bbf19619d
- parent 343
- 82184e3be6d9
- child 345
- dd1eb3f7fbf4
First pass to add icons to the menus.
--- a/config.status Fri Apr 26 17:08:51 2019 +0200 +++ b/config.status Fri Apr 26 22:52:15 2019 +0200 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # Generated by configure. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging @@ -8,7 +8,7 @@ ac_cs_recheck=false ac_cs_silent=false -SHELL=${CONFIG_SHELL-/bin/sh} +SHELL=${CONFIG_SHELL-/bin/bash} export SHELL ## -------------------- ## ## M4sh Initialization. ## @@ -512,10 +512,10 @@ fi if $ac_cs_recheck; then - set X /bin/sh './configure' $ac_configure_extra_args --no-create --no-recursion + set X /bin/bash './configure' $ac_configure_extra_args --no-create --no-recursion shift - $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6 - CONFIG_SHELL='/bin/sh' + $as_echo "running CONFIG_SHELL=/bin/bash $*" >&6 + CONFIG_SHELL='/bin/bash' export CONFIG_SHELL exec "$@" fi @@ -605,11 +605,11 @@ S["LIBOBJS"]="" S["SDL_LIBS"]="" S["SDL_CFLAGS"]="" -S["EGREP"]="/usr/bin/grep -E" -S["GREP"]="/usr/bin/grep" +S["EGREP"]="/bin/grep -E" +S["GREP"]="/bin/grep" S["CPP"]="gcc -E" S["TAR"]="tar" -S["INSTALL"]="ginstall" +S["INSTALL"]="install" S["RANLIB"]="ranlib" S["OBJEXT"]="o" S["EXEEXT"]="" @@ -643,6 +643,7 @@ S["docdir"]="${datarootdir}/doc/${PACKAGE}" S["oldincludedir"]="/usr/include" S["includedir"]="${prefix}/include" +S["runstatedir"]="${localstatedir}/run" S["localstatedir"]="${prefix}/var" S["sharedstatedir"]="${prefix}/com" S["sysconfdir"]="${prefix}/etc" @@ -661,7 +662,7 @@ S["PACKAGE_TARNAME"]="" S["PACKAGE_NAME"]="" S["PATH_SEPARATOR"]=":" -S["SHELL"]="/bin/sh" +S["SHELL"]="/bin/bash" _ACAWK cat >>"$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1
--- a/configure Fri Apr 26 17:08:51 2019 +0200 +++ b/configure Fri Apr 26 22:52:15 2019 +0200 @@ -661,6 +661,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -732,6 +733,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -984,6 +986,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1121,7 +1132,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1274,6 +1285,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
--- a/www/includes/global.inc.php Fri Apr 26 17:08:51 2019 +0200 +++ b/www/includes/global.inc.php Fri Apr 26 22:52:15 2019 +0200 @@ -191,8 +191,10 @@ <!-- Menu --> <div id="jqxMenu"> <ul> - <li><a href="index.php">Home</a></li> - <li>Monitoren + <li style='width: 80px;'> + <a href="index.php">Home</a> + </li> + <li style='width: 80px;'>Monitoren <ul> <li>Systemen <ul> @@ -219,56 +221,56 @@ </li> </ul> </li> - <li>Productie - <ul> - <li><a href="prod_inprod.php">In bewerking</a></li> - <li><a href="prod_new.php?return=index.php">Start nieuw</a></li> - <li>Archief + <li style='width: 80px;'>Productie + <ul style='width: 200px;'> + <li><img style='float: left; margin-right: 5px;' src='images/beerstyles.png' /><a href="prod_inprod.php">In bewerking</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/list-add.png' /><a href="prod_new.php?return=index.php">Start nieuw</a></li> + <li><img style='float: left; margin-left: 3px; margin-right: 8px;' src='images/database.png' />Archief <ul> <li><a href="prod_archive_name.php">Op naam</a></li> <li><a href="prod_archive_code.php">Op code</a></li> <li><a href="prod_archive_date.php">Op datum</a></li> </ul> </li> - <li>Import - <ul> - <li><a href="prod_impbrew.php">Brouw log</a></li> - <li>Etiket</li> + <li><img style='float: left; margin-right: 5px;' src='images/insert-object.png' />Import + <ul style='width: 200px;'> + <li><img style='float: left; margin-right: 5px;' src='images/insert-object.png' /><a href="prod_impbrew.php">Brouw log</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/insert-image.png' />Etiket</li> </ul> </li> - <li>Kalender</li> + <li><img style='float: left; margin-right: 7px;' src='images/calendar.png' />Kalender</li> </ul> </li> - <li>Recepten - <ul> - <li><a href="rec_main.php">Recepten</a></li> - <li><a href="rec_import.php">Import</a></li> + <li style='width: 80px;'>Recepten + <ul style='width: 150px;'> + <li><img style='float: left; margin-right: 5px;' src='images/beerstyles.png' /><a href="rec_main.php">Recepten</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/insert-object.png' /><a href="rec_import.php">Import beerxml</a></li> </ul> </li> - <li>Inventaris - <ul> - <li><a href="inv_suppliers.php">Leveranciers</a></li> - <li><a href="inv_fermentables.php">Vergistbare ingredienten</a></li> - <li><a href="inv_hops.php">Hoppen</a></li> - <li><a href="inv_yeasts.php">Gisten</a></li> - <li><a href="inv_miscs.php">Overige ingredienten</a></li> - <li><a href="inv_waters.php">Brouwwater</a></li> - <li><a href="inv_equipments.php">Brouw apparatuur</a></li> - <li><a href="inv_instock.php">Voorraad lijst</a></li> + <li style='width: 80px;'>Inventaris + <ul style='width: 250px;'> + <li><img style='float: left; margin-right: 5px;' src='images/address-book.png' /><a href="inv_suppliers.php">Leveranciers</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/graan.png' /><a href="inv_fermentables.php">Vergistbare ingredienten</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/hop.png' /><a href="inv_hops.php">Hoppen</a></li> + <li><img style='float: left; margin-left: 4px; margin-right: 9px;' src='images/erlenmeyer.png' /><a href="inv_yeasts.php">Gisten</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/peper.png' /><a href="inv_miscs.php">Overige ingredienten</a></li> + <li><img style='float: left; margin-left: 3px; margin-right: 9px;' src='images/water.png' /><a href="inv_waters.php">Brouwwater</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/mash.png' /><a href="inv_equipments.php">Brouw apparatuur</a></li> + <li><img style='float: left; margin-left: 3px; margin-right: 8px;' src='images/database.png' /><a href="inv_instock.php">Voorraad lijst</a></li> </ul> </li> - <li>Instellingen - <ul> - <li><a href="profile_water.php">Water profielen</a></li> - <li><a href="profile_mash.php">Maisch schemas</a></li> - <li><a href="profile_styles.php">Bierstijlen</a></li> - <li><a href="profile_fermentation.php">Vergisting profielen</a></li> - <li><a href="profile_setup.php">Instellingen</a></li> + <li style='width: 80px;'>Instellingen + <ul style='width: 200px;'> + <li><img style='float: left; margin-left: 3px; margin-right: 9px;' src='images/water.png' /><a href="profile_water.php">Water profielen</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/mash.png' /><a href="profile_mash.php">Maisch schemas</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/beerstyles.png' /><a href="profile_styles.php">Bierstijlen</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/fermenter.png' /><a href="profile_fermentation.php">Vergisting profielen</a></li> + <li><img style='float: left; margin-right: 5px;' src='images/preferences.png' /><a href="profile_setup.php">Instellingen</a></li> </ul> </li> - <li>Over - <ul> - <li><a href="gen_about.php">Informatie</a></li> + <li style='width: 80px;'>Over + <ul style='width: 150px;'> + <li><img style='float: left; margin-right: 5px;' src='images/help-about.png' /><a href="gen_about.php">Informatie</a></li> </ul> </li> </ul>
