litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1238: Making custom forms theme agnostic

Browse source
This commit is contained in:
mb863 2010-12-01 19:40:02 +00:00
parent 5dbe8f00b1
commit b6f06e45b2
9 changed files with 35 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

29
themes/vivo-basic/css/formedit.css
View file

@ -8,52 +8,41 @@
**************************************************/ **************************************************/
form { form {
padding-bottom: 20px; padding-bottom: 20px;
} }
.form p { .form p {
margin-bottom:0.5em; margin-bottom:0.5em;
} }
form textarea { form textarea {
width: 60%; width: 60%;
} }
form a:link.cancel, form a:visited.cancel { form a:link.cancel, form a:visited.cancel {
color: #f70; color: #f70;
border-color: #f70; border-color: #f70;
} }
form a:hover.cancel { form a:hover.cancel {
color: #fff; color: #fff;
background: #f70; background: #f70;
} }
form select option{ form select option{
padding-right: 5px; padding-right: 5px;
} }
form dl { form dl {
margin-bottom: 20px; margin-bottom: 20px;
} }
form dl dt, form dl dd { form dl dt, form dl dd {
padding-top: 15px; padding-top: 15px;
} }
.validationError { .validationError {
font-weight:bold; font-weight:bold;
color:red; color:red;
} }
.inlineForm input { .inlineForm input {
display:inline; display:inline;
} }
.inlineForm label { .inlineForm label {
display:inline; display:inline;
} }
p.submit { p.submit {
clear: left; clear: left;
margin-top: 2em; margin-top: 2em;

14
themes/wilma/css/edit.css Normal file
View file

@ -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;
}

51
themes/wilma/css/formedit.css
View file

@ -7,55 +7,4 @@ wilma theme: editing form styles copied from vivo-basic
This document is included by formPrefix.jsp 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;
}

3
themes/wilma/css/forms.css
View file

@ -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 */

4
themes/wilma/css/screen.css
View file

@ -24,7 +24,7 @@ VIVO wilma theme: screen styles
@import url("transition/holdover-vivobasic/screen.css"); @import url("transition/holdover-vivobasic/screen.css");
@import url("reset.css"); @import url("reset.css");
@import url("edit.css");
@import url("pictos.css"); @import url("pictos.css");
@import url("wilma.css"); @import url("wilma.css");
@import url("forms.css"); /*@import url("formedit.css"); mb863 move the content of formedit.css to edit.css in vtiro */
@import url("formedit.css");

8
themes/wilma/templates/edit/formPrefix.jsp
View file

@ -37,10 +37,14 @@ FreemarkerHttpServlet.getFreemarkerComponentsForJsp(request);
<head> <!-- formPrefix.jsp --> <head> <!-- formPrefix.jsp -->
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Edit</title> <title>Edit</title>
<link rel="stylesheet" href="<%=themeDir%>/css/screen.css" />
<link rel="stylesheet" href="../css/edit.css" />
<link rel="stylesheet" href="<%=themeDir%>css/screen.css" />
<!-- script for enabling new HTML5 semantic markup in IE browsers--> <!-- script for enabling new HTML5 semantic markup in IE browsers-->
<%-- ${headScripts.add("/js/html5.js")} --%> <%-- ${headScripts.add("/js/html5.js")} --%>
<script language="javascript" type="text/javascript" src="../js/html5.js"></script>
<c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if> <c:if test="${!empty scripts}"><jsp:include page="${scripts}"/></c:if>
<% <%
String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false"; String useTinyMCE = (useTinyMCE=request.getParameter("useTinyMCE")) != null && !(useTinyMCE.equals("")) ? useTinyMCE : "false";

2
themes/wilma/templates/menu.ftl
View file

@ -53,8 +53,6 @@
<input type="text" name="querytext" class="search-vivo" value="${querytext!}" /> <input type="text" name="querytext" class="search-vivo" value="${querytext!}" />
<input type="submit" value="Search" class="submit"> <input type="submit" value="Search" class="submit">
</div> </div>
<!-- <input class ="submit" name="submit" type="submit" value="Search" /> -->
</form> </form>
</fieldset> </fieldset>
</section> </section>

2
themes/wilma/templates/page-home.ftl
View file

@ -13,7 +13,7 @@
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="keywords" content="" /> <meta name="keywords" content="" />
${stylesheets.addFromTheme("/css/screen.css")} <#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
<#include "stylesheets.ftl"> <#include "stylesheets.ftl">
<#include "headScripts.ftl"> <#include "headScripts.ftl">

6
themes/wilma/templates/page.ftl
View file

@ -12,9 +12,9 @@
<title>${title}</title> <title>${title}</title>
<meta name="description" content="" /> <meta name="description" content="" />
<meta name="keywords" content="" /> <meta name="keywords" content="" />
<#-- mb863 moved css/screen.css to stylesheets.ftl, so the file is at end -->
${stylesheets.addFromTheme("/css/screen.css")} <#-- ${stylesheets.addFromTheme("/css/screen.css")} -->
<#include "stylesheets.ftl"> <#include "stylesheets.ftl">
<#include "headScripts.ftl"> <#include "headScripts.ftl">