design

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@229 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/conf/normalize/isis_ffzg.xml b/conf/normalize/isis_ffzg.xml
index 51156a8..04f338a 100644 (file)
--- a/conf/normalize/isis_ffzg.xml
+++ b/conf/normalize/isis_ffzg.xml
@@ -213,7 +213,16 @@
                <isis>v702^a, v702^b</isis>
                <isis type="index">v702^a, v702^b</isis>
        </PersonalNameOther>
-       
+
+       <Names>
+               <isis>v700^a, v700^b</isis>
+               <isis>v701^a, v701^b</isis>
+               <isis>v702^a, v702^b</isis>
+               <isis type="index">v700^a, v700^b</isis>
+               <isis type="index">v701^a, v701^b</isis>
+               <isis type="index">v702^a, v702^b</isis>
+       </Names>
+
        <CorporateName>
                <isis>v710^a</isis>
        </CorporateName>

diff --git a/conf/output/tt/html_ffzg.tt b/conf/output/tt/html_ffzg.tt
index a2b9c30..136bf04 100644 (file)
--- a/conf/output/tt/html_ffzg.tt
+++ b/conf/output/tt/html_ffzg.tt
@@ -1,141 +1,140 @@
-<div style="border: 1px #ff0000 solid; display: block; width: 30em; float: right;">
-<pre>[%
-       USE dumper;
-       dumper.dump(data,d);
-%]</pre>
-</div>
-
-<table style="border: 1px solid #808080;">
-
-[% IF d('PersonalName') || d('PersonalName2') %]
-<tr class="line">
-  <td class="label">Autor(i)</td>
-  <td>
-       [% d('PersonalName') %], [% d('PersonalSurname') %]<br/>
-       [% d('PersonalName2').join("<br/>") %]
-  </td>
-</tr>
-[% END %]
-
-[% IF d('CorporateName') || d('CorporateName2') %]
-<tr class="line">
-  <td class="label">Ustanova</td>
-  <td>
-       [% d('CorporateName') %]<br/>
-       [% d('CorporateName2') %]
-  </td>
-</tr>
-[% END %]
-
-<tr class="line2">
-  <td class="label">Naslov</td>
-  <td>
-       [% d('TitleProper') %] 
-        
-        [% IF d('Subtitle') %]
-            : [% d('Subtitle') %]
-        [% END %]
-
-        [% IF d('ParallelTitle') %]
-            <small> = [% d('ParallelTitle') %] </small>
-        [% END %]
-        
-        / [% d('Responsibility') %]. [% d('TitleProper2') %]
-  </td>
-</tr>
-
-
-[% IF d('EditionStatement') %]
-<tr class="line">
-  <td class="label">Izdanje</td>
-  <td>
-       [% d('EditionStatement') %]
-  </td>
-</tr>
-[% END %]
-
-
-<tr class="line">
-  <td class="label">Impresum</td>
-  <td>
-       [% d('PlacePublication') %] : [% d('NamePublisher') %], [% d('DatePublication') %]
-  </td>
-</tr>
-
-<tr class="line">
-  <td class="label">Materijalni opis</td>
-  <td>
-       [% d('PhysicalDescription') %]
-  </td>
-</tr>
-
-[% IF d('Series') %]
-<tr class="line">
-  <td class="label">Nakladnièka cjelina</td>
-  <td>
-       [% d('Series') %]
-  </td>
-</tr>
-[% END %]
-
-<tr class="line">
-  <td class="label">Format</td>
-  <td>
-       [% c.materialtype %]
-  </td>
-</tr>
-
-[% IF d('ISBN') %]
-<tr class="line">
- <td class="label">ISBN</td>
- <td>
-       [% d('ISBN') %]
- </td>
-[% END %]
-
-[% IF d('UncontrolledTerms') %]
-<tr class="line">
-  <td class="label">Predmetnice</td>
-  <td>
-       [% d('UncontrolledTerms.join("<br/>")') %]
-  </td>
-</tr>
-[% END %]
-
-[% IF d('UDC') %]
-<tr class="line">
-  <td class="label">Klasifikacija (UDK)</td>
-  <td>
-       [% d('UDC') %]
-  </td>
-</tr>
-[% END %]
-
-[% IF d('APA') %]
-<tr class="line">
-  <td class="label">Klasifikacija (APA)</td>
-  <td>
-       [% d('APA') %]
-  </td>
-</tr>
-[% END %]
-
-<tr class="separator">
-  <td colspan="2">&nbsp;</td>
-</tr>
-
-<tr class="lokacija">
-  <td class="label">Lokacija</td>
-  <td>
-       [% c.library %]
-  </td>
-</tr>
-
-<tr class="signatura">
-  <td class="label">Signatura</td>
-  <td>
-       [% d('CallNo') %]
-  </td>
-</tr>
-
-</table>
\ No newline at end of file
+<div style="border: 1px #ff0000 solid; display: block; width: 30em; float: right;">\r
+<pre>[%\r
+       USE dumper;\r
+       dumper.dump(data,d);\r
+%]</pre>\r
+</div>\r
+\r
+<table style="border: 1px solid #808080;">\r
+\r
+[% IF d('PersonalName') || d('PersonalName2') %]\r
+<tr class="line">\r
+  <td class="label">Autor(i)</td>\r
+  <td>\r
+       <b>[% d('PersonalName') %], [% d('PersonalSurname') %]<br/></b>\r
+       [% d('PersonalName2').join("<br/>") %]\r
+  </td>\r
+</tr>\r
+[% END %]\r
+\r
+[% IF d('CorporateName') || d('CorporateName2') %]\r
+<tr class="line">\r
+  <td class="label">Ustanova</td>\r
+  <td>\r
+       [% d('CorporateName') %]<br/>\r
+       [% d('CorporateName2') %]\r
+  </td>\r
+</tr>\r
+[% END %]\r
+\r
+<tr class="line2">\r
+  <td class="label">Naslov</td>\r
+  <td>\r
+       [% d('TitleProper') %] \r
+        \r
+        [% IF d('Subtitle') %]\r
+            : [% d('Subtitle') %]\r
+        [% END %]\r
+\r
+        [% IF d('ParallelTitle') %]\r
+            <small> = [% d('ParallelTitle') %] </small>\r
+        [% END %]\r
+        \r
+        / [% d('Responsibility') %]. [% d('TitleProper2') %]\r
+  </td>\r
+</tr>\r
+\r
+\r
+[% IF d('EditionStatement') %]\r
+<tr class="line">\r
+  <td class="label">Izdanje</td>\r
+  <td>\r
+       [% d('EditionStatement') %]\r
+  </td>\r
+</tr>\r
+[% END %]\r
+\r
+<tr class="line">\r
+  <td class="label">Impresum</td>\r
+  <td>\r
+       [% d('PlacePublication') %] : [% d('NamePublisher') %], [% d('DatePublication') %]\r
+  </td>\r
+</tr>\r
+\r
+<tr class="line">\r
+  <td class="label">Materijalni opis</td>\r
+  <td>\r
+       [% d('PhysicalDescription') %]\r
+  </td>\r
+</tr>\r
+\r
+[% IF d('Series') %]\r
+<tr class="line">\r
+  <td class="label">Nakladnièka cjelina</td>\r
+  <td>\r
+       [% d('Series') %]\r
+  </td>\r
+</tr>\r
+[% END %]\r
+\r
+<tr class="line">\r
+  <td class="label">Format</td>\r
+  <td>\r
+       [% c.materialtype %]\r
+  </td>\r
+</tr>\r
+\r
+[% IF d('ISBN') %]\r
+<tr class="line">\r
+ <td class="label">ISBN</td>\r
+ <td>\r
+       [% d('ISBN') %]\r
+ </td>\r
+[% END %]\r
+\r
+[% IF d('UncontrolledTerms') %]\r
+<tr class="line">\r
+  <td class="label">Predmetnice</td>\r
+  <td>\r
+       [% d('UncontrolledTerms.join("<br/>")') %]\r
+  </td>\r
+</tr>\r
+[% END %]\r
+\r
+[% IF d('UDC') %]\r
+<tr class="line">\r
+  <td class="label">Klasifikacija (UDK)</td>\r
+  <td>\r
+       [% d('UDC') %]\r
+  </td>\r
+</tr>\r
+[% END %]\r
+\r
+[% IF d('APA') %]\r
+<tr class="line">\r
+  <td class="label">Klasifikacija (APA)</td>\r
+  <td>\r
+       [% d('APA') %]\r
+  </td>\r
+</tr>\r
+[% END %]\r
+\r
+<tr class="separator">\r
+  <td colspan="2"> </td>\r
+</tr>\r
+\r
+<tr class="lokacija">\r
+  <td class="label">Lokacija</td>\r
+  <td>\r
+       [% c.library %]\r
+  </td>\r
+</tr>\r
+\r
+<tr class="signatura">\r
+  <td class="label">Signatura</td>\r
+  <td>\r
+       [% d('CallNo') %]\r
+  </td>\r
+</tr>\r
+\r
+</table>

diff --git a/conf/output/tt/html_ffzg_results_apa.tt b/conf/output/tt/html_ffzg_results_apa.tt
index 148d6c2..60b5185 100644 (file)
--- a/conf/output/tt/html_ffzg_results_apa.tt
+++ b/conf/output/tt/html_ffzg_results_apa.tt
@@ -15,10 +15,12 @@
 <tr>
   <td> 
     [% d('PersonalName') -%]
-    [%- IF d('PersonalName2') -%], 
-        [%- d('PersonalName2') -%]
+    [%- IF d('PersonalName2') -%]; 
+        [%- d('PersonalName2', '; ') -%]
+    [%- END -%]
+    [%- IF d('PersonalNameOther') -%]
+       [%- d('PersonalNameOther','; ') -%] (Eds.). 
     [%- END -%]
-    
     ([%- d('DatePublication').replace('cop. ','') -%]).
     
     <i> [%- d('TitleProper') -%]
@@ -42,4 +44,4 @@
 </tr>
 -->
 
-</table>
\ No newline at end of file
+</table>

diff --git a/conf/output/tt/html_ffzg_results_nonstd.tt b/conf/output/tt/html_ffzg_results_nonstd.tt
index dbc277b..ede59ad 100644 (file)
--- a/conf/output/tt/html_ffzg_results_nonstd.tt
+++ b/conf/output/tt/html_ffzg_results_nonstd.tt
@@ -1,9 +1,8 @@
 <br/>
 <div class="holder_nonstd">
 
-
 <div class="bookcov_nonstd">
-        <img border="4" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-', '') %].01._SL160_SCLZZZZZZZ_.jpg" alt="."/>
+        <img border="4" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-| ', '') %].01._SL160_SCLZZZZZZZ_.jpg" alt="."/>
 
 </div>
 
@@ -28,12 +27,12 @@
         [% d('MaterialDesignation').replace('.*,', '') -%]
         [%- IF d('ISBN') -%] ISBN [% d('ISBN') %] 
         [% END %]
- 
-        [% IF d('SeriesTitle') %]<br/><br/>
+ <br/>
+        [% IF d('SeriesTitle') %]<br/>
             Serija: [% d('SeriesTitle') %]
         [% END %]
-    </small>
-       [% IF d('UncontrolledTerms') %]<br/><br/>
+    </small><br/>
+       [% IF d('UncontrolledTerms') %]<br/>
                        <b>Tema: </b>
                        [% search('UncontrolledTerms','UncontrolledTerms',' * ') %] 
        [% END %]
@@ -45,7 +44,7 @@
        -->
        
        [% IF d('APA') %]
-               <br/><small>Klasifikacija: [% d('APA',' ') %] (APA)<br/></small>
+               <br/><small>Klasifikacija: [% search('APA','APA',' ') %] <br/></small>
        [% END %]
 
        [% IF d('ContentsNote') %] <br/>
@@ -64,6 +63,10 @@
 [% IF d('CallNo') %] <br/>
 (Signatura: <span style="color: #CC3333;"> [% d('CallNo',' ') %]</span>)
 [% END %]
+<br/>
+[% d('MFN') %]
+
+
 </small>
 <br/>
 <br/>

diff --git a/conf/output/tt/html_ffzg_results_short.tt b/conf/output/tt/html_ffzg_results_short.tt
index 55ae2a0..016f4f0 100644 (file)
--- a/conf/output/tt/html_ffzg_results_short.tt
+++ b/conf/output/tt/html_ffzg_results_short.tt
@@ -1,9 +1,7 @@
-<br/>
-
 <div class=[% IF d('CallNo') %]"holder"[% ELSE %]"holder_none"[% END %]>
 
 <div class="bookcov">
-       <a href="#" onClick="load_rec([% d('MFN') %], 'html_ffzg_results_nonstd.tt'); return false;"><img border="2" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-', '') %].01._SL90_SCLZZZZZZZ_.jpg" alt="slika naslovnice" /></a>
+       <a href="#" onClick="load_rec([% d('MFN') %], 'html_ffzg_results_nonstd.tt'); return false;"><img border="2" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-| ', '') %].01._SL90_SCLZZZZZZZ_.jpg" alt="slika naslovnice" /></a>
 </div>
 
 
@@ -24,8 +22,10 @@
       
         [% IF d('Responsibility') %]<span class="author">
            [% d('Responsibility') -%]</span>
-        [%- END -%], 
-        [%- d('DatePublication').replace('cop. ','') %]
+        [%- END -%]
+       [%- IF d('DatePublication') -%], 
+               [%- d('DatePublication').replace('cop. ','') %]
+       [% END %]
        <br/>