From 177629094cdd0cd7ad87eaecfad15c85f7172fd9 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 22 Nov 2014 22:57:12 +0100
Subject: [PATCH] webbuild: other layout changes

---
 webbuild/webbuild-cgi               | 41 +++++++++++++++++++++++------
 webbuild/webbuild-functions-private | 25 +-----------------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi
index 2cb2064..7f61e9a 100755
--- a/webbuild/webbuild-cgi
+++ b/webbuild/webbuild-cgi
@@ -652,6 +652,10 @@ echo -n "<topcontrols><![CDATA["
 # new session button
 echo -n "<input type=button id=newsessionbutton value=\"New session\" onclick="
 echo -n "window.open(document.URL);>"
+# rpm manager
+echo -n "<input type=button id=rpmmanager value=\"RPM manager\" onclick="
+echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+echo -n "REQUEST=rpmmanager\");>"
 # expert mode checkbox
 [ "$STATE_ADVANCEDCONTROLS" ] && CHECKED="checked=checked" || CHECKED=
 echo -n " <span style=\"white-space:nowrap\">Autodist:<input type=checkbox id=\"advancedcontrols\" "
@@ -1240,14 +1244,15 @@ fi
 # operation panel
 if [ "$MAINTAINERMODE" != "true" ]; then
    echo -n "<operationpanel><![CDATA["
+   echo -n "<div style=\"margin-top:140px;background-color:#E0F2D0;border:1px;\">"
+   if [ "$PACKAGE" ]; then
+      echo -n "Package: <b>$PACKAGE</b><br>Version: "
+      [ "${SPECVAR_Epoch[0]}" ] && echo -n "${SPECVAR_Epoch[0]}:"
+      echo -n "<b>${SPECVAR_Version[0]}-${SPECVAR_Release[0]}</b><br>"
+   fi
    showEnvironmentPanel
-   [ "$PACKAGE" ] && {
-      echo -n "<hr><div style=\"background-color:#E0F2D0\">"
-      echo -n "Package: <b>$PACKAGE</b><br>Version: <b>"
-      [ "${SPECVAR_Epoch[0]}" ] && echo -n "${SPECVAR_Epoch[0]}:" || echo -n "0:"
-      echo -n "${SPECVAR_Version[0]}-${SPECVAR_Release[0]}</b></div>"
-   }
-   echo -n "<hr>Arch:<select id=rpmbuildarch>"
+   echo -n "</div>"
+   echo -n "<br><b>Build/Send options:</b><br>Arch:<select id=rpmbuildarch>"
    for f in i586 arm x86_64 ppc; do
       SELECTED=
       if [ "$f" = "$RPMBUILDARCH" ]; then
@@ -1285,7 +1290,7 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       echo -n "<option value=\"$repname\" $SELECTED>$repname</option>"
    done
    echo -n "</select><br>"
-   [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$STATE_ADVANCEDCONTROLS" ] && echo -n "<hr><div style=\"background-color:#FFFFDE\"><b>Autodist batch builds:</b><br>"
+   [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$STATE_ADVANCEDCONTROLS" ] && echo -n "<br><div style=\"background-color:#FFFFDE\"><b>Autodist batch builds:</b><br>"
    if [ "$PACKAGE" ]; then
       if [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then
          echo -n "Patch for $PACKAGE:<br>"
@@ -1581,7 +1586,27 @@ if [ "$MAINTAINERMODE" != "true" ]; then
       done
       echo -n "</select></div>"
       echo -n "</div>"
+
    fi
+   echo -n "<hr><b>Host maintainance:</b><br>"
+   ## run ldconfig
+   #echo -n "<input type=button id=runldconfig value=\"run ldconfig\" onclick="
+   #echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+   #echo -n "REQUEST=runldconfig\");>"
+
+   # environment search
+   echo -n "<div style=\"white-space:nowrap;width:100%;\">Provides:<input type=text style=\"width:75%;align:center;padding:0;margin:2px;\" id=environmentsearch value=\"Search package or provide...\" "
+   echo -n "onfocus=\"if (this.value==this.defaultValue) this.value=''\" "
+   echo -n "onkeypress=if(checkEnter(event))ajax_getvalues(\""
+   echo -n "ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+   echo -n "REQUEST=environmentsearch&ENVSEARCHTEXT=\"+encodeURIComponent(getElementById('environmentsearch').value));></div>"
+
+   # system upgrade
+   echo -n "<input type=button id=smartupgrade value=\"system upgrade\" onclick="
+   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
+   echo -n "REQUEST=smartupgrade\""
+   echo -n ",\"`cgi_encodevar "Upgrade current environment to latest updates now?"`\"); class=redbutton>"
+
    echo -n "]]></operationpanel>"
 fi
 
diff --git a/webbuild/webbuild-functions-private b/webbuild/webbuild-functions-private
index 6e51d7c..c371147 100644
--- a/webbuild/webbuild-functions-private
+++ b/webbuild/webbuild-functions-private
@@ -84,7 +84,7 @@ function showlog() {
 
 function showEnvironmentPanel() {
 
-   echo -n "Build host: <b>`hostname`</b><br>"
+   echo -n "Host: <b>`hostname`</b><br>"
    echo -n "Environment: <b>"
    if [ "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}" ]; then
       echo -n "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]} - "
@@ -121,29 +121,6 @@ function showEnvironmentPanel() {
    fi
    echo "Toolchain: $toolchain_text"
 
-   # system upgrade
-   echo -n "<br><input type=button id=smartupgrade value=\"system upgrade\" onclick="
-   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   echo -n "REQUEST=smartupgrade\""
-   echo -n ",\"`cgi_encodevar "Upgrade current environment to latest updates now?"`\"); class=redbutton>"
-
-   ## run ldconfig
-   #echo -n "<input type=button id=runldconfig value=\"run ldconfig\" onclick="
-   #echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   #echo -n "REQUEST=runldconfig\");>"
-
-   # rpm manager
-   echo -n "<input type=button id=rpmmanager value=\"RPM manager\" onclick="
-   echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   echo -n "REQUEST=rpmmanager\");>"
-
-   # environment search
-   echo -n "<br><div style=\"white-space:nowrap;width:100%;\">Provides:<input type=text style=\"width:75%;align:center;padding:0;margin:2px;\" id=environmentsearch value=\"Search package or provide...\" "
-   echo -n "onfocus=\"if (this.value==this.defaultValue) this.value=''\" "
-   echo -n "onkeypress=if(checkEnter(event))ajax_getvalues(\""
-   echo -n "ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&"
-   echo -n "REQUEST=environmentsearch&ENVSEARCHTEXT=\"+encodeURIComponent(getElementById('environmentsearch').value));></div>"
-
 }
 
 function print_showlogcontrols() {