FSN#38717

svn path=/Website/trunk/; revision=31929

APPL/PDA/BijlagenForm.asp

@@ -117,13 +117,13 @@ if (params.extFilter)
     CONTENT_START();
 %>
     <FORM name="u2" method="post" enctype="multipart/form-data" target="hidFrameUpload">
-          <label><%=L("lcl_upload_file")%><% if (params.extFilter) { Response.Write(" (" + safe.html(params.extFilter) + ")"); } %>:</label>
+          <label for="imgfile" class="uploadbutton"><p data-role='button' data-icon='cloud'><%=L("lcl_select_file")%></p><% if (params.extFilter) { Response.Write(" (" + safe.html(params.extFilter) + ")"); } %></label>
           <input type="file" name="imgfile" id="imgfile" style="width: 95%" onchange='doSubmitUpload()'>
           <div id="uploading" style="display:none">
                   Please wait...
           </div>
 <%
-      BUTTON(L("lcl_do_upload_image"), {click: "doSubmitUpload()", dataicon: "forward", id: "btn_upload"});
+      BUTTON(L("lcl_do_upload_image"), {click: "doSubmitUpload()", dataicon: "cloud", id: "btn_upload"});
       IFACE.FORM_END();
 %>
     </FORM>

APPL/PDA/default.css

@@ -213,9 +213,6 @@ div.subheader {
 
 .suggest {
     background-color: #FFFFE3 !important;
-    background-image: url(../../appl/shared/suggest/suggest.png) !important;
-    background-repeat: no-repeat !important;
-    background-position: right 5px center !important;
 }
 
 #mobplan {
@@ -435,4 +432,23 @@ html body .ui-group-theme-e a {
 
 .ui-overlay-c,.ui-page-theme-c,.ui-page-theme-c .ui-panel-wrapper{
   color: #555;
+}
+
+input[type="file"] {
+    display: none !important;
+}
+.uploadbutton {
+    cursor: pointer;
+    font-weight: bold !important;
+}
+input.hasIcon, input.hasDatepicker {
+    float: left;
+}
+div.suggestklikker, i.dateklikker {
+    display:inline-block;
+    width:0px;
+    text-align:center;
+    position: relative;
+    left: -20px;
+    padding: 0.34em 0;
 }

APPL/Shared/BijlagenForm.asp

@@ -325,9 +325,9 @@ if (fso.FolderExists(params.AttachPath))
         buttons.push({ title: L("lcl_do_upload_image"), action: "doSubmitUpload()", singlepress: true, id: "btn_upload_submit"});
         var isMultiple = (((pMulti || params.multi) && !params.forcesingle) ? "multiple" : "");
 %>      <tr><td colspan="4">
-          <label><%=L("lcl_upload_file")%>:</label>
+          <label for="file-upload" class="uploadbutton"><i class="fa fa-upload fa-lg">&nbsp;</i><%=L("lcl_upload_file")%>:</label>
           <% if (params.extFilter) { Response.Write("(" + safe.html(params.extFilter) + ")"); } %>
-              <input type="file" <%=isMultiple%> name="imgfile" style="width: 95%" onchange="iface.button[this.value?'enable':'disable']('btn_upload_submit')">
+              <input id="file-upload" type="file" <%=isMultiple%> name="imgfile" style="width: 95%" onchange="iface.button[this.value?'enable':'disable']('btn_upload_submit')">
           <div id="uploading" style="display:none">
                   Please wait...
           </div>

APPL/Shared/default.csx

@@ -206,7 +206,7 @@ select:hover {
 }
 
 input[type=file] {
-  border:0px solid #ccc;
+  border: 0;
   background-color: #FFFDF1;
 }
 
@@ -769,12 +769,12 @@ body.modal .fcltblock {
 .fcltblockhead {
     background-color:==blockheaderbackgroundcolor==;
     color: ==blockheadercolor==;
-    font-weight:bold;
+    font-weight: bold;
     font-size: 1.1em;
     padding: 2px 0 0 2px;
     height: 25px;
     border-style: outset;
-    border-top: 1px solid #e8e8e8;
+    border-top: 1px solid #bbb;
     border-left: 1px solid #eee;
     border-right: 1px solid #eee;
 }
@@ -783,19 +783,9 @@ body.modal .fcltblock {
    margin-bottom: -3px;
 }
 
-#editbody .fcltblockhead {
-    background-color:==blockheaderbackgroundcolor==;
-    color: ==blockheadercolor==;
-}
 body.modal .fcltblockhead{
-    background-color:==blockheaderbackgroundcolor==;
-    color: ==blockheadercolor==;
     border:0px;
 }
-#showbody .fcltblockhead {
-    background-color: ==showblockheaderbackgroundcolor==;
-    color: ==blockheadercolor==;
-}
 #showbody td,
 #editbody td,
 #searchbody td,
@@ -810,8 +800,9 @@ td.time {
 .fcltblock .inside {
     padding: 1px 0 2px 0;
     background-color: ==backgroundcolor==;
-    border:1px solid #eee;
+    border: 1px solid #eee;
     border-top: 0;
+    border-bottom: 0;
 }
 
 .leftcontainer .fcltblock {
@@ -1129,6 +1120,7 @@ padding-right: 15px!important;
 #buttons ul li,
 #buttons ul li a,
 .mv,
+.uploadbutton,
 #mobbutton,
 input[type=button],
 input[type=text].button,
@@ -1153,6 +1145,7 @@ input.button:hover,
 #mobbutton:hover,
 input[type=button]:hover,
 input[type=text].button:hover,
+.uploadbutton:hover,
 span.button:hover {
     color: ==buttonhovercolor==;
     background-color:==buttonhoverbackgroundcolor==;
@@ -1302,9 +1295,12 @@ div.buttoncontainer {
     background-color: transparent!important;
 }
 /* een inline button */
-.ilbutton
-{
+.ilbutton {
     cursor: pointer;
+    color: ==buttonbackgroundcolor==;  /*TODO*/
+}
+.ilbutton:hover {
+    color: ==buttonhovercolor==;
 }
 
 li.dialog span.default,
@@ -1393,7 +1389,15 @@ label.cadselect i.fa {
    font-weight: normal;
    font-size: 2em;
 }
-
+.uploadbutton {
+    border: 1px solid #ccc;
+    display: inline-block;
+    padding: 6px 12px;
+    cursor: pointer;
+}
+input[type=file] {
+    display: none;
+}
 .fileopen {
     width: 16px;
     height: 16px;
@@ -2552,6 +2556,12 @@ tr.mod_xcp .fldcontroletype, tr.mod_xcp .fldsel_srtcontrole, tr.mod_xcp .fldeenh
 .suggest {
   background-position: right 4px center;
 }
+.fldflexD, .fldSflexD {
+    width: 218px;
+}
+input[readonly].fldflexD {
+    width: 218px;
+}
 .fldflex, .fldflexC, .fldflexC50, .fldflexX, .fldflexL, .fldflexQ, .fldflexF, .fldflexM, .fldflexE, .fldflexS,
 .fldSflex, .fldSflexC, .fldSflexX, .fldSflexL, .fldSflexQ, .fldSflexF, .fldSflexM, .fldSflexE, .fldSflexS
 {
@@ -2634,6 +2644,9 @@ input.materiaal
     {
       width: 340px;
     }
+    .fldflexD, .fldSflexD {
+      width: 340px;
+    }
     .fldflexR, .fldSflexR
     {
       width: 346px;
@@ -2893,12 +2906,6 @@ tr.flexcollapsable td {
   background-image: none;
   }
 
-.fldflexD, .fldSflexD {
-    width: 196px;
-}
-input[readonly].fldflexD {
-    width: 218px;
-}
 .fldflexN, .fldSflexN {
     width: 100px;
 }
@@ -3570,7 +3577,7 @@ span.notapproved {
 }
 
 input.suggest::-ms-clear, input#autofilter::-ms-clear, input#menufilter::-ms-clear,
-input#materiallist_button::-ms-clear, input.suggestBusy::-ms-clear, input.fldflexF::-ms-clear, #uitvoerendelist_button::-ms-clear
+input#materiallist_button::-ms-clear, input.suggestBusy::-ms-clear, input.fldflexF::-ms-clear, #uitvoerendelist_button::-ms-clear, .hasDatepicker::-ms-clear
 {
   width : 0;
   height: 0;
@@ -4184,13 +4191,6 @@ li.hasIcon.dialog i.fa
     line-height: 1.2em;
     vertical-align: middle;
 }
-@media all and (min-width: 0){
-    .icontxt { display: none; }
-}
-
-@media all and (min-width: 50em){
-    .icontxt {display: inline; }
-}
 
 div.smallbuttons .icontxt {
     display: none;
@@ -4431,3 +4431,11 @@ div#prsAV {
         margin-top:10%;
     }
 }
+.headerToggle {
+    text-align: center;
+    padding-right: 2px;
+}
+.headerToggle i {
+    color: ==frameheaderbackgroundcolor==;
+    cursor: pointer;
+}