diff --git a/themes/vivo-basic/css/formedit.css b/themes/vivo-basic/css/formedit.css
index 7ace681e..c88529b7 100644
--- a/themes/vivo-basic/css/formedit.css
+++ b/themes/vivo-basic/css/formedit.css
@@ -8,52 +8,41 @@
**************************************************/
form {
- padding-bottom: 20px;
+ padding-bottom: 20px;
}
-
.form p {
margin-bottom:0.5em;
}
-
form textarea {
- width: 60%;
+ width: 60%;
}
-
form a:link.cancel, form a:visited.cancel {
- color: #f70;
- border-color: #f70;
+ color: #f70;
+ border-color: #f70;
}
-
form a:hover.cancel {
- color: #fff;
- background: #f70;
+ color: #fff;
+ background: #f70;
}
-
form select option{
- padding-right: 5px;
+ padding-right: 5px;
}
-
form dl {
- margin-bottom: 20px;
+ margin-bottom: 20px;
}
-
form dl dt, form dl dd {
- padding-top: 15px;
+ padding-top: 15px;
}
-
.validationError {
font-weight:bold;
color:red;
}
-
.inlineForm input {
display:inline;
}
-
.inlineForm label {
display:inline;
}
-
p.submit {
clear: left;
margin-top: 2em;
diff --git a/themes/wilma/css/edit.css b/themes/wilma/css/edit.css
new file mode 100644
index 00000000..83caa526
--- /dev/null
+++ b/themes/wilma/css/edit.css
@@ -0,0 +1,14 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+
+/******************* mb863: willma styles ********************************/
+
+label{
+ display: block;
+ margin-top: .5em;
+}
+input{
+ padding:0;
+}
+
+
diff --git a/themes/wilma/css/formedit.css b/themes/wilma/css/formedit.css
index 0997ed06..a2b4c0d4 100644
--- a/themes/wilma/css/formedit.css
+++ b/themes/wilma/css/formedit.css
@@ -7,55 +7,4 @@ wilma theme: editing form styles copied from vivo-basic
This document is included by formPrefix.jsp
-**************************************************/
-form {
- padding-bottom: 20px;
-}
-
-.form p {
- margin-bottom:0.5em;
-}
-
-form textarea {
- width: 60%;
-}
-
-form a:link.cancel, form a:visited.cancel {
- color: #f70;
- border-color: #f70;
-}
-
-form a:hover.cancel {
- text-decoration: none;
-}
-
-form select option{
- padding-right: 5px;
-}
-
-form dl {
- margin-bottom: 20px;
-}
-
-form dl dt, form dl dd {
- padding-top: 15px;
-}
-
-.validationError {
- font-weight:bold;
- color:red;
-}
-
-.inlineForm input {
- display:inline;
-}
-
-.inlineForm label {
- display:inline;
-}
-
-p.submit {
- clear: left;
- margin-top: 2em;
-}
diff --git a/themes/wilma/css/forms.css b/themes/wilma/css/forms.css
deleted file mode 100644
index 98dabd0c..00000000
--- a/themes/wilma/css/forms.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/* $This file is distributed under the terms of the license in /doc/license.txt$ */
-
-/* Placeholder for Wilma theme: editing form styles */
diff --git a/themes/wilma/css/screen.css b/themes/wilma/css/screen.css
index 5973bdba..e5c08df6 100644
--- a/themes/wilma/css/screen.css
+++ b/themes/wilma/css/screen.css
@@ -24,7 +24,7 @@ VIVO wilma theme: screen styles
@import url("transition/holdover-vivobasic/screen.css");
@import url("reset.css");
+@import url("edit.css");
@import url("pictos.css");
@import url("wilma.css");
-@import url("forms.css");
-@import url("formedit.css");
+/*@import url("formedit.css"); mb863 move the content of formedit.css to edit.css in vtiro */
diff --git a/themes/wilma/templates/edit/formPrefix.jsp b/themes/wilma/templates/edit/formPrefix.jsp
index c4d6ab49..e99a76c2 100644
--- a/themes/wilma/templates/edit/formPrefix.jsp
+++ b/themes/wilma/templates/edit/formPrefix.jsp
@@ -37,10 +37,14 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
Edit
-
-
+
+
+
+
<%-- ${headScripts.add("/js/html5.js")} --%>
+
+
<%
String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false";
diff --git a/themes/wilma/templates/menu.ftl b/themes/wilma/templates/menu.ftl
index e1efb801..d78edc4b 100644
--- a/themes/wilma/templates/menu.ftl
+++ b/themes/wilma/templates/menu.ftl
@@ -53,8 +53,6 @@
-
-
diff --git a/themes/wilma/templates/page-home.ftl b/themes/wilma/templates/page-home.ftl
index ef876232..88fd9cbb 100644
--- a/themes/wilma/templates/page-home.ftl
+++ b/themes/wilma/templates/page-home.ftl
@@ -13,7 +13,7 @@
- ${stylesheets.addFromTheme("/css/screen.css")}
+ <#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
<#include "stylesheets.ftl">
<#include "headScripts.ftl">
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index 73722e78..4fb6d402 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -12,9 +12,9 @@
${title}
-
- ${stylesheets.addFromTheme("/css/screen.css")}
-
+ <#-- mb863 moved css/screen.css to stylesheets.ftl, so the file is at end -->
+ <#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
+
<#include "stylesheets.ftl">
<#include "headScripts.ftl">