Theme changes for the drag and drop zone (Bug #1050297)

Change-Id: I540e5598266b72721388dc4874ae51d5e38637fa
Signed-off-by: Robert Lyon <robertl@catalyst.net.nz>

htdocs/artefact/file/theme/raw/form/filebrowser.tpl

@@ -64,6 +64,11 @@
       {contextualhelp plugintype='artefact' pluginname='file' form='files_filebrowser' element='resizeonuploaduseroption'}
   </div>
   {/if}
+  <div id="file_dropzone_container" class="{$prefix}">
+      <div id="fileDropzone" class="dropzone-previews" style="display:none;">
+        <div class="dz-message">{str tag=dragdrophere section=artefact.file}</div>
+      </div>
+  </div>
   <div class="uploadform">
     <div id="{$prefix}_uploadsubmit_container">{* filebrowser.js may add a submit button in here even if config.submitbutton is off *}
       {if $config.submitbutton}
@@ -72,12 +77,14 @@
       <noscript><input type="submit" class="submit" name="{$prefix}_upload" id="{$prefix}_upload" value="{str tag=upload section=artefact.file}" /></noscript>
     </div>
   </div>
+
 </div>
 {/if}
 {if $config.upload}
 <div id="{$prefix}_upload_disabled" class="uploaddisabled{if !$uploaddisabled} hidden{/if}">{str tag="cannoteditfolder" section=artefact.file}</div>
 {/if}
 
+
 {if $config.edit}
 <input type="hidden" name="{$prefix}_move" id="{$prefix}_move" value="" />
 <input type="hidden" name="{$prefix}_moveto" id="{$prefix}_moveto" value="" />
@@ -89,12 +96,6 @@
     <input type="submit" class="submit" name="{$prefix}_createfolder" id="{$prefix}_createfolder" value="{str tag=createfolder section=artefact.file}" /></div>
 {/if}
 
-<div id="file_dropzone_container" class="{$prefix}">
-  <div id="fileDropzone" class="dropzone-previews" style="display:none;">
-    <div class="dz-message">{str tag=dragdrophere section=artefact.file}</div>
-  </div>
-</div>
-
 <div id="{$prefix}_foldernav" class="foldernav">
 {include file="artefact:file:form/folderpath.tpl" path=$path querybase=$querybase owner=$tabs.owner ownerid=$tabs.ownerid}
 </div>

htdocs/artefact/file/theme/raw/static/style/style.css

@@ -97,24 +97,16 @@ tr.folderhover a,
 }
 /* Drop file upload */
 #file_dropzone_container {
-    border-radius: 5px;
-    border: 2px solid #EBF0F4;
-    margin-bottom: 3px;
+    margin: 10px 0 0 0;
 }
 #file_dropzone_container .dz-message {
-    height: 30px;
-    padding: 15px 0 0;
+    padding: 17px 0;
     margin: 0;
     opacity: 1;
     position: relative;
     transition: opacity 0.3s ease-in-out 0s;
     text-align: center;
-    font-size: 2em;
-    color: #CBCBCB;
 }
 #file_dropzone_container .dz-preview {
     display: none;
-}
-#file_dropzone_container.dragover {
-    background-color: #EBF0F4;
 }
\ No newline at end of file

htdocs/theme/aqua/static/style/style.css

@@ -102,7 +102,9 @@ input#export_submit,
 #sitelicenses .btn,
 #adduser #adduser_submit,
 input#login_submit,
-.login-externallink a.btn {
+.login-externallink a.btn,
+input#viewlayout_submit,
+input#files_filebrowser_upload {
     background: url(../images/btn_bkgd.png) repeat-x 0 50%;
     border-color: #0b1962;
     color: #FFFFFF;
@@ -133,7 +135,9 @@ input#export_submit:hover,
 #sitelicenses .btn:hover,
 #adduser #adduser_submit:hover,
 input#login_submit:hover,
-.login-externallink a.btn:hover {
+.login-externallink a.btn:hover,
+input#viewlayout_submit:hover,
+input#files_filebrowser_upload:hover {
     background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
     border-color: #0b1962;
     color: #FFFFFF;
@@ -164,7 +168,9 @@ input#export_submit:active,
 #sitelicenses .btn:active,
 #adduser #adduser_submit:active,
 input#login_submit:active,
-.login-externallink a.btn:active {
+.login-externallink a.btn:active,
+input#viewlayout_submit:hover,
+input#files_filebrowser_upload:hover {
     background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
     border-color: #3C7FB1;
     color: #FFFFFF;

htdocs/theme/default/static/style/style.css

@@ -110,7 +110,9 @@ input#export_submit,
 #sitelicenses .btn,
 #adduser #adduser_submit,
 input#login_submit,
-.login-externallink a.btn {
+.login-externallink a.btn,
+input#viewlayout_submit,
+input#files_filebrowser_upload {
 	border-color: #51732f;
 	background: url(../images/btn_bkgd.png) repeat-x 0 50%;
 	color: #FFFFFF;
@@ -141,7 +143,9 @@ input#export_submit:hover,
 #sitelicenses .btn:hover,
 #adduser #adduser_submit:hover,
 input#login_submit:hover,
-.login-externallink a.btn:hover {
+.login-externallink a.btn:hover,
+input#viewlayout_submit:hover,
+input#files_filebrowser_upload:hover {
     border-color: #73b332;
     background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
 	color: #FFFFFF;
@@ -172,7 +176,9 @@ input#export_submit:active,
 #sitelicenses .btn:active,
 #adduser #adduser_submit:active,
 input#login_submit:active,
-.login-externallink a.btn:active {
+.login-externallink a.btn:active,
+input#viewlayout_submit:active,
+input#files_filebrowser_upload:active {
 	border-color: #244700;
 	background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
 	color: #FFFFFF;
@@ -942,6 +948,9 @@ a.persona-button:before {
 .uploaddisabled, .fileupload, #createfolder {
     background-color: #ebf0f4;
 }
+#file_dropzone_container {
+    background-color: #f7f7f7;
+}
 /* Portfolio > Collections > Configure access */
 #collectionpageswrap {
 	background: #FAFBF7;

htdocs/theme/fresh/static/style/style.css

@@ -118,7 +118,9 @@ input#export_submit,
 #sitelicenses .btn,
 #adduser #adduser_submit,
 input#login_submit,
-.login-externallink a.btn {
+.login-externallink a.btn,
+input#viewlayout_submit,
+input#files_filebrowser_upload {
     background: url(../images/btn_bkgd.png) repeat-x 0 50%;
 	border-color: #1c3c47;
 	color: #FFFFFF;
@@ -149,7 +151,9 @@ input#export_submit:hover,
 #sitelicenses .btn:hover,
 #adduser #adduser_submit:hover,
 input#login_submit:hover,
-.login-externallink a.btn:hover {
+.login-externallink a.btn:hover,
+input#viewlayout_submit:hover,
+input#files_filebrowser_upload:hover {
 	background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
 	border-color: #1c3c47;
 	color: #FFFFFF;
@@ -180,7 +184,9 @@ input#export_submit:active,
 #sitelicenses .btn:active,
 #adduser #adduser_submit:active,
 input#login_submit:active,
-.login-externallink a.btn:active {
+.login-externallink a.btn:active,
+input#viewlayout_submit:active,
+input#files_filebrowser_upload:active {
 	background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
 	border-color: #1c3c47;
 	color: #FFFFFF;
@@ -510,6 +516,14 @@ a.persona-button:before{ /* Triangle */
 #createfolder {
     background: #13282f;
 }
+#file_dropzone_container {
+    background-color: #344f58;
+    -webkit-box-shadow: inset 0px 0px 5px 0px #13282f;
+	box-shadow: inset 0px 0px 5px 0px #13282f;
+}
+#file_dropzone_container .dz-message {
+    color: #8ebacb;
+}
 /* edit row background */
 tr.editrow,
 tr.editrow td,

htdocs/theme/primaryschool/static/style/style.css

@@ -106,7 +106,9 @@ input#export_submit,
 #sitelicenses .btn,
 #adduser #adduser_submit,
 input#login_submit,
-.login-externallink a.btn {
+.login-externallink a.btn,
+input#viewlayout_submit,
+input#files_filebrowser_upload {
     background: url(../images/btn_bkgd.png) repeat-x 0 50%;
 	border: 1px solid #ab650f;
 	color: #000000;
@@ -137,7 +139,9 @@ input#export_submit:hover,
 #sitelicenses .btn:hover,
 #adduser #adduser_submit:hover,
 input#login_submit:hover,
-.login-externallink a.btn:hover {
+.login-externallink a.btn:hover,
+input#viewlayout_submit:hover,
+input#files_filebrowser_upload:hover {
 	background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
 	border: 1px solid #ab650f;
 	color: #000000;
@@ -168,7 +172,9 @@ input#export_submit:active,
 #sitelicenses .btn:active,
 #adduser #adduser_submit:active,
 input#login_submit:active,
-.login-externallink a.btn:active {
+.login-externallink a.btn:active,
+input#viewlayout_submit:active,
+input#files_filebrowser_upload:active {
 	background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
 	border: 1px solid #ca7711;
 	color: #000000;
@@ -876,6 +882,9 @@ a.persona-button:before{ /* Triangle */
 #createfolder {
     background-color: #ecf0fc;
 }
+#file_dropzone_container {
+    background-color: #f3f6fe;
+}
 /* Portfolio > Pages */
 /* page/collection submission form */
 .submissionform {

htdocs/theme/raw/static/style/style.css

@@ -73,7 +73,7 @@ p span {
     line-height: 1.333em;
 }
 .backtrace {
-    font: normal 100% monospace;
+    font: normal 110%/1.5em monospace;
 }
 /******************** Body ********************/
 body {
@@ -272,7 +272,7 @@ span.error {
 }
 div.info {
     background: #E5ECF4 url(../images/info.png) no-repeat 4px 4px;
-    padding: 5px 5px 5px 26px;
+    padding: 5px 5px 5px 27px;
     -webkit-border-radius: 5px;
     -moz-border-radius: 5px;
     border-radius: 5px;
@@ -886,7 +886,10 @@ input#account_delete_submit:active {
 #viewforum a.newforumtopic,
 #forumbtns a.newforum,
 .groupuserstatus .admincontrol .btn-editgroup,
-input#login_submit {
+input#login_submit,
+input#files_filebrowser_upload,
+input#instconf_artefactids_upload,
+input#instconf_artefactid_upload {
     font-weight: bold;
 }
 /* bigger buttons */
@@ -917,7 +920,11 @@ input#instconf_artefactids_edit_artefact,
 input#instconf_artefactids_edit_cancel,
 input#instconf_artefactid_edit_artefact,
 input#instconf_artefactid_edit_cancel,
-#addlayout {
+#addlayout,
+input#viewlayout_submit,
+input#files_filebrowser_upload,
+input#instconf_artefactids_upload,
+input#instconf_artefactid_upload {
     padding: 5px 10px;
     font-size: 1.167em
 }
@@ -2034,6 +2041,30 @@ a.persona-button:after {
     background: url(../images/foldernav.png) no-repeat 0 0;
     margin-top: 20px;
 }
+#files_filebrowser_uploadsubmit_container,
+#instconf_artefactids_uploadsubmit_container,
+#instconf_artefactid_uploadsubmit_container {
+    margin: 10px 0 5px 0;
+}
+/* drop file upload */
+#file_dropzone_container {
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    background-color: #EEEEEE;
+    -webkit-box-shadow: inset 0px 0px 3px 0px #888888;
+	box-shadow: inset 0px 0px 3px 0px #888888;
+}
+.no-js #file_dropzone_container {
+    display: none;
+}
+#file_dropzone_container.dragover {
+    background-color: #FFFFF7;
+}
+#file_dropzone_container .dz-message {
+    font-size: 2em;
+    color: #888888;
+}
 /* edit row background */
 tr.editrow,
 tr.editrow td,
@@ -3725,4 +3756,4 @@ ul.searchtab li span.inactive {
 }
 .wallpost .controls a {
     margin: 0 0 0 5px;
-}
\ No newline at end of file
+}

htdocs/theme/sunset/static/style/style.css

@@ -107,7 +107,9 @@ input#export_submit,
 #sitelicenses .btn,
 #adduser #adduser_submit,
 input#login_submit,
-.login-externallink a.btn {
+.login-externallink a.btn,
+input#viewlayout_submit,
+input#files_filebrowser_upload {
 	background: url(../images/btn_bkgd.png) repeat-x 0 50%;
 	border-color: #be680b;
 	color: #FFFFFF;
@@ -138,7 +140,9 @@ input#export_submit:hover,
 #sitelicenses .btn:hover,
 #adduser #adduser_submit:hover,
 input#login_submit:hover,
-.login-externallink a.btn:hover {
+.login-externallink a.btn:hover,
+input#viewlayout_submit:hover,
+input#files_filebrowser_upload:hover {
 	background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
 	border-color: #be680b;
 	color: #FFFFFF;
@@ -169,7 +173,9 @@ input#export_submit:active,
 #sitelicenses .btn:active,
 #adduser #adduser_submit:active,
 input#login_submit:active,
-.login-externallink a.btn:active {
+.login-externallink a.btn:active,
+input#viewlayout_submit:active,
+input#files_filebrowser_upload:active {
 	background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
 	border-color: #8E1901;
 	color: #FFFFFF;

htdocs/theme/ultima/static/style/style.css

@@ -108,7 +108,9 @@ input#export_submit,
 #sitelicenses .btn,
 #adduser #adduser_submit,
 input#login_submit,
-.login-externallink a.btn {
+.login-externallink a.btn,
+input#viewlayout_submit,
+input#files_filebrowser_upload {
     background: url(../images/btn_bkgd.png) repeat-x 0 50%;
 	border-color: #861d80;
 	color: #FFFFFF;
@@ -139,7 +141,9 @@ input#export_submit:hover,
 #sitelicenses .btn:hover,
 #adduser #adduser_submit:hover,
 input#login_submit:hover,
-.login-externallink a.btn:hover {
+.login-externallink a.btn:hover,
+input#viewlayout_submit:hover,
+input#files_filebrowser_upload:hover {
     background: url(../images/btn_bkgd_hover.png) repeat-x 0 50%;
 	border-color: #861d80;
 	color: #FFFFFF;
@@ -170,7 +174,9 @@ input#export_submit:active,
 #sitelicenses .btn:active,
 #adduser #adduser_submit:active,
 input#login_submit:active,
-.login-externallink a.btn:active {
+.login-externallink a.btn:active,
+input#viewlayout_submit:active,
+input#files_filebrowser_upload:active {
     background: url(../images/btn_bkgd_focus.png) repeat-x 0 50%;
 	border-color: #3C083F;
 	color: #FFFFFF;