openmamba/autodist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

webbuild: update css and webbuild-cgi for stand-alone mode

Browse Source
This commit is contained in:
Silvan 2024-04-17 21:44:36 +02:00
parent c46535f109
commit 8ee611b7ac
4 changed files with 246 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
webbuild/html/styles/webbuild-post.css
View File

@ -8,6 +8,8 @@ pre {
box-shadow:none; box-shadow:none;
font-family: monospace; font-family: monospace;
word-break: break-all; word-break: break-all;
white-space: pre-wrap;
word-wrap: break-word;
} }
code { code {
@ -23,34 +25,40 @@ hr { margin:0; color:black; background: #aaaaaa; }
label { white-space:nowrap; text-decoration:none; font-weight:initial; } label { white-space:nowrap; text-decoration:none; font-weight:initial; }
.webbuild input { .webbuild input {
font-size: 8pt; font-size: 10pt;
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif; font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
padding: 1px; padding: 1px;
margin: 1px; margin: 1px;
} }
select { select {
font-size: 8pt; font-size: 11pt;
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif; font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
padding: 0; padding: 2px;
margin: 1px; margin: 2px;
max-width: 98%; max-width: 98%;
background-color: buttonface; background-color: buttonface;
border: 1px solid #AAAAAA;
background-color:#e9e9e9;
} }
input[type="text"] { input[type="text"],
textarea {
font-size: 11pt;
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif; font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
padding: 1px; padding: 2px;
margin: 1px; margin: 1px;
border: 1px solid #AAAAAA; border: 1px solid #AAAAAA;
} }
input[type="button"] { input[type="button"] {
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif; font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
font-size: 8pt; font-size: 11pt;
font-weight: 400; font-weight: 400;
margin: 1px; padding: 2px;
margin: 2px;
border: 1px solid #AAAAAA; border: 1px solid #AAAAAA;
background-color:#e9e9e9;
white-space:nowrap; white-space:nowrap;
line-height: 1.1em; line-height: 1.1em;
} }
@ -59,20 +67,21 @@ input[type="button"]::-moz-focus-inner { padding: 0; border: 0; }
input[type="button"]:hover { input[type="button"]:hover {
border: 1px solid #666666; border: 1px solid #666666;
} }
input[type="radio"] { input[type="radio"] {
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif; font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
font-size: 7pt; font-size: 11pt;
padding: 0; padding: 0;
margin: 0; margin: 0;
} }
input[type="checkbox"] { input[type="checkbox"] {
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif; font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
vertical-align:middle; vertical-align:middle;
-ms-transform: scale(0.9); -ms-transform: scale(1.3);
-moz-transform: scale(0.9); -moz-transform: scale(1.3);
-webkit-transform: scale(0.9); -webkit-transform: scale(1.3);
-o-trasnform: scale(0.9); -o-trasnform: scale(1.3);
padding: 1px; padding: 4px;
margin: 1px; margin: 4px;
} }

28
webbuild/html/styles/webbuild-standalone.css
View File

@ -1,10 +1,24 @@
body { font-size: 9pt; font-family: liberationsans, freesans, arial, verdana, sans-serif; color: rgb(0, 0, 0); background-color: rgb(255, 255, 255); } body {
table { font-size: 9pt; font-family: liberationsans, freesans, arial, verdana, sans-serif; background-color: rgb(255, 255, 255); } font-size: 11pt;
img { border: 0; margin: 0px; vertical-align:middle; } padding: 10px;
h1 { font-size: 13pt; font-weight: bold; } font-family: liberationsans, freesans, arial, verdana, sans-serif;
h2 { font-size: 11pt; font-weight: bold; } color: rgb(0, 0, 0);
h3 { font-size: 10pt; font-weight: bold; margin-top: 20px; margin-bottom: 2px; } background-color: rgb(255, 255, 255);
h4 { margin:5; margin-right: 10; font-size: 9pt; font-weight: normal; } }
table {
font-size: 11pt;
font-family: liberationsans, freesans, arial, verdana, sans-serif;
background-color: rgb(255, 255, 255);
}
img {
border: 0;
margin: 0px;
vertical-align:middle;
}
h1 { font-size: 14pt; font-weight: bold; }
h2 { font-size: 13pt; font-weight: bold; }
h3 { font-size: 12pt; font-weight: bold; margin-top: 20px; margin-bottom: 2px; }
h4 { margin:5; margin-right: 10; font-size: 11pt; font-weight: normal; }
hr { margin:0; color:white; } hr { margin:0; color:white; }
a { } a { }
a:link { color:#2b6600; text-decoration: none; } a:link { color:#2b6600; text-decoration: none; }

255
webbuild/html/styles/webbuild.css
View File

@ -1,3 +1,7 @@
div#container {
max-width: initial;
}
.boldbutton { .boldbutton {
font-weight: bold !important; font-weight: bold !important;
} }
@ -44,7 +48,7 @@
display:inline-block; display:inline-block;
text-align:center; text-align:center;
position:relative; position:relative;
font-size:10pt; font-size:12pt;
padding:5px; padding:5px;
align:center; align:center;
margin-top:200px; margin-top:200px;
@ -85,7 +89,7 @@
.windowbox { .windowbox {
display:inline-block; display:inline-block;
position:relative; position:relative;
font-size:10pt; font-size:12pt;
padding:5px; padding:5px;
margin:100px; margin:100px;
margin-right:auto; margin-right:auto;
@ -97,7 +101,7 @@
} }
.multiselect { .multiselect {
font-size:8pt; font-size:11pt;
border:0px; border:0px;
padding:0px; padding:0px;
height:130px; height:130px;
@ -117,47 +121,48 @@
} }
.searchbox { .searchbox {
float:left; float:left;
width:215px; width:100%;
align:center; align:center;
font-size:8pt; font-size:11pt;
border:1px solid #2b6600; border:1px solid #2b6600;
padding:2px; padding:4px;
background-color: #e0f2d0; background-color: #c4ddc0;
}
input#repsearchtext {
width:100%;
} }
.chatpanel { .chatpanel {
float:left; float:left;
width:215px; width:100%;
align:center; padding:0px;
} }
.webbuild { .webbuild {
font-size: 8pt; font-size: 10.5pt;
font-family: liberationsans, freesans, arial, verdana, sans-serif; font-family: liberationsans, freesans, arial, verdana, sans-serif;
line-height: 1.3em; line-height: 1.3em;
color: #000000; color: #000000;
margin:0px; margin:0px;
} }
.webbuild td { font-size: 8pt; border:0; } .webbuild td { font-size: 10pt; border:0; }
} }
.webbuild table { font-size: 9pt; font-family: liberationsans, freesans, arial, verdana, sans-serif; background-color: rgb(255, 255, 255); } .webbuild table { font-size: 11pt; font-family: liberationsans, freesans, arial, verdana, sans-serif; background-color: rgb(255, 255, 255); }
.webbuild img { border: 0; margin: 0px; vertical-align:middle; } .webbuild img { border: 0; margin: 0px; vertical-align:middle; }
.webbuild h1 { font-size: 13pt; font-weight: bold; } .webbuild h1 { font-size: 15pt; font-weight: bold; }
.webbuild h2 { font-size: 11pt; font-weight: bold; } .webbuild h2 { font-size: 13pt; font-weight: bold; }
.webbuild h3 { font-size: 10pt; font-weight: bold; margin-top: 20px; margin-bottom: 2px; } .webbuild h3 { font-size: 11pt; font-weight: bold; margin-top: 20px; margin-bottom: 2px; }
.webbuild h4 { margin:5; margin-right: 10; font-size: 9pt; font-weight: normal; }*/ .webbuild h4 { margin:5; margin-right: 10; font-size: 11pt; font-weight: normal; }*/
.webbuild hr { margin:0; color:white; } .webbuild hr { margin:0; color:white; }
.webbuild div { margin-bottom:1px; padding-bottom:1px; } .webbuild div { margin-bottom:1px; padding-bottom:1px; }
.webbuildcontainer { .webbuildcontainer {
max-width:920px;
height:auto; height:auto;
} }
.webbuildwrapleft { .webbuildwrapleft {
float:left; float:left;
width:100%;
margin-right:-210px; margin-right:-210px;
} }
.webbuildleft { .webbuildleft {
margin-right:210px !important; /*margin-right:210px !important;*/
padding:0; padding:0;
margin:0; margin:0;
} }
@ -168,23 +173,28 @@
} }
@media screen and (min-width: 901px) { @media screen and (min-width: 901px) {
.webbuildwrapleft {
float:left;
width:74.65%;
}
.webbuildright { .webbuildright {
width:202px; width:24.65%;
} }
.socialbox { .socialbox {
width:200px; min-width:98% !important;
} }
} }
.operationpanelinfo { .operationpanelinfo {
margin-top:137px; margin-top:137px;
border:1px solid #2b6600; border:1px solid #2b6600;
background-color:#E0F2D0; background-color:#C4DDC0;
padding:1px; padding:1px;
} }
.operationpanelsend { .operationpanelsend {
margin-top:5px; margin-top:5px;
border:1px solid #2b6600; border:1px solid #2b6600;
background-color:#E0F2D0; background-color:#C4DDC0;
padding:1px; padding:1px;
} }
.operationpanelautodist { .operationpanelautodist {
@ -196,7 +206,7 @@
.operationpanelpatches { .operationpanelpatches {
margin-top:5px; margin-top:5px;
border:1px solid #2b6600; border:1px solid #2b6600;
background-color:#E0F2D0; background-color:#C4DDC0;
padding:1px; padding:1px;
} }
.operationpanelupload { .operationpanelupload {
@ -233,7 +243,7 @@
padding:0; padding:0;
} }
.webbuildprocesses { .webbuildprocesses {
font-size:7pt; font-size:10pt;
padding:0px; padding:0px;
height:130px; height:130px;
line-height: 130%; line-height: 130%;
@ -242,69 +252,124 @@
width:100%; width:100%;
margin:0; margin:0;
// display:table-cell; // display:table-cell;
background-color:#E0F2D0; background-color:#C4DDC0;
padding:1px; padding:1px;
} }
.processes { .processes {
width:100%; width:100%;
} }
.CodeMirror {
font-size:10pt;
font-family:monospace;
line-height:1.0em;
border:1px solid #2b6600;
/* font-size:12px; // causes problems*/
}
.editor { .editor {
float:left; float:left;
width:100%; width:100%;
height:300px; height:500px;
border:1px solid #cccccc; border:1px solid #cccccc;
padding:0px; padding:0px;
margin:0px; margin:0px;
font-family:monospace; font-family:monospace;
font-size:8pt; font-size:10pt;
} }
.maintainer { .maintainer {
float:left; float:left;
width:100%; width:100%;
height:300px; height:400px;
overflow:auto; overflow:auto;
font-size:7pt; font-size:11pt;
border:1px solid #2b6600; border:1px solid #2b6600;
line-height:1.1em;
padding:1px; padding:1px;
margin:0; margin:0;
background-color:white; background-color:white;
float:left; float:left;
} }
.maintainer a {
color:#426c29;
font-size:11pt;
}
.notes { .notes {
width:680px; width:100%;
font-size:7pt; font-size:10pt;
border:1px solid #2b6600; border:1px solid #2b6600;
padding:2px; padding:1px;
margin:0; margin:0;
margin-bottom:2px; margin-bottom:2px;
margin-top:2px;
background-color:#ffff00; background-color:#ffff00;
} }
.output { .downloadbox > div {
width:100% !important;
/* background-color:#c4ddc0 !important;*/
}
.showlogbox a {
color:#5e913e !important;
}
.showlogbox {
height:250px;
width:100%; width:100%;
height:300px; overflow:auto;
font-size:9pt;
border:1px solid #2b6600;
margin:4px;
padding:4px;
background-color:#c4ddc0 !important;
}
.outputbox {
width:100% !important;
height:350px;
overflow:auto; overflow:auto;
overflow-x:hidden; overflow-x:hidden;
word-wrap: break-word; word-wrap: break-word;
font-family:monospace; font-family:monospace;
font-size:8pt; font-size:9pt;
font-weight:400; font-weight:400;
border:1px solid #2b6600; border:1px solid #2b6600;
padding:2px; padding:2px;
margin:0; margin:0;
background-color:black; background-color:black;
color:white; color:white;
text-align:left;
} }
.output a, .output {
.output a:link, height:100% !important;
.output a:visited { }
.outputboxerror {
font-size:9pt;
color:white !important;
background-color:darkred;
}
.outputboxerror a,
.outputboxerror a:link,
.outputboxerror a:visited {
text-decoration:underline;
}
.outputboxok {
font-size:9pt;
background-color:green;
color:white !important;
}
.outputbox a,
.outputbox a:link,
.outputbox a:visited {
text-decoration: underline; text-decoration: underline;
color:white; color:white;
} }
.output p { .outputbox > pre > p {
background-color:gray; background-color:gray;
color:white; color:white;
} }
@ -334,12 +399,10 @@ span#socialbox > span > div > div:nth-child(3) {
} }
.webbuildtopright, .webbuildtopright,
.webbuildtopleft { .webbuildtopleft {
font-size:10pt;
margin-top:5px; margin-top:5px;
width:100%; width:100%;
} }
.chatpanel {
margin-left:10px;
}
select, select,
input { input {
margin:3px !important; margin:3px !important;
@ -358,11 +421,11 @@ input {
height:97%; height:97%;
word-wrap: break-word; word-wrap: break-word;
overflow:auto; overflow:auto;
font-size:7pt; font-size:9pt;
padding:0px; padding:0px;
top:5px; top:5px;
left:5px; left:5px;
// background-color:#e0f2d0; // background-color:#C4DDc0;
/* -moz-column-count: 2; /* -moz-column-count: 2;
-moz-column-gap: 1.5em; -moz-column-gap: 1.5em;
-moz-column-rule: none; -moz-column-rule: none;
@ -375,17 +438,12 @@ input {
column-rule: none;*/ column-rule: none;*/
} }
.CodeMirror {
border:1px solid #2b6600;
// font-size:10px; // causes problems
}
.jspVerticalBar { .jspVerticalBar {
width:4px; width:5px;
} }
.jspHorizontalBar { .jspHorizontalBar {
height:4px; height:5px;
} }
.jspDrag { .jspDrag {
@ -394,7 +452,7 @@ input {
.scroll-pane { .scroll-pane {
/* socialbox */ /* socialbox */
background-color: #e0f2d0; background-color: #C4DDC0;
height:130px; height:130px;
min-width:200px; min-width:200px;
width:100%; width:100%;
@ -417,7 +475,7 @@ input {
.scroll-pane3 { .scroll-pane3 {
/* processes */ /* processes */
background-color: #e0f2d0; background-color: #C4DDC0;
height:130px; height:130px;
width:auto; width:auto;
overflow:auto; overflow:auto;
@ -439,14 +497,91 @@ input {
/* socialbox */ /* socialbox */
.socialbox { .socialbox {
float:right; float:right;
font-size:8pt; font-size:10pt;
//border:0;
//margin:0;
//padding:0;
height:130px; height:130px;
width:99.4%;
line-height: 100%; line-height: 100%;
border:1px solid #2b6600; border:1px solid #2b6600;
} }
.socialbox div { margin-bottom:1px; } .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; } .downloadbox table { font-size: 11pt; border:1px solid #2b6600; margin: 4px; padding:4; background-color: #C4DDC0; }
div.speccreate { display:inline-block; }
/* simple pull-down menu */
#primary_nav_wrap
{
margin-top:15px
}
#primary_nav_wrap ul
{
list-style:none;
position:relative;
float:left;
margin:0;
padding:0
}
#primary_nav_wrap ul a
{
display:block;
color:#333;
text-decoration:none;
font-weight:700;
font-size:14px;
line-height:32px;
padding:0 15px;
font-family:"HelveticaNeue","Helvetica Neue",Helvetica,Arial,sans-serif
}
#primary_nav_wrap ul li
{
position:relative;
float:left;
margin:0;
padding:0
}
#primary_nav_wrap ul li.current-menu-item
{
background:#ddd
}
#primary_nav_wrap ul li:hover
{
background:#f6f6f6
}
#primary_nav_wrap ul ul
{
display:none;
position:absolute;
top:100%;
left:0;
background:#fff;
padding:0
}
#primary_nav_wrap ul ul li
{
float:none;
width:200px
}
#primary_nav_wrap ul ul a
{
line-height:120%;
padding:10px 15px
}
#primary_nav_wrap ul ul ul
{
top:0;
left:100%
}
#primary_nav_wrap ul li:hover > ul
{
display:block
}

9
webbuild/webbuild-cgi
View File

@ -49,16 +49,11 @@ if [ "$USER" ]; then
if [ "$SECRET" = "$USER_SECRET" ]; then if [ "$SECRET" = "$USER_SECRET" ]; then
[ "$REMOTE_ADDR" = "127.0.0.1" -o "$USER_SECRET" ] && USER_ENABLED=1 || USER_ENABLED= [ "$REMOTE_ADDR" = "127.0.0.1" -o "$USER_SECRET" ] && USER_ENABLED=1 || USER_ENABLED=
elif [ "$REQUEST" = "password" ]; then elif [ "$REQUEST" = "password" ]; then
/usr/libexec/webbuild-checkpassword "$PASSWORD" "$SECRET" 2>/dev/null /usr/libexec/webbuild-checkpassword "$PASSWORD" "$USER_SECRET" 2>/dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
USER_SECRET=$SECRET
tmpfile=`mktemp --suffix=webbuildtmp`
cat $WEBBUILD_STATEDIR/users/$USER.conf > $tmpfile
sed -i "/USER_SECRET=/d" $tmpfile
echo "USER_SECRET='$SECRET'" >> $tmpfile
$SUDO_WRAPPER 0 local "$USER" "" "mv $tmpfile $WEBBUILD_STATEDIR/users/$USER.conf"
USER_ENABLED=1 USER_ENABLED=1
else else
echo "SECRET=$SECRET" >&2
USER_ENABLED= USER_ENABLED=
fi fi
elif [ "${REQUEST:0:7}" != "refresh" ]; then elif [ "${REQUEST:0:7}" != "refresh" ]; then