Attachment 14908 Details for Bug 7882 – Bug 7882 [fixed]

[patch] Bug 7882 [fixed]

Bug-7882-fixed.patch (text/plain), 7.90 KB, created by Elliott Davis on 2013-01-29 06:24:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elliott Davis

Created: 2013-01-29 06:24:56 UTC

Size: 7.90 KB

patch

obsolete

>From c75bd1b11f25168271a3fac67ceddbd93ee89d88 Mon Sep 17 00:00:00 2001
>From: Elliott Davis <elliott@bywatersolions.com>
>Date: Tue, 29 Jan 2013 01:26:48 -0500
>Subject: [PATCH] Bug 7882 [fixed]
>
>Rebased on latest master and fixed whitespace issues.  Also changed language from "Move Up" to "Move"
>---
> koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css  |   17 ++++++++--
> .../prog/en/modules/cataloguing/addbiblio.tt       |   30 +++++++++++--------
> .../intranet-tmpl/prog/img/cursor_split_16.png     |  Bin 0 -> 3206 bytes
> 3 files changed, 30 insertions(+), 17 deletions(-)
> create mode 100644 koha-tmpl/intranet-tmpl/prog/img/cursor_split_16.png
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
>index 79ceb48..ec8b4e0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
>+++ b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css
>@@ -1,7 +1,16 @@
> #addbibliotabs {
> 	margin-top : 1em;
> }
>-
>+ul li.tag {
>+    list-style-type:none;
>+    padding:0 0 0 25px;
>+    background: url("../../img/cursor_split_16.png") no-repeat left top;
>+}
>+ul li, ul li li {
>+    list-style-type:none;
>+    margin: 0 5px 5px 5px; padding: 5px;
>+}
>+.ui-state-highlight { height: 1.5em; line-height: 1.2em; }
> #addbibliotabs .ui-tabs-panel {
> 	float : left;
> }
>@@ -45,18 +54,18 @@ a.expandfield {
> 	padding : .2em 1.2em;
> }
> 
>-div.tag {
>+li.tag {
>     clear: both;
> }
> 
>-div.subfield_line {
>+li.subfield_line {
>     padding-bottom: .3em;
>     float: left;
>     clear: left;
>     width: 100%;
> }
> 
>-div.subfield_line label {
>+li.subfield_line label {
>     font-size:89%;
>     float: left;
> 	 padding-right : .4em;
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index 7d54142..a8a4a8a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -8,9 +8,13 @@
> //<![CDATA[
> 
> 	 $(document).ready(function() {
>-        $('#addbibliotabs').tabs().bind('show.ui-tabs', function(e, ui) {
>-			$("#"+ui.panel.id+" input:eq(0)").focus();
>-		});
>+           var $tabs = $('#addbibliotabs').tabs();
>+           $( "ul.sortable_field", $tabs ).sortable({
>+             placeholder: "ui-state-highlight",
>+           }).disableSelection();
>+           $( "ul.sortable_subfield", $tabs ).sortable({
>+             placeholder: "ui-state-highlight",
>+           }).disableSelection();
> 
> 		/* check cookie to hide/show marcdocs*/
> 		if($.cookie("marcdocs_[% borrowernumber %]") == 'false'){
>@@ -420,11 +424,11 @@ function Changefwk(FwkList) {
>     </ul>
> 
> [% FOREACH BIG_LOO IN BIG_LOOP %]
>-    <div id="tab[% BIG_LOO.number %]XX">
>+    <ul id="tab[% BIG_LOO.number %]XX" class="sortable_field">
>     
>     [% FOREACH innerloo IN BIG_LOO.innerloop %]
>     [% IF ( innerloo.tag ) %]
>-    <div class="tag" id="tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]">
>+    <li class="tag" id="tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]">
>         <div class="tag_title" id="div_indicator_tag_[% innerloo.tag %]_[% innerloo.index %][% innerloo.random %]">
>         [% UNLESS hide_marc %]
>             [% IF advancedMARCEditor %]
>@@ -504,10 +508,10 @@ function Changefwk(FwkList) {
>                 </span>
> 
>         </div>
>-
>+	<ul class="sortable_subfield"> 
>         [% FOREACH subfield_loo IN innerloo.subfield_loop %]
>             
>-            <div class="subfield_line" style="[% subfield_loo.visibility %]" id="subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]">
>+            <li class="subfield_line" style="[% subfield_loo.visibility %]" id="subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]">
>             
>                 [% UNLESS advancedMARCEditor %]
>                     [% IF ( subfield_loo.fixedfield ) %]<label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" style="display:none;" class="labelsubfield">
>@@ -518,9 +522,9 @@ function Changefwk(FwkList) {
>                 [% UNLESS hide_marc %]
>                 <span class="subfieldcode">
>                     [% IF ( subfield_loo.fixedfield ) %]
>-                        <img class="buttonUp" style="display:none;" src="/intranet-tmpl/prog/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" />
>+                        <img class="buttonUp" style="display:none;" src="/intranet-tmpl/prog/img/cursor_split_16.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move" title="Move" />
>                     [% ELSE %]
>-                        <img class="buttonUp" src="/intranet-tmpl/prog/img/up.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move Up" title="Move Up" />
>+                        <img class="buttonUp" src="/intranet-tmpl/prog/img/cursor_split_16.png" onclick="upSubfield('subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]')" alt="Move" title="Move" />
>                     [% END %]
>                         <input type="text"
>                             title="[% subfield_loo.marc_lib_plain %]"
>@@ -559,14 +563,14 @@ function Changefwk(FwkList) {
>                 [% END %]
>                 </span>
>                 
>-            </div>
>+            </li>
>             
>         [% END %]
>-
>-    </div>
>+	</ul>
>+    </li>
>     [% END %]
>     [% END %]
>-    </div>
>+    </ul>
> [% END %]
> 
> </div>
>diff --git a/koha-tmpl/intranet-tmpl/prog/img/cursor_split_16.png b/koha-tmpl/intranet-tmpl/prog/img/cursor_split_16.png
>new file mode 100644
>index 0000000000000000000000000000000000000000..dc6d31da4d557a413f132153e916ee5dc18a0423
>GIT binary patch
>literal 3206
>zcmd5<U5Fc16rNQqcDrqtib5;c>-5E+CiAzuNroib+5B`vyW2I*(tQxx$;{p4x|5mo
>z&dnyf$W{~z1s~c~L@9^`A4PmnD5$hxWm}(o_Qe&YKDMO~g4(WUW|DNW8?{gnmu!+d
>z_nhzh&bjBFdvk7P`tZ)deS;jw?JP`Yi|{$@{Xe-4-uK_#&^d0$EGf;gxv8V7;nbqK
>z>6CG_Rjb21$0f&Gb=_FN43%+(*eU+jmsfa1%oKlObV{76XK<BFE>nDbdAejQFBl1v
>zA5RY^TPgt5Fw;@1X4$UVO7T9f3g5lQ0*`zXwvggAj}XmG&7h1!F&c@=Q8{9WV+tBo
>zqROZ|CXXCMvM9y{F(xQtM2f4DtV(gz{^QewC`rwEwV2Jf>0p%NtBloEL1;Fc(WVl0
>zXho0`iG(1^f-FbCBH}LDOm9VO_kafxU}UjtP*P{av5|+Vmz@Sn@jT3<Hh8`2FvqPr
>z^)7|&wzCHL6S~ua6cvTAW1-HB5y*=dX4e<E3}2kfOd)LHyZhPe0RjK6Zx3%vuWw-l
>z<Eg2CHm}us;9Ztmgm~Mz>r3F4mg-n2V%KR<1Lqd8%?^aaG>xu*y+JKMIMWcYg==8y
>zf=H={5=0hBrOMo{TVGo0+XSB79IIM`RUPWiI4<$l462DTlqD1!%%Q%j2euiCO#;Dr
>z6;S~x7M|A)9EC;OWSG?%24i@KI+sOBjEEAve5>#hsRf&1%L1;3ZXL$9x2$yn%oVB!
>zm=K#f1@&&~O!rVja7sy*R7Fvxk(WhD6-6K2UoiC;#7b=4$~s2F%UL0t;$bFg5>u6x
>z(R@CyWa3gjmd#00BBxCx#B5BA#kG85L<_+@qI<!1nQj}n!%l#GREx_a86~F0@^Ozn
>zE=!r*$b_7U<&-fH;cq0A>`9WJNrz?}*lh+Y*z=CRnR;!AX3`8{ODTSa>Xioe!$4bY
>zW(>!KEJ|ZyJ7axpGK>OFW*Hk*RK)d0*&;??yj)Eu)(M9~6I##@^(l$X;Ip)C-lv2F
>zuZN&yu!57sh5B3a9|eu&I6fVWf}utHBp~E(I297(SFfutVl&X%nIe6b;h~BE)CAzo
>zDu#{Gtz)?)iK-k|N2O5Vb&ZXxZdbgz7rZ|0)h!=H)^3oGCOngu<B}#S*@>WfwFLBa
>zB`0c<JgQ9Ov%R5j5e_>>l2keI-wXfO!tYtmO~U(b^@qrKQt*zTPUR$pt+kaj4V4k-
>zWT8saEY@3T-npe(u&mHUA|^DwhQ;`FZ@Hs+iZLPv9D6Qi0kK8esJ@I2Y*Ogq^c1*_
>z@@vopLmDRZO0R~r2i*(X*$C-w%j}&GMja%dHcaFZn-5Ow5P3&ww_^Jzpj0I;f)}f{
>z1D~f(4M7_Z9SjfB;(B?BqJ9!Pe7?lZl02D)ca}IbB(bxmU5RPU!Y$o4F-1p+3uonG
>zKc<eG&lE=WSb_sGMAFgKCF!3Bzdw^j4A-w(&9PmiF-A$b;opI#9XsMZ$J8LYg{B>p
>z#gr`S3>@5k5<8^6#E>MfF&6zJT%C3G3NB$<bN@eL|4v;HV(3-~l7nY(+k}g*(7oxx
>zpnF%wHZ)KQH{tJ3e$s+l^j?;mW5=C&*3>EHf(vh<23aU#-CR0-11G^~t&r79tsly#
>zJ{lH(e&^i_7tZ~9^X7-#wV{(&R=%EG9T*%OytA>faq{-9AIG0SyVlp&Tet81(HzRW
>zU*CK6`t{4)2fO8=i|RAUw8)hQP@228>(Jxl=bxTjU0vO{b3=J$-;TG%vzIRYv@w3>
>zzIf`JGaL86eQDRwtNF77%>jBazW&)S+;fS2YmbR9-hHdOef##6)txh?(x1DJBoAF#
>z8Q!z!_hYLAS3kb^#(SSXHTm7q{pr^)Ute4MjjIm7kcfS?a&P(hu?9D=jnnU+J+D6d
>S#jN-9p^%%-emZgL&A$L4Jm=T|
>
>literal 0
>HcmV?d00001
>
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 7882: 13184 | 13556 | 13789 | 14202 | 14908 | 18024 | 18025 | 18026 | 18027 | 22835 | 22836 | 23517 | 23521 | 23984 | 24227 | 24228 | 94638 | 94837 | 96344 | 96352 | 96384 | 96541 | 96542 | 96633 | 96634 | 96635