[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui.simpl... [dev_week]
From: |
Owen Leonard |
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui.simpl... [dev_week] |
Date: |
Wed, 04 Oct 2006 18:36:27 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Owen Leonard <oleonard> 06/10/04 18:36:27
Modified files:
koha-tmpl/intranet-tmpl/npl/en/acqui.simple: addbiblio.tmpl
koha-tmpl/intranet-tmpl/npl/en/includes: colors.npl.css
intranet.css
Log message:
- Changes to move CSS out of edit biblio template and into external
stylesheets.
- Removing left-hand navigation in order to offer more screen space to
editor
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/addbiblio.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.4.2.15.2.2&r2=1.4.2.15.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/colors.npl.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.3&r2=1.1.2.4.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/includes/intranet.css?cvsroot=koha&only_with_tag=dev_week&r1=1.5.2.17.2.4&r2=1.5.2.17.2.5
Patches:
Index: acqui.simple/addbiblio.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/acqui.simple/Attic/addbiblio.tmpl,v
retrieving revision 1.4.2.15.2.2
retrieving revision 1.4.2.15.2.3
diff -u -b -r1.4.2.15.2.2 -r1.4.2.15.2.3
--- acqui.simple/addbiblio.tmpl 27 Jul 2006 18:10:16 -0000 1.4.2.15.2.2
+++ acqui.simple/addbiblio.tmpl 4 Oct 2006 18:36:27 -0000 1.4.2.15.2.3
@@ -5,15 +5,13 @@
document.write("<\/div>");
</script><!-- TMPL_INCLUDE NAME="masthead.inc" -->
<!-- TMPL_INCLUDE NAME="acqui-topmenu.inc" -->
-<!-- TMPL_INCLUDE NAME="intranet-nav.inc" -->
-<div id="main">
+<div id="main-compact">
<form method="post" name="f" id="f" action="addbiblio.pl">
<h1><!-- TMPL_IF NAME="oldbiblionumtagfield" -->Edit MARC Record Number <!--
TMPL_VAR name="oldbiblionumber" --><!-- TMPL_ELSE -->Add MARC Record<!--
/TMPL_IF --> With Framework : <!--TMPL_VAR Name="framework" --></h1>
-<div class="tabbed">
<input type="hidden" name="op" value="addbiblio" />
<input type="hidden" name="addfield_field" />
<input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR
NAME="frameworkcode" -->" />
@@ -23,28 +21,28 @@
<!-- TMPL_ELSE -->
<input type="button" value="Add Bibliographic Record
and go to Items" onclick="Check(this.form);" accesskey="w" class="submit" />
<!-- /TMPL_IF -->
- <input type="button" value="z39.50 Search" class="submit"
onclick="PopupZ3950(); return false;" / ></div>
+ <input type="button" value="z39.50 Search" class="submit"
onclick="PopupZ3950(); return false;" />
<div class="tabs">
<!-- TMPL_LOOP name="BIG_LOOP" -->
- <a href="#" onclick="active(<!-- TMPL_VAR name="number"-->);
return false;" id="link<!-- TMPL_VAR name="number"-->"><!-- TMPL_VAR
name="number"--></a>
+ <a href="#" class="addbiblioTabOff" onclick="active(<!-- TMPL_VAR
name="number"-->); return false;" id="link<!-- TMPL_VAR name="number"-->"><!--
TMPL_VAR name="number"--></a>
<!-- /TMPL_LOOP -->
</div>
-<! -- RESET PAGINATION -->
+<!-- RESET PAGINATION -->
<!-- TMPL_LOOP name="BIG_LOOP" -->
<!-- hide every tab except the 1st -->
<!-- TMPL_IF name="number" -->
- <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR
name="number" -->XX" class="tab" style="visibility:hidden">
+ <div id="<!-- TMPL_VAR name="number" -->XX" class="tab"
style="visibility:hidden">
<!-- TMPL_ELSE -->
- <div name="<!-- TMPL_VAR name="number" -->XX" id="<!-- TMPL_VAR
name="number" -->XX" class="tab" style="visibility:visible">
+ <div id="<!-- TMPL_VAR name="number" -->XX" class="tab"
style="visibility:visible">
<!-- /TMPL_IF -->
<!-- TMPL_UNLESS name="number" -->
<!-- show duplicate warning on tab 0 only -->
<!-- TMPL_IF name="duplicatebiblionumber" -->
<div class="error">
- <p>Is this a duplicate of <a
href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->"
onclick="openWindow('../MARCdetail.pl?bib=<!-- TMPL_VAR
name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return
false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
+ <p>Is this a duplicate of <a
href="../MARCdetail.pl?bib=<!-- TMPL_VAR name="duplicatebiblionumber" -->"
onclick="openWindow('../MARCdetail.pl?bib=<!-- TMPL_VAR
name="duplicatebiblionumber" -->&popup=1', 'Duplicate biblio'; return
false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
<p>You must either :</p>
<ul>
<li>If it <em>is</em> a duplicate, <a
href="additem.pl?biblionumber=<!-- TMPL_VAR name="duplicatebibid" -->">Edit
Items</a> of the existing record.</li>
@@ -57,22 +55,22 @@
<div style=";" id="tag<!-- TMPL_VAR name="tag"-->">
<!-- TMPL_IF name="tag" -->
<p class="MARCtag">
- <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR
NAME="tag" -->">
+ <input type="hidden" name="ind_tag" value="<!-- TMPL_VAR
NAME="tag" -->" />
<!-- TMPL_UNLESS name="hide_marc" -->
<a title="<!-- TMPL_VAR NAME="tag_lib" -->"><!-- TMPL_VAR
NAME="tag" --></a>
- <input tabindex="1"
onblur="this.style.backgroundColor='#ffffff';"
onfocus="this.style.backgroundColor='#ffff00;'" type="text" <!-- TMPL_IF
NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator"
size="2" maxlength="2" value="<!-- TMPL_VAR NAME="indicator" -->" class="flat">
-
+ <input tabindex="1" class="indicator"
onblur="this.className='indicator';" onfocus="this.className='indicatorFocus';"
type="text" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!--
/TMPL_IF --> name="indicator" size="2" maxlength="2" value="<!-- TMPL_VAR
NAME="indicator" -->" /> -
<!-- TMPL_ELSE -->
- <input tabindex="1" type="hidden" <!-- TMPL_IF
NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator"
value="<!-- TMPL_VAR NAME="indicator" -->">
+ <input tabindex="1" type="hidden" <!-- TMPL_IF
NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF --> name="indicator"
value="<!-- TMPL_VAR NAME="indicator" -->" />
<!-- /TMPL_UNLESS -->
<!-- TMPL_UNLESS NAME="advancedMARCEditor" -->
<!-- TMPL_VAR NAME="tag_lib" -->
<!-- /TMPL_UNLESS -->
- <!-- TMPL_IF name="repeatable" --><a
href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')">+</a><!-- /TMPL_IF
-->
+ <!-- TMPL_IF name="repeatable" --><a
href="javascript:AddField('<!-- TMPL_VAR NAME="tag" -->')" title="Clone this
Tag">+</a><!-- /TMPL_IF -->
</p>
<!-- /TMPL_IF -->
<!-- TMPL_LOOP NAME="subfield_loop" -->
<!-- TMPL_IF NAME="visibility" -->
- <a tabindex="1" style="color: grey; font-size: 80%; cursor:
se-resize;" id="label<!-- TMPL_VAR name="index" -->"
onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR
name="index" -->','label<!-- TMPL_VAR name="index" -->')">
+ <a tabindex="1" class="unHideSubfield" id="label<!-- TMPL_VAR
name="index" -->" onclick="unHideSubfield('subfield<!-- TMPL_VAR NAME="tag"
--><!-- TMPL_VAR name="index" -->','label<!-- TMPL_VAR name="index" -->')"
title="Expand this subfield">
<!-- TMPL_VAR NAME="subfield" -->
</a>
<!-- /TMPL_IF -->
@@ -82,8 +80,8 @@
<label <!-- TMPL_IF NAME="fixedfield" -->
style="display:none;" <!-- /TMPL_IF --> class="labelsubfield">
<!-- /TMPL_UNLESS -->
<!-- TMPL_UNLESS name="hide_marc" -->
- <img style="cursor: crosshair; color: grey; font-size:
80%;" <!-- TMPL_IF NAME="fixedfield" --> style="display:none;" <!-- /TMPL_IF
--> src="<!-- TMPL_VAR NAME="themelang" -->/images/up.png"
onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR
name="index" -->')"/>
- <input title="<!-- TMPL_VAR NAME="marc_lib_plain" -->"
style=" <!-- TMPL_IF NAME="fixedfield" -->display:none; <!-- /TMPL_IF
-->border:0;" type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield"
-->" size="1" maxlength="1" class="flat" DISABLE READONLY tabindex=-1 />
+ <img class="upsubfield" <!-- TMPL_IF NAME="fixedfield" -->
style="display:none;" <!-- /TMPL_IF --> src="<!-- TMPL_VAR NAME="themelang"
-->/images/up.png" onclick="upSubfield('subfield<!-- TMPL_VAR NAME="tag"
--><!-- TMPL_VAR name="index" -->')" alt="Move Subfield Up" title="Move
Subfield Up" />
+ <input title="<!-- TMPL_VAR NAME="marc_lib_plain"
-->"<!-- TMPL_IF NAME="fixedfield" --> style="display : none;"<!-- /TMPL_IF -->
type="text" name="subfield" value="<!-- TMPL_VAR NAME="subfield" -->" size="1"
maxlength="1" class="flat" disabled="disabled" readonly="readonly"
tabindex="-1" />
<!-- TMPL_ELSE -->
<input type="hidden" name="subfield" value="<!-- TMPL_VAR
NAME="subfield" -->"/>
<!-- /TMPL_UNLESS -->
@@ -95,7 +93,7 @@
<!-- /TMPL_UNLESS -->
<!-- TMPL_VAR NAME="marc_value" -->
<!-- TMPL_IF NAME="repeatable" -->
- <a style="cursor: crosshair; color: grey; font-size: 80%;"
onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR
name="index" -->')">+</a>
+ <a class="clonesubfield"
onclick="cloneSubfield('subfield<!-- TMPL_VAR NAME="tag" --><!-- TMPL_VAR
name="index" -->')" title="Clone this Subfield">+</a>
<!-- /TMPL_IF -->
<input type="hidden" name="tag" value="<!-- TMPL_VAR
NAME="tag" -->"/>
<input type="hidden" name="subfieldYYY" value="<!-- TMPL_VAR
NAME="subfield" -->" size="2" maxlength="1"/>
@@ -109,7 +107,7 @@
<!-- /TMPL_LOOP -->
</div>
<!-- /TMPL_LOOP -->
- <div name="hidden" id="hidden" class="tab">
+ <div id="hidden" class="tab">
<!-- TMPL_LOOP NAME="hidden_loop" -->
<input type="hidden" name="tag" value="<!--
TMPL_VAR NAME="tag" -->">
<input type="hidden" name="subfield"
value="<!-- TMPL_VAR NAME="subfield" -->">
@@ -132,6 +130,8 @@
<input type="hidden" name="tag_mandatory" value="<!--
TMPL_VAR NAME="tag_mandatory" -->">
<!-- /TMPL_IF -->
</form>
+ <br class="clear" />
+ </div>
<script language="JavaScript" type="text/javascript">
function loading(){
document.getElementById("loading").style.display = "none";
@@ -153,8 +153,7 @@
document.getElementById(ong).style.visibility="visible";
}
if(document.getElementById(link)){
-
document.getElementById(link).style.color="#000066";
-
document.getElementById(link).style.backgroundColor="#FFFFCC";
+
document.getElementById(link).className="addbiblioTabOn";
}
}
} else {
@@ -163,8 +162,7 @@
document.getElementById(ong).style.visibility="hidden";
}
if (document.getElementById(link)) {
-
document.getElementById(link).style.color="#669999";
-
document.getElementById(link).style.backgroundColor="#D8DEB8";
+
document.getElementById(link).className="addbiblioTabOff";
}
}
}
@@ -193,7 +191,7 @@
// mandatory, or if something else in the tag is entered
if (f.tag_mandatory[i].value == 1 ||
field_is_nonempty_p[f.tag[i].value]) {
-
f.field_value[i].style.backgroundColor="#FF0000";
+
f.field_value[i].className="addbiblioInputFocus";
total_missing_mandatory_subfields++;
if (f.field_value[i].parentNode.tagName == "B")
{
@@ -206,8 +204,9 @@
}
} else {
- f.field_value[i].style.backgroundColor="#FFFFFF";
+ f.field_value[i].className="addbiblioInput";
}
+ document.body.style.cursor ="default";
}
// Scan for missing mandatory tags
@@ -229,7 +228,7 @@
missing_mandatory_tags.push(f.field_value[i].innerHTML + " (tab " +
f.field_value[i].parentNode.parentNode.parentNode.id.substr(0,1) + ")");
}
}
- f.field_value[i].style.backgroundColor="#FFFF00";
+ f.field_value[i].className="mandatory";
}
}
Index: includes/colors.npl.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/colors.npl.css,v
retrieving revision 1.1.2.4.2.3
retrieving revision 1.1.2.4.2.4
diff -u -b -r1.1.2.4.2.3 -r1.1.2.4.2.4
--- includes/colors.npl.css 25 Sep 2006 19:46:23 -0000 1.1.2.4.2.3
+++ includes/colors.npl.css 4 Oct 2006 18:36:27 -0000 1.1.2.4.2.4
@@ -649,15 +649,9 @@
border-top : 1px solid #FFFFCC;
}
-div.tabs a:hover {
- background-color : #CCFF99;
- border-left : 1px solid #000066;
- border-bottom : 1px solid #000066;
-}
-
div.tab {
background-color : #FFFFCC;
- border : 1px solid #D8DEB8;
+ border : 0 solid #D8DEB8;
border-top : 1px solid #FFFFCC;
}
@@ -670,6 +664,7 @@
}
div.tab p {
+ width : 100%;
}
/* style for each subfield (e.g.: Publication year), just before the biblio
subfield */
@@ -687,21 +682,31 @@
}
div.tabs a.addbiblioTabOn {
- background-color: #EEEEEE;
+ background-color: #FFFFCC;
+ border-right : 1px solid #FFFFCC;
color: #000066;
}
div.tabs a.addbiblioTabOff {
- background-color: #CBCBCB;
- color: #669999;
+ background-color: #D8DEB8;
+ border-right : 1px solid #999900;
+ color: #006699;
+}
+
+div.tabs a.addbiblioTabOff:hover {
+ background-color : #CCFF66;
+ border-top : 1px solid #FFFFE1;
+ border-left : 1px solid #669999;
+ border-bottom : 1px solid #669999;
}
input.addbiblioInput {
background-color: #FFFFFF;
+ cursor :
}
input.addbiblioInputFocus {
- background-color: #FFFFE1;
+ background-color: #FFFF99;
}
input.indicator {
@@ -709,7 +714,7 @@
}
input.indicatorFocus {
- background-color: #FFFF00;
+ background-color: #FFFF99;
}
#receipt {
@@ -756,3 +761,20 @@
border : 0;
}
+a.unHideSubfield {
+ color: grey;
+}
+
+.upsubfield {
+ color: grey;
+}
+
+input.flat {
+ border : 0;
+ background-color : transparent;
+ color : #000000;
+}
+
+a.clonesubfield {
+ color: grey;
+}
\ No newline at end of file
Index: includes/intranet.css
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/Attic/intranet.css,v
retrieving revision 1.5.2.17.2.4
retrieving revision 1.5.2.17.2.5
diff -u -b -r1.5.2.17.2.4 -r1.5.2.17.2.5
--- includes/intranet.css 25 Sep 2006 19:46:23 -0000 1.5.2.17.2.4
+++ includes/intranet.css 4 Oct 2006 18:36:27 -0000 1.5.2.17.2.5
@@ -987,7 +987,7 @@
font-weight : bold;
text-decoration : none;
margin : 0 0 2px 0;
- padding: 10px 5px 10px 5px;
+ padding: 10px 9px 10px 5px;
}
div.tabs a:hover {
@@ -997,9 +997,9 @@
display: block;
visibility:hidden;
position : absolute;
- margin : 5px 0 0 20px;
+ margin : 5px 0 0 25px;
padding : 3px;
- width : 70%;
+ width : 85%;
/*margin-top:110px;*/
}
@@ -1112,3 +1112,21 @@
text-align : left;
}
+
+a.unHideSubfield {
+ font-size: 80%;
+ cursor: se-resize;
+}
+
+.upsubfield {
+ cursor: crosshair;
+ font-size: 80%;
+}
+
+input.flat {
+}
+
+a.clonesubfield {
+ cursor: crosshair;
+ font-size: 80%;
+}
\ No newline at end of file
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en acqui.simpl... [dev_week],
Owen Leonard <=