diff --git a/webbuild/html/styles/webbuild-post.css b/webbuild/html/styles/webbuild-post.css
index 4cffc84..cdb4535 100644
--- a/webbuild/html/styles/webbuild-post.css
+++ b/webbuild/html/styles/webbuild-post.css
@@ -8,6 +8,8 @@ pre {
box-shadow:none;
font-family: monospace;
word-break: break-all;
+ white-space: pre-wrap;
+ word-wrap: break-word;
}
code {
@@ -23,34 +25,40 @@ hr { margin:0; color:black; background: #aaaaaa; }
label { white-space:nowrap; text-decoration:none; font-weight:initial; }
.webbuild input {
- font-size: 8pt;
+ font-size: 10pt;
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
padding: 1px;
margin: 1px;
}
select {
- font-size: 8pt;
+ font-size: 11pt;
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
- padding: 0;
- margin: 1px;
+ padding: 2px;
+ margin: 2px;
max-width: 98%;
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;
- padding: 1px;
+ padding: 2px;
margin: 1px;
border: 1px solid #AAAAAA;
}
input[type="button"] {
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
- font-size: 8pt;
+ font-size: 11pt;
font-weight: 400;
- margin: 1px;
+ padding: 2px;
+ margin: 2px;
border: 1px solid #AAAAAA;
+ background-color:#e9e9e9;
white-space:nowrap;
line-height: 1.1em;
}
@@ -59,20 +67,21 @@ input[type="button"]::-moz-focus-inner { padding: 0; border: 0; }
input[type="button"]:hover {
border: 1px solid #666666;
+
}
input[type="radio"] {
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
- font-size: 7pt;
+ font-size: 11pt;
padding: 0;
margin: 0;
}
input[type="checkbox"] {
font-family:liberationsans,freesans,Arial,Verdana,Helvetica,sans-serif;
vertical-align:middle;
- -ms-transform: scale(0.9);
- -moz-transform: scale(0.9);
- -webkit-transform: scale(0.9);
- -o-trasnform: scale(0.9);
- padding: 1px;
- margin: 1px;
+ -ms-transform: scale(1.3);
+ -moz-transform: scale(1.3);
+ -webkit-transform: scale(1.3);
+ -o-trasnform: scale(1.3);
+ padding: 4px;
+ margin: 4px;
}
diff --git a/webbuild/html/styles/webbuild-standalone.css b/webbuild/html/styles/webbuild-standalone.css
index 9082cdd..6617157 100644
--- a/webbuild/html/styles/webbuild-standalone.css
+++ b/webbuild/html/styles/webbuild-standalone.css
@@ -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); }
-table { font-size: 9pt; 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: 13pt; font-weight: bold; }
-h2 { font-size: 11pt; font-weight: bold; }
-h3 { font-size: 10pt; font-weight: bold; margin-top: 20px; margin-bottom: 2px; }
-h4 { margin:5; margin-right: 10; font-size: 9pt; font-weight: normal; }
+body {
+ font-size: 11pt;
+ padding: 10px;
+ font-family: liberationsans, freesans, arial, verdana, sans-serif;
+ color: rgb(0, 0, 0);
+ background-color: rgb(255, 255, 255);
+}
+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; }
a { }
a:link { color:#2b6600; text-decoration: none; }
diff --git a/webbuild/html/styles/webbuild.css b/webbuild/html/styles/webbuild.css
index cfe4cc5..d01659a 100644
--- a/webbuild/html/styles/webbuild.css
+++ b/webbuild/html/styles/webbuild.css
@@ -1,3 +1,7 @@
+div#container {
+ max-width: initial;
+}
+
.boldbutton {
font-weight: bold !important;
}
@@ -44,7 +48,7 @@
display:inline-block;
text-align:center;
position:relative;
- font-size:10pt;
+ font-size:12pt;
padding:5px;
align:center;
margin-top:200px;
@@ -85,7 +89,7 @@
.windowbox {
display:inline-block;
position:relative;
- font-size:10pt;
+ font-size:12pt;
padding:5px;
margin:100px;
margin-right:auto;
@@ -97,7 +101,7 @@
}
.multiselect {
- font-size:8pt;
+ font-size:11pt;
border:0px;
padding:0px;
height:130px;
@@ -117,47 +121,48 @@
}
.searchbox {
float:left;
- width:215px;
+ width:100%;
align:center;
- font-size:8pt;
+ font-size:11pt;
border:1px solid #2b6600;
- padding:2px;
- background-color: #e0f2d0;
+ padding:4px;
+ background-color: #c4ddc0;
+}
+input#repsearchtext {
+ width:100%;
}
.chatpanel {
float:left;
- width:215px;
- align:center;
+ width:100%;
+ padding:0px;
}
.webbuild {
- font-size: 8pt;
+ font-size: 10.5pt;
font-family: liberationsans, freesans, arial, verdana, sans-serif;
line-height: 1.3em;
color: #000000;
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 h1 { font-size: 13pt; font-weight: bold; }
-.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 h1 { font-size: 15pt; font-weight: bold; }
+.webbuild h2 { font-size: 13pt; font-weight: bold; }
+.webbuild h3 { font-size: 11pt; font-weight: bold; margin-top: 20px; margin-bottom: 2px; }
+.webbuild h4 { margin:5; margin-right: 10; font-size: 11pt; font-weight: normal; }*/
.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;
+ /*margin-right:210px !important;*/
padding:0;
margin:0;
}
@@ -168,23 +173,28 @@
}
@media screen and (min-width: 901px) {
-.webbuildright {
- width:202px;
-}
-.socialbox {
- width:200px;
-}
+ .webbuildwrapleft {
+ float:left;
+ width:74.65%;
+ }
+ .webbuildright {
+ width:24.65%;
+ }
+ .socialbox {
+ min-width:98% !important;
+ }
}
+
.operationpanelinfo {
margin-top:137px;
border:1px solid #2b6600;
- background-color:#E0F2D0;
+ background-color:#C4DDC0;
padding:1px;
}
.operationpanelsend {
margin-top:5px;
border:1px solid #2b6600;
- background-color:#E0F2D0;
+ background-color:#C4DDC0;
padding:1px;
}
.operationpanelautodist {
@@ -196,7 +206,7 @@
.operationpanelpatches {
margin-top:5px;
border:1px solid #2b6600;
- background-color:#E0F2D0;
+ background-color:#C4DDC0;
padding:1px;
}
.operationpanelupload {
@@ -233,7 +243,7 @@
padding:0;
}
.webbuildprocesses {
- font-size:7pt;
+ font-size:10pt;
padding:0px;
height:130px;
line-height: 130%;
@@ -242,69 +252,124 @@
width:100%;
margin:0;
// display:table-cell;
- background-color:#E0F2D0;
+ background-color:#C4DDC0;
padding:1px;
}
.processes {
width:100%;
}
+.CodeMirror {
+ font-size:10pt;
+ font-family:monospace;
+ line-height:1.0em;
+ border:1px solid #2b6600;
+/* font-size:12px; // causes problems*/
+}
.editor {
float:left;
width:100%;
- height:300px;
+ height:500px;
border:1px solid #cccccc;
padding:0px;
margin:0px;
font-family:monospace;
- font-size:8pt;
+ font-size:10pt;
}
.maintainer {
float:left;
width:100%;
- height:300px;
+ height:400px;
overflow:auto;
- font-size:7pt;
+ font-size:11pt;
border:1px solid #2b6600;
+ line-height:1.1em;
padding:1px;
margin:0;
background-color:white;
float:left;
}
-
+.maintainer a {
+ color:#426c29;
+ font-size:11pt;
+}
.notes {
- width:680px;
- font-size:7pt;
+ width:100%;
+ font-size:10pt;
border:1px solid #2b6600;
- padding:2px;
+ padding:1px;
margin:0;
margin-bottom:2px;
+ margin-top:2px;
background-color:#ffff00;
}
-.output {
+.downloadbox > div {
+ width:100% !important;
+/* background-color:#c4ddc0 !important;*/
+}
+
+.showlogbox a {
+ color:#5e913e !important;
+}
+
+.showlogbox {
+ height:250px;
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-x:hidden;
word-wrap: break-word;
font-family:monospace;
- font-size:8pt;
+ font-size:9pt;
font-weight:400;
border:1px solid #2b6600;
padding:2px;
margin:0;
background-color:black;
color:white;
+ text-align:left;
}
-.output a,
-.output a:link,
-.output a:visited {
+.output {
+ height:100% !important;
+}
+
+.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;
color:white;
}
-.output p {
+.outputbox > pre > p {
background-color:gray;
color:white;
}
@@ -334,12 +399,10 @@ span#socialbox > span > div > div:nth-child(3) {
}
.webbuildtopright,
.webbuildtopleft {
+ font-size:10pt;
margin-top:5px;
width:100%;
}
-.chatpanel {
- margin-left:10px;
-}
select,
input {
margin:3px !important;
@@ -358,11 +421,11 @@ input {
height:97%;
word-wrap: break-word;
overflow:auto;
- font-size:7pt;
+ font-size:9pt;
padding:0px;
top:5px;
left:5px;
-// background-color:#e0f2d0;
+// background-color:#C4DDc0;
/* -moz-column-count: 2;
-moz-column-gap: 1.5em;
-moz-column-rule: none;
@@ -375,17 +438,12 @@ input {
column-rule: none;*/
}
-.CodeMirror {
- border:1px solid #2b6600;
-// font-size:10px; // causes problems
-}
-
.jspVerticalBar {
- width:4px;
+ width:5px;
}
.jspHorizontalBar {
- height:4px;
+ height:5px;
}
.jspDrag {
@@ -394,7 +452,7 @@ input {
.scroll-pane {
/* socialbox */
- background-color: #e0f2d0;
+ background-color: #C4DDC0;
height:130px;
min-width:200px;
width:100%;
@@ -417,7 +475,7 @@ input {
.scroll-pane3 {
/* processes */
- background-color: #e0f2d0;
+ background-color: #C4DDC0;
height:130px;
width:auto;
overflow:auto;
@@ -439,14 +497,91 @@ input {
/* socialbox */
.socialbox {
float:right;
- font-size:8pt;
- //border:0;
- //margin:0;
- //padding:0;
+ font-size:10pt;
height:130px;
+ width:99.4%;
line-height: 100%;
border:1px solid #2b6600;
}
.socialbox div { margin-bottom:1px; }
.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
+}
diff --git a/webbuild/webbuild-cgi b/webbuild/webbuild-cgi
index e355d11..c928ee5 100755
--- a/webbuild/webbuild-cgi
+++ b/webbuild/webbuild-cgi
@@ -49,16 +49,11 @@ if [ "$USER" ]; then
if [ "$SECRET" = "$USER_SECRET" ]; then
[ "$REMOTE_ADDR" = "127.0.0.1" -o "$USER_SECRET" ] && USER_ENABLED=1 || USER_ENABLED=
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
- 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
else
+ echo "SECRET=$SECRET" >&2
USER_ENABLED=
fi
elif [ "${REQUEST:0:7}" != "refresh" ]; then