From c3c5a9009e89b0c36f30840c63ab4ece7235106a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sun, 23 Aug 2015 15:59:13 +0200 Subject: [PATCH] webbuild: fully div based layout and responsive support --- webbuild/html/styles/webbuild-post.css | 1 - webbuild/html/styles/webbuild.css | 202 +++++++++++++++++++++---- webbuild/html/webbuild.html | 28 ++-- webbuild/webbuild-cgi | 43 +++--- 4 files changed, 203 insertions(+), 71 deletions(-) diff --git a/webbuild/html/styles/webbuild-post.css b/webbuild/html/styles/webbuild-post.css index 8804dc2..4cffc84 100644 --- a/webbuild/html/styles/webbuild-post.css +++ b/webbuild/html/styles/webbuild-post.css @@ -34,7 +34,6 @@ select { font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif; padding: 0; margin: 1px; - height: 1.5em; max-width: 98%; background-color: buttonface; } diff --git a/webbuild/html/styles/webbuild.css b/webbuild/html/styles/webbuild.css index 0acdb92..cfe4cc5 100644 --- a/webbuild/html/styles/webbuild.css +++ b/webbuild/html/styles/webbuild.css @@ -112,22 +112,23 @@ font-weight:400; padding:0; } - - +.webbuildtopright { + float:right; +} .searchbox { - position:relative; - display:block; + float:left; width:215px; align:center; - left:660px; - top:-25px; -// height:21px; font-size:8pt; border:1px solid #2b6600; -// margin:4px; padding:2px; background-color: #e0f2d0; } +.chatpanel { + float:left; + width:215px; + align:center; +} .webbuild { font-size: 8pt; font-family: liberationsans, freesans, arial, verdana, sans-serif; @@ -143,11 +144,113 @@ .webbuild h2 { font-size: 11pt; font-weight: bold; } .webbuild h3 { font-size: 10pt; font-weight: bold; margin-top: 20px; margin-bottom: 2px; } .webbuild h4 { margin:5; margin-right: 10; font-size: 9pt; font-weight: normal; }*/ -.webbuild hr { margin:0; color:white; border: medium none; } +.webbuild hr { margin:0; color:white; } .webbuild div { margin-bottom:1px; padding-bottom:1px; } +.webbuildcontainer { + max-width:920px; + height:auto; +} +.webbuildwrapleft { + float:left; + width:100%; + margin-right:-210px; +} +.webbuildleft { + margin-right:210px !important; + padding:0; + margin:0; +} +.webbuildright { + float:right; + width:202px; + margin:0; +} + +@media screen and (min-width: 901px) { +.webbuildright { + width:202px; +} +.socialbox { + width:200px; +} +} +.operationpanelinfo { + margin-top:137px; + border:1px solid #2b6600; + background-color:#E0F2D0; + padding:1px; +} +.operationpanelsend { + margin-top:5px; + border:1px solid #2b6600; + background-color:#E0F2D0; + padding:1px; +} +.operationpanelautodist { + margin-top:5px; + border:1px solid #2b6600; + background-color:#FFFFDE; + padding:1px; +} +.operationpanelpatches { + margin-top:5px; + border:1px solid #2b6600; + background-color:#E0F2D0; + padding:1px; +} +.operationpanelupload { + margin-top:5px; + border:1px solid #2b6600; + background-color:#FFFFFF; + padding:1px; +} +.operationpanelpackageinfo { + margin-top:5px; + border:1px solid #2b6600; + background-color:#A7DEDE; + padding:1px; +} +.operationpanelgenericinfo { + margin-top:5px; + border:1px solid #2b6600; + background-color:#A7DEDE; + padding:1px; +} +.operationpanelhost { + margin-top:5px; + border:1px solid #2b6600; + background-color:#FFFFFF; + padding:1px; +} +.operationpaneloperations { + margin-top:5px; + border:1px solid #2b6600; + background-color:#FFFFDE; + padding:1px; +} +.operationpaneloperations > textarea { + padding:0; +} +.webbuildprocesses { + font-size:7pt; + padding:0px; + height:130px; + line-height: 130%; + margin-bottom: 2px; + border:1px solid #2b6600; + width:100%; + margin:0; +// display:table-cell; + background-color:#E0F2D0; + padding:1px; +} +.processes { + width:100%; +} .editor { - width:690px; + float:left; + width:100%; height:300px; border:1px solid #cccccc; padding:0px; @@ -155,30 +258,19 @@ font-family:monospace; font-size:8pt; } - .maintainer { - width:684px; + float:left; + width:100%; height:300px; overflow:auto; font-size:7pt; border:1px solid #2b6600; - padding:0; + padding:1px; margin:0; background-color:white; float:left; } - -.processes { - float:left; - font-size:7pt; - padding:0px; - height:130px; - line-height: 130%; - margin-bottom: 2px; - border:1px solid #2b6600; -} - .notes { width:680px; font-size:7pt; @@ -190,7 +282,7 @@ } .output { - width:680px; + width:100%; height:300px; overflow:auto; overflow-x:hidden; @@ -217,6 +309,50 @@ color:white; } +@media screen and (max-width: 900px) { +.webbuildright, +.webbuildleft, +.operationpanelinfo, +.operationpanelsend, +.operationpanelautodist { + width:100%; +} +.socialbox { + float: none !important; +} +span#socialbox > span > div > div > img, +span#socialbox > span > div > div:first-child { + height:12px !important; + width:12px !important; +} +span#socialbox > span > div > div:nth-child(2), +span#socialbox > span > div > div:nth-child(3) { + margin-left: 12px !important; +} +.operationpanelinfo { + margin-top:5px !important; +} +.webbuildtopright, +.webbuildtopleft { + margin-top:5px; + width:100%; +} +.chatpanel { + margin-left:10px; +} +select, +input { + margin:3px !important; +} + +} +@media screen and (max-width: 370px) { +.webbuildright, +.webbuildleft { + width:100%; +} +} + .matrix { width:100%; height:97%; @@ -257,9 +393,11 @@ } .scroll-pane { + /* socialbox */ background-color: #e0f2d0; height:130px; - width:200px; + min-width:200px; + width:100%; overflow:auto; float:right; } @@ -278,11 +416,11 @@ } .scroll-pane3 { + /* processes */ background-color: #e0f2d0; height:130px; - width:685px; + width:auto; overflow:auto; - float:right; } .scroll-pane3-h { @@ -302,13 +440,13 @@ .socialbox { float:right; font-size:8pt; - border:0px; - padding:0px; + //border:0; + //margin:0; + //padding:0; height:130px; line-height: 100%; - margin: 0px; border:1px solid #2b6600; } .socialbox div { margin-bottom:1px; } -.socialbox hr { margin: 0; color:#FFF; } +.socialbox hr { margin:0; color:#FFF; } .downloadbox table { font-size: 9pt; border:1px solid #2b6600; margin: 4px; padding:4; background-color: #e0f2d0; } diff --git a/webbuild/html/webbuild.html b/webbuild/html/webbuild.html index d2a7cc6..06b0c71 100644 --- a/webbuild/html/webbuild.html +++ b/webbuild/html/webbuild.html @@ -1,6 +1,7 @@ + @@ -263,37 +264,30 @@ function ajaxFileUpload(request) - - -
-
+
build automatici    - Webbuild - Interfaccia Web per lo sviluppo di openmamba - - - - - -
+ +

Il supporto per AJAX non è abilitato nel tuo browser. L'aggiornamento live non sarà disponibile, premi Ricarica per aggiornare la pagina.

Caricamento in corso, attendere... -
+ -
-
-

+ +
+
-
+
- - +
@@ -307,6 +301,4 @@ ajax_getvalues_refresh("",user,user_email,encodeURIComponent(secret)); //setInterval("ajax_getvalues_refresh(\"\",user,user_email,encodeURIComponent(secret))",0);





-
diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi index 5d74674..52cede0 100755 --- a/webbuild/webbuild-cgi +++ b/webbuild/webbuild-cgi @@ -664,7 +664,7 @@ echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAG echo -n "REQUEST=rpmmanager\");>" # expert mode checkbox [ "$STATE_ADVANCEDCONTROLS" ] && CHECKED="checked=checked" || CHECKED= -echo -n " Autodist:Autodist:" + echo -n "" echo -n " Start from URL:" echo -n " name:" echo -n " type:" + echo -n "
" + echo -n "Build/Send options:
Arch:
" - [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$STATE_ADVANCEDCONTROLS" ] && echo -n "
Autodist batch builds:
" + echo -n "
" + [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$STATE_ADVANCEDCONTROLS" ] && echo -n "
Autodist batch builds:
" if [ "$PACKAGE" ]; then if [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" ]; then echo -n "Patch for $PACKAGE:
" @@ -1467,8 +1468,9 @@ if [ "$MAINTAINERMODE" != "true" ]; then echo -n "ajax_getvalues(\"ENVIRONMENT=$ENVIRONMENT&REPOSITORY=$REPOSITORY&PACKAGE=$PACKAGEENCODED&REQUEST=autoportlog\");>" fi fi + [ "${AUTOPORT_UPDATE[$ENVIRONMENT]}" -o "$STATE_ADVANCEDCONTROLS" ] && echo -n "
" if [ "$PACKAGE" ]; then - echo -n "
" + echo -n "
" ## check for updates #echo -n "
$PACKAGE-${SPECVAR_Version}-" echo -n ".patch" echo -n "
" + echo -n "
" # upload sources - echo -n "
Upload source:" + echo -n "
Upload source:" echo -n "" echo -n "" echo -n "
" # info from package sources - echo -n "
" + echo -n "
" echo -n "Info from package in the works:
" # show sources echo -n "" echo -n "" + echo -n "
" # generic info - echo -n "
Generic info:
" + echo -n "
Generic info:
" # allowed groups echo -n "" @@ -1588,9 +1592,8 @@ if [ "$MAINTAINERMODE" != "true" ]; then done echo -n "
" echo -n "
" - fi - echo -n "
Host maintainance:
" + echo -n "
Host maintainance:
" ## run ldconfig #echo -n "" - + echo -n "
" echo -n "]]>" fi echo -n "" +echo -n "
" echo -n "" echo -n " " echo -n "" + echo -n "
" echo "Repository: $REPOSITORY
" showEnvironmentPanel - echo -n "

" + echo -n "
" if [ "$REPOSITORY" ]; then # send options - echo -n "Send options:" + echo -n "
Send options:" # destination repository echo -n "
Destination: " echo -n "force" # simulate checkbox - echo -n "" + echo -n "
" # operations box - echo -n "

" + echo -n "
" echo -n "Operations on selected packages:
" # echo -n "" - echo -n "

" + echo -n "
" fi echo -n "]]>" fi