From b1f14d33484093fba2e3b2908a0f1eb18e1be5d4 Mon Sep 17 00:00:00 2001 From: Elliott Davis Date: Mon, 1 Oct 2012 23:39:29 -0500 Subject: [PATCH] Rebase for master http://bugs.koha-community.org/show_bug.cgi?id=7882 http://bugs.koha-community.org/show_bug.cgi?id=7883 --- koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css | 6 +- .../prog/en/modules/cataloguing/addbiblio.tt | 408 ++++++++++++++++++- .../intranet-tmpl/prog/img/cursor_split_16.png | Bin 0 -> 3206 bytes 3 files changed, 391 insertions(+), 23 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 d35a471..d3002be 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/addbiblio.css @@ -1,7 +1,11 @@ #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 bottom; +} #addbibliotabs .ui-tabs-panel { float : left; } 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..26b7b89 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -8,10 +8,26 @@ // + var divs = original.getElementsByTagName('div'); + for(var i=0,divslen = divs.length ; i + fields_in_use[index.substr(0, 7)]++; + var clone = original.cloneNode(true); + var new_key = CreateKey(); + var new_id = original.getAttribute('id')+new_key; + + clone.setAttribute('id',new_id); // setting a new id for the parent div + + var divs = clone.getElementsByTagName('div'); + + [% UNLESS ( hide_marc ) %] // No indicator if hide_marc + // setting a new name for the new indicator + for(var i=0; i < 2; i++) { + var indicator = clone.getElementsByTagName('input')[i]; + indicator.setAttribute('name',indicator.getAttribute('name')+new_key); + } + [% END %] + + // settings all subfields + for(var i=0,divslen = divs.length ; i + fields_in_use[index.substr(0, 12)]++; + var clone = original.cloneNode(true); + var new_key = CreateKey(); + var new_id = original.getAttribute('id')+new_key; + // set the attribute for the new 'div' subfields + var inputs = clone.getElementsByTagName('input'); + var selects = clone.getElementsByTagName('select'); + var textareas = clone.getElementsByTagName('textarea'); + var linkid; + + // input + var id_input = ""; + for(var i=0,len=inputs.length; i @@ -420,11 +780,17 @@ function Changefwk(FwkList) { [% FOREACH BIG_LOO IN BIG_LOOP %] -
+ +[% IF ( BIG_LOO.number ) %] +
    +[% ELSE %] +
      +[% END %] + [% FOREACH innerloo IN BIG_LOO.innerloop %] - [% IF ( innerloo.tag ) %] -
      + [% IF ( innerloo.tag ) %] +
    • [% UNLESS hide_marc %] [% IF advancedMARCEditor %] @@ -504,10 +870,10 @@ function Changefwk(FwkList) {
      - +
        [% FOREACH subfield_loo IN innerloo.subfield_loop %] -
        +
      • [% UNLESS advancedMARCEditor %] [% IF ( subfield_loo.fixedfield ) %]
      • + [% END %] - -
    • - [% END %] - [% END %] -
-[% END %] - - + + [% END %] + [% END %] + + +[% END %] 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-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{76XKnDbdAejQFBl1v 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@jT3r3F4mg-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`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)^3oGCOnguWfwFLBa zB`0c>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 zKcp z#gr`S3>@5k5<8^6#E>MfF&6zJT%C3G3NB$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