Skip to content

Commit

Permalink
Styleadjustments + minor HTML fixes. Missing h-tag + return false on …
Browse files Browse the repository at this point in the history 
…onclick event + removal og inline style tag
  • Loading branch information
nig committed Apr 14, 2016
1 parent 501006f commit a3a7b40
Show file tree
Hide file tree
Showing 9 changed files with 184 additions and 282 deletions.
76 changes: 30 additions & 46 deletions archive/bitpreservation-gui/src/main/webapp/netarkivet.css
View file
Expand Up @@ -23,6 +23,7 @@
*
* CSS style rules for the webarchive interface
*/

body {
background-color: #ffffff;
font-family: Verdana, Arial, Helvetica, Geneva, sans-serif;
Expand All @@ -47,7 +48,7 @@ h3 {
color: #113366;
font-size:24px;
font-weight:bold;
margin: 1.5em 0 0.5em;
margin: .6em 0 0.5em;
padding: .2em 0px;
}

Expand Down Expand Up @@ -90,7 +91,7 @@ a:active {
h3 a{
font-size:24px;
font-weight:bold;
background-color: #ffff99;
background-color: #c;
}


Expand Down Expand Up @@ -149,11 +150,6 @@ input[name=addDomains] {

select{
margin-bottom: 1em;
vertical-align: text-top;
}

#templates select{
vertical-align: baseline;
}

/* Table styles */
Expand Down Expand Up @@ -228,14 +224,17 @@ table.selection_table, table#system_state_table {
}

/* Overwriting inline stylesheet for templates */
table table[id="templates"] tr.light td { /* Many selectors to overwrite inline style */
background-color: #eaf1f6;
table table[id="templates"] tr.light td, table table[id="templates"] tr.dark td { /* Many selectors to overwrite inline style */
border: 1px solid white;
padding: 3px 10px;
}

table table[id="templates"] tr.dark td {
background-color: #dde4e9;
padding: 3px 10px;
}

table table[id="templates"] tr.light td { /* Many selectors to overwrite inline style */
background-color: #eaf1f6;
}

table table[id="templates"] td a {
Expand Down Expand Up @@ -275,11 +274,16 @@ table#menu_table a{
vertical-align: middle;
}

/* Logo */
#main_table > tbody > tr > td > a > img{
margin-top: 2em;
}

/* Language bar styles */
.languagelinks{
float: right;
margin-right: -20px;
padding-top: .2em ;
padding-top: .2em;
text-align: right;
}

.languagelinks a{
Expand All @@ -296,35 +300,15 @@ table#menu_table a{

/* Special case styles */
.edit_box{
border: 2px solid #D4ECFB;
width: 90%;
position: relative;
left:5%;
border: 1px solid #D4ECFB;
padding: 0 1em;
}

#error_message{
background-color:#FFFDED;
font-size: 14pt;
position:relative;
left:10%;
width: 80%;
border-color:#E9556A;
border-style:ridge;
border-width:4pt;
padding:4pt;
}

#message{
background-color:#FFFDED;
font-size: 14pt;
position:relative;
left:10%;
width: 80%;
border-color:#EAE4EF;
border-style:ridge;
border-width:4pt;
padding:4pt;

#error_message, #message{
background-color:#ffffcc;
font-size: 16px;
border: 1px solid black;
padding: 1em;
}

#message a{
Expand All @@ -339,10 +323,14 @@ form.inlineform {

form h4{ /* Statuspage with no header */
font-weight: normal;
margin-top: 3em;
margin-top: 2em;
}

form h4 select[name="JOB_STATUS"]{ /* Statuspage top select */
vertical-align: top;
}

/* Fotter styles */
/* Footer styles */
.systeminfo {
background-color: #f0f0f0;
color: #f04e23; /*#666;*/
Expand All @@ -360,10 +348,6 @@ form h4{ /* Statuspage with no header */
font-weight:bold;
}

.selection_table .spacerRowBig {
height: 3em;
}

.selection_table .spacerRowSmall td{
font-size: 50%; /* To minimize height of these empty rows */
padding: 0;
Expand All @@ -375,4 +359,4 @@ form h4{ /* Statuspage with no header */

.crawlerhost a:visited {
color: #660099;
}
}
2 changes: 1 addition & 1 deletion harvester/harvestchannel-gui/src/main/webapp/HarvestChannel-edit-harvest-mappings.jsp
View file
Expand Up @@ -154,7 +154,7 @@ function onClickCancelEditChannel() {
<td><%=HTMLUtils.escapeHtmlValues(isActive)%></td>
<td id="formTd<%=ph.getOid()%>"><%=chan.getName()%></td>
<td id="linkTd<%=ph.getOid()%>">
<a href="#" onClick="onClickEditChannel(<%=ph.getOid()%>, false)">
<a href="#" onClick="onClickEditChannel(<%=ph.getOid()%>, false); return false">
<fmt:message key="edit.harvest.mappings.edit.link"/>
</a></td>
</tr>
Expand Down
76 changes: 30 additions & 46 deletions harvester/harvestchannel-gui/src/main/webapp/netarkivet.css
View file
Expand Up @@ -23,6 +23,7 @@
*
* CSS style rules for the webarchive interface
*/

body {
background-color: #ffffff;
font-family: Verdana, Arial, Helvetica, Geneva, sans-serif;
Expand All @@ -47,7 +48,7 @@ h3 {
color: #113366;
font-size:24px;
font-weight:bold;
margin: 1.5em 0 0.5em;
margin: .6em 0 0.5em;
padding: .2em 0px;
}

Expand Down Expand Up @@ -90,7 +91,7 @@ a:active {
h3 a{
font-size:24px;
font-weight:bold;
background-color: #ffff99;
background-color: #c;
}


Expand Down Expand Up @@ -149,11 +150,6 @@ input[name=addDomains] {

select{
margin-bottom: 1em;
vertical-align: text-top;
}

#templates select{
vertical-align: baseline;
}

/* Table styles */
Expand Down Expand Up @@ -228,14 +224,17 @@ table.selection_table, table#system_state_table {
}

/* Overwriting inline stylesheet for templates */
table table[id="templates"] tr.light td { /* Many selectors to overwrite inline style */
background-color: #eaf1f6;
table table[id="templates"] tr.light td, table table[id="templates"] tr.dark td { /* Many selectors to overwrite inline style */
border: 1px solid white;
padding: 3px 10px;
}

table table[id="templates"] tr.dark td {
background-color: #dde4e9;
padding: 3px 10px;
}

table table[id="templates"] tr.light td { /* Many selectors to overwrite inline style */
background-color: #eaf1f6;
}

table table[id="templates"] td a {
Expand Down Expand Up @@ -275,11 +274,16 @@ table#menu_table a{
vertical-align: middle;
}

/* Logo */
#main_table > tbody > tr > td > a > img{
margin-top: 2em;
}

/* Language bar styles */
.languagelinks{
float: right;
margin-right: -20px;
padding-top: .2em ;
padding-top: .2em;
text-align: right;
}

.languagelinks a{
Expand All @@ -296,35 +300,15 @@ table#menu_table a{

/* Special case styles */
.edit_box{
border: 2px solid #D4ECFB;
width: 90%;
position: relative;
left:5%;
border: 1px solid #D4ECFB;
padding: 0 1em;
}

#error_message{
background-color:#FFFDED;
font-size: 14pt;
position:relative;
left:10%;
width: 80%;
border-color:#E9556A;
border-style:ridge;
border-width:4pt;
padding:4pt;
}

#message{
background-color:#FFFDED;
font-size: 14pt;
position:relative;
left:10%;
width: 80%;
border-color:#EAE4EF;
border-style:ridge;
border-width:4pt;
padding:4pt;

#error_message, #message{
background-color:#ffffcc;
font-size: 16px;
border: 1px solid black;
padding: 1em;
}

#message a{
Expand All @@ -339,10 +323,14 @@ form.inlineform {

form h4{ /* Statuspage with no header */
font-weight: normal;
margin-top: 3em;
margin-top: 2em;
}

form h4 select[name="JOB_STATUS"]{ /* Statuspage top select */
vertical-align: top;
}

/* Fotter styles */
/* Footer styles */
.systeminfo {
background-color: #f0f0f0;
color: #f04e23; /*#666;*/
Expand All @@ -360,10 +348,6 @@ form h4{ /* Statuspage with no header */
font-weight:bold;
}

.selection_table .spacerRowBig {
height: 3em;
}

.selection_table .spacerRowSmall td{
font-size: 50%; /* To minimize height of these empty rows */
padding: 0;
Expand All @@ -375,4 +359,4 @@ form h4{ /* Statuspage with no header */

.crawlerhost a:visited {
color: #660099;
}
}
5 changes: 0 additions & 5 deletions harvester/harvestdefinition-gui/src/main/webapp/Definitions-edit-harvest-templates.jsp
View file
Expand Up @@ -112,11 +112,6 @@ no parameters.
<button id="hide" onclick="hideInactive();"><fmt:message key="harvestdefinition.templates.hide.inactive"/></button><button id="show" onclick="showInactive();"><fmt:message key="harvestdefinition.templates.show.inactive"/></button> </br>
<%}%>
<table id="templates">
<style>
table[id="templates"] tr.dark td {padding: 3px; background-color: #c4b8c0}
table[id="templates"] tr.light td {padding: 3px; background-color: #b4a8b0}
table[id="templates"] td a {color: black}
</style>
<%
int rowNumber = 0;
for (TemplateWithActivity templateWithActivity: templateList) {
Expand Down

0 comments on commit a3a7b40

Please sign in to comment.