Attachment #72626 for bug #19983

View | Details | Raw Unified | Return to bug 19983
Collapse All | Expand All





<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Authorities</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-8 col-md-offset-2">

    
    [% INCLUDE 'authorities-toolbar.inc' %]

    <div id="merge_in_progress"></div>

    </div>
    </div>
  </div>

[% MACRO jsinclude BLOCK %]

Lines 175-185 function confirmnotdup(redirect){ Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt (-5 / +3 lines)
175		175
176	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority [% authtypetext %][% END %] </div>	176	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; [% IF ( authid ) %]Modify authority #[% authid %] ([% authtypetext %])[% ELSE %]Adding authority [% authtypetext %][% END %] </div>
177		177
178	<div id="doc" class="yui-t7">	178	<div class="main container-fluid">
179		179	<div class="row">
180	<div id="bd">	180	<div class="col-md-8 col-md-offset-2">
181	<div id="yui-main">
182	<div class="yui-g">
183		181
184	[% IF ( authid ) %]	182	[% IF ( authid ) %]
185	<h1>Modify authority #[% authid %] [% authtypetext %]</h1>	183	<h1>Modify authority #[% authid %] [% authtypetext %]</h1>





<body id="auth_blinddetail-biblio-search" class="auth">

    <div class="main container-fluid">
        <div class="row">
            <div class="col-md-8 col-md-offset-2">

        <div id="loading"> <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading </div>

            </div>
        </div>


[% MACRO jsinclude BLOCK %]
    <script type="text/javascript">




    [% END %]
</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-8 col-md-offset-2">
        <div id="yui-main">
        <div class="yui-g">

    [% INCLUDE 'authorities-toolbar.inc' %]
	

</div>
</div>
[% END %]
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'authorities_js.inc' %]




[% INCLUDE 'authorities-search.inc' %]
<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a>  &rsaquo; Merging records</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-8 col-md-offset-2">
        <div id="yui-main">


<h1>Merging records</h1>


[% END %]

</div>
</div>
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'merge-record-strings.inc' %]





<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; Authority search results</div>

<div class="main container-fluid">
    <div class="row">
        <div class="col-md-8 col-md-offset-2">

    <div class="yui-g">
    
    [% INCLUDE 'authorities-toolbar.inc' %]
<h1>Authority search results</h1>


[% END %]
</div>
</div>
</div>

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'authorities_js.inc' %]
- 

Return to bug 19983

Lines 22-32 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/detail.tt (-6 / +3 lines)
22	[% END %]	22	[% END %]
23	</div>	23	</div>
24		24
25	<div id="doc" class="yui-t7">	25	<div class="main container-fluid">
26		26	<div class="row">
27	<div id="bd">	27	<div class="col-md-8 col-md-offset-2">
28	<div id="yui-main">
29	<div class="yui-g">
30		28
31	[% INCLUDE 'authorities-toolbar.inc' %]	29	[% INCLUDE 'authorities-toolbar.inc' %]
32		30
Lines 94-100 Link Here
94	</div>	92	</div>
95	</div>	93	</div>
96	[% END %]	94	[% END %]
97	</div>
98		95
99	[% MACRO jsinclude BLOCK %]	96	[% MACRO jsinclude BLOCK %]
100	[% INCLUDE 'authorities_js.inc' %]	97	[% INCLUDE 'authorities_js.inc' %]

Lines 15-25 div#result { margin-top: 1em; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-7 / +3 lines)
15	[% INCLUDE 'authorities-search.inc' %]	15	[% INCLUDE 'authorities-search.inc' %]
16	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; Merging records</div>	16	<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/authorities/authorities-home.pl">Authorities</a> &rsaquo; Merging records</div>
17		17
18	<div id="doc" class="yui-t7">	18	<div class="main container-fluid">
19		19	<div class="row">
20	<div id="bd">	20	<div class="col-md-8 col-md-offset-2">
21	<div id="yui-main">
22
23		21
24	<h1>Merging records</h1>	22	<h1>Merging records</h1>
25		23
Lines 104-111 div#result { margin-top: 1em; } Link Here
104	[% END %]	102	[% END %]
105		103
106	</div>	104	</div>
107	</div>
108	</div>
109		105
110	[% MACRO jsinclude BLOCK %]	106	[% MACRO jsinclude BLOCK %]
111	[% INCLUDE 'merge-record-strings.inc' %]	107	[% INCLUDE 'merge-record-strings.inc' %]

Lines 6-20 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tt (-6 / +6 lines)
6		6
7	<body id="auth_blinddetail-biblio-search" class="auth">	7	<body id="auth_blinddetail-biblio-search" class="auth">
8		8
9	<div id="doc" class="yui-t7">	9	<div class="main container-fluid">
10	<div id="bd">	10	<div class="row">
11	<div class="yui-g">	11	<div class="col-md-8 col-md-offset-2">
12		12
13	<div id="loading"> <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading </div>	13	<div id="loading"> <img src="[% interface %]/[% theme %]/img/spinner-small.gif" alt="" /> Loading </div>
14		14
15	</div>	15	</div>
16	</div>	16	</div>
17	</div>	17
18		18
19	[% MACRO jsinclude BLOCK %]	19	[% MACRO jsinclude BLOCK %]
20	<script type="text/javascript">	20	<script type="text/javascript">