design

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

diff --git a/conf/normalize/isis_ffzg.xml b/conf/normalize/isis_ffzg.xml
index 7771e26..766280b 100644 (file)
--- a/conf/normalize/isis_ffzg.xml
+++ b/conf/normalize/isis_ffzg.xml
@@ -17,7 +17,6 @@
 
        <ISSN>
                <isis type="display">v11</isis>
-               <isis type="display">v11^a</isis>
        </ISSN>
 
        <IdentificationNumbers name="ISN">
@@ -25,8 +24,7 @@
        </IdentificationNumbers>
        
        <Language>
-               <isis type="search">filter{lang_search}v101</isis>
-               <isis type="display">filter{lang_display}v101</isis>
+               <isis>v101</isis>
        </Language>
        
        <TitleProper>
@@ -114,7 +112,6 @@
        </SeriesTitle>
        
        <GeneralNote>
-               <isis>v300^a</isis>
                <isis>v300</isis>
        </GeneralNote>
 
@@ -130,9 +127,9 @@
                <isis>v314</isis>
        </IntellectResponsNote>
 
-       <InternalBiliographies>
+       <InternalBibliographies>
                <isis>v320</isis>
-       </InternalBiliographies>
+       </InternalBibliographies>
 
        <Frequency>
                <isis>v326</isis>
@@ -143,7 +140,7 @@
        </ContentsNote>
 
        <Summary>
-               <isis>v330^a</isis>
+               <isis>v330</isis>
        </Summary>
 
        <SystemRequirements>
@@ -160,13 +157,26 @@
        </Parts>
        
        <PartsEF>
-               <isis type="display">lookup{set-efzg:v001}</isis>
+               <isis type="display">lookup{naslov-efzg:001v001}</isis>
        </PartsEF>
 
        <PartsID>
                <isis>v463^1</isis>
        </PartsID>
 
+       <Piece>
+               <isis>lookup{naslov-efzg:s463^1}</isis>
+       </Piece>
+
+       <PieceSubtitle>
+               <isis>lookup{podnaslov-efzg:s463^1}</isis>
+       </PieceSubtitle>
+
+       <PieceNum>
+               <isis>v463^v</isis>
+       </PieceNum>
+       
+
        <PieceAnalitic>
                <isis>v464^a / v464^g v464^f</isis>
        </PieceAnalitic>
@@ -243,17 +253,6 @@
                <isis>v856^u</isis>
        </URL>
 
-       <Set>
-               <isis type="display">lookup{set-jzav:v946^1}</isis>
-               <isis type="search">v946^1</isis>
-               <isis type="display">lookup{set-efzg:s463^1}</isis>
-               <isis type="search">s463^1</isis>
-       </Set>
-
-       <Set2>
-               <isis>lookup{set-jzav:lookup{parent-id:v946^1}}</isis>
-       </Set2>
-
        <level>
                <isis>v909</isis>
        </level>
@@ -263,6 +262,17 @@
                <isis>001v001</isis>
        </ID>
        
+       <Set>
+               <isis type="display">lookup{set-jzav:v946^1}</isis>
+               <isis type="search">v946^1</isis>
+               <isis type="display">lookup{set-efzg:v461^1}</isis>
+               <isis type="search">v461^1</isis>
+       </Set>
+
+       <Set2>
+               <isis>lookup{set-jzav:lookup{parent-id:v946^1}}</isis>
+       </Set2>
+
        <CallNo>
                <isis>v990</isis>
        </CallNo>

diff --git a/conf/output/tt/html_ffzg.tt b/conf/output/tt/html_ffzg.tt
index d1b0d7b..309f344 100644 (file)
--- a/conf/output/tt/html_ffzg.tt
+++ b/conf/output/tt/html_ffzg.tt
@@ -1,145 +1,145 @@
-<div style="border: 1px #ff0000 solid; display: block; width: 30em; float: right;">
-[% config.name %]
-::
-[% config.input.name %]
-
-<pre>
-[%
-       f.dump_html(data, config);
-%]
-</pre>
-</div>
-
-<table style="border: 1px solid #808080;">
-
-[% IF d('PersonalName') || d('PersonalName2') %]
-<tr class="line">
-  <td class="label">Autor(i)</td>
-  <td>
-       <b>[% d('PersonalName') %], [% d('PersonalSurname') %]<br/></b>
-       [% 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"> </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>
+<div style="border: 1px #ff0000 solid; display: block; width: 30em; float: right;" class="dump">\r
+[% config.name %]\r
+::\r
+[% config.input.name %]\r
+
+<pre>\r
+[%\r
+       f.dump_html(data, config);\r
+%]\r
+</pre>\r
+</div>\r
+
+<table style="border: 1px solid #808080;">\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
+
+[% 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
+
+<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
+
+        [% IF d('ParallelTitle') %]\r
+            <small> = [% d('ParallelTitle') %] </small>\r
+        [% END %]\r
+        \r
+        / [% d('Responsibility') %]. [% d('TitleProper2') %]\r
+  </td>\r
+</tr>\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
+
+<tr class="line">\r
+  <td class="label">Impresum</td>\r
+  <td>\r
+       [% d('PlacePublication') %] : [% d('NamePublisher') %], [% d('DatePublication') %]\r
+  </td>\r
+</tr>\r
+
+<tr class="line">\r
+  <td class="label">Materijalni opis</td>\r
+  <td>\r
+       [% d('PhysicalDescription') %]\r
+  </td>\r
+</tr>\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
+
+<tr class="line">\r
+  <td class="label">Format</td>\r
+  <td>\r
+       [% c.materialtype %]\r
+  </td>\r
+</tr>\r
+
+[% IF d('ISBN') %]\r
+<tr class="line">\r
+ <td class="label">ISBN</td>\r
+ <td>\r
+       [% d('ISBN') %]\r
+ </td>\r
+[% END %]\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
+
+[% 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
+
+[% 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
+
+<tr class="separator">\r
+  <td colspan="2"> </td>\r
+</tr>\r
+
+<tr class="lokacija">\r
+  <td class="label">Lokacija</td>\r
+  <td>\r
+       [% c.library %]\r
+  </td>\r
+</tr>\r
+
+<tr class="signatura">\r
+  <td class="label">Signatura</td>\r
+  <td>\r
+       [% d('CallNo') %]\r
+  </td>\r
+</tr>\r
 
 </table>

diff --git a/conf/output/tt/html_ffzg_results_nonstd.tt b/conf/output/tt/html_ffzg_results_nonstd.tt
index e47b7a3..020b580 100644 (file)
--- a/conf/output/tt/html_ffzg_results_nonstd.tt
+++ b/conf/output/tt/html_ffzg_results_nonstd.tt
@@ -1,11 +1,12 @@
 <br/>
 <div class="holder_nonstd">
 
+<div class="leftcol">
 <div class="bookcov_nonstd">
         <img border="0" class="cover" src="http://images.amazon.com/images/P/[% d('ISBN').replace('-| ', '') %].01._SL160_SCLZZZZZZZ_.jpg" alt="."/>
-
+</div>
 [% IF d('PersonalName') or d('PersonalName2') or d('PersonalNameOther') or d('CorporateName') %]
-       <h3>Naslovi istog autora:</h3>
+       <div class="search_other">Naslovi istog autora:</div>
                [% IF d('PersonalName') %]&middot; 
                        [% search('PersonalName','Names','<br/>') %]<br/>
                [% END %]
@@ -21,7 +22,7 @@
 [% END %]
 
        [% IF d('UDC') or d('APA') or d('UncontrolledTerms') %]
-       <h3>Slièni naslovi</h3>
+       <div class="search_other">Slièni naslovi:</div>
        [% END %]
                [% IF d('UncontrolledTerms') %]<span class="labelNonstd">prema temi: </span><br/>
                                [% search('UncontrolledTerms','UncontrolledTerms','<br/>') %]<br/><br/> 
@@ -43,15 +44,15 @@
        [% IF d('titleNo') %]
                [% d('titleNo') %] /
        [% END %]
--->
 
        [% IF d('level') == '3' -%]
                [%- d('Set') -%]. 
        [%- END -%]
 
+-->
        [%- d('TitleProper').replace('<|>', '') -%]
         [%- IF d('Subtitle') -%] : 
-               [%- d('Subtitle') -%]
+               [%- d('Subtitle',' ') -%]
         [%- END -%]</span>
         [%- IF d('ParallelTitle') -%] = 
                [%- d('ParallelTitle') -%]
@@ -62,30 +63,51 @@
         [%- IF d('EditionStatement') -%], 
                [%- d('EditionStatement') %].
         [% END %]
-        [% IF d('Responsibility') %]<br/>
-               [% d('Responsibility','') %]
+        [% IF d('Responsibility') %]<br/><span class="autDet">
+               [% d('Responsibility','') %]</span>
         [% END %]
-       
-       [% IF d('DatePublication') %]<br/><br/><span class="labelNonstd">Godina: </span>
-               [% d('DatePublication').replace('cop. ', '') %]
-       [% END %]
-       
-       [% IF d('SerialNo') %]<br/><br/>
+<br/>  
+       [% IF d('SerialNo') %]<br/><span class="labelNonstd">Brojcani podaci: </span>
                [% d('SerialNo') %]
        [% END %]
        
-       [% IF d('PlacePublication') %]<br/><span class="labelNonstd">Izdavaè: </span>
-               [% d('PlacePublication',' : ') %] : [% d('NamePublisher',' ; ') %]
+       [% IF d('PlacePublication') %]<br/>
+               [% d('PlacePublication',' : ') %] : [% d('NamePublisher',' ; ') %], [% d('DatePublication') %]
        [% END %] 
                
+<div class="avail2">
+ <div class="avt">Podaci o dostupnosti:</div>
+       [% config.name %]
+<small>
+       [% IF d('CallNo') %] 
+               -- Signatura: <span style="color: #CC3333;"> [% d('CallNo',' ') %]</span>
+       [% END %]
+
+[% record_uri %]
+<br/>[% config.database %]
+<!--
+       [% d('MFN') %]
+-->
+</small>
+
+<!--
+<br/><br/>
+
+  <h3><span>Oblik zapisa</span></h3>
+
+       <ul class="redstar">
+               <li><a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_apa.tt') %]">APA stil citiranja</a></li>
+               <li><a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_isbd.tt') %]">katalo¾ni opis</a></li>
+               <li><a href="#" onClick="[% load_template('html_ffzg_results_short.tt') %]">lista rezultata</a></li>
+       </ul>
+-->
+
+</div>
+
        [% IF d('ISBN') %]<br/><span class="labelNonstd">ISBN</span>
                [% d('ISBN') %]
         [% END %]
                
-       [% IF d('Frequency') %]<br/><span class="labelNonstd">Èestina izla¾enja: </span>
-               [% d('Frequency') %]
-        [% END %]
-
        [% IF d('PhysicalDescription') %]<br/><span class="labelNonstd">Materijalni opis: </span>
        <!--
                [% d('MaterialDesignation').replace('.*,', '') -%]
@@ -117,22 +139,35 @@
                Dijelovi: <ul><li>[% search('Parts','ID','</li><li>','html_ffzg_results_nonstd.tt') %]</ul>
        [% END %]
 
-       [% s('PartsEF') %]
+       [% d('PartsEF') %]
 
        [% IF d('Set') %]<br/>
                Cjelina: [%- search('Set','ID',' ','html_ffzg_results_nonstd.tt') -%]
        [% END %]
 
-<br/>  [% IF d('Set') %]
-               [% d('Set',' ') %]
+       [% IF d('Piece') %]<br/><span class="labelNonstd">Matièna publikacija: </span> 
+               [% search('Piece','TitleProper',' ','html_ffzg_results_nonstd.tt') %]
+               
+               [% IF d('PieceSubtitle') %] : 
+                       [% d('PieceSubtitle') %]
+               [% END  %]
+               
+               , [% d('PieceNum') %]
        [% END %]
 
-       [% IF d('GeneralNote') %]<br/><br/><span class="labelNonstd">Napomena: </span>
+       [% IF d('GeneralNote') || d('InternalBiliographies') || d('Fequency') %]<br/><br/><span class="labelNonstd">Napomena: </span>
                [% d('GeneralNote','. - ') %]
+               
+               [% IF d('Frequency','. - ') %]. - [% END %]
+               [% d('Frequency','. - ') %]
+               
+               [% IF d('InternalBibliographies') %]. - [% END %]
+               [% d('InternalBibliographies','. - ') %]
+               
        [% END %]
 
        [% IF d('Summary') %]<br/><br/><span class="labelNonstd">Sa¾etak: </span>
-               [% d('Summary') %]
+               [% d('Summary','. - ') %]
        [% END %]
 
        [% IF d('ContentsNote') %] <br/><br/>
@@ -144,30 +179,8 @@
 
 </div>
 
-<div class="avail">
- <h3><span>Podaci o dostupnosti:</span></h3>
-       [% config.name %]
-<small>
-       [% IF d('CallNo') %] 
-               -- Signatura: <span style="color: #CC3333;"> [% d('CallNo',' ') %]</span>
-       [% END %]
 
-[% record_uri %]
-<br/>[% config.database %]
-<!--
-       [% d('MFN') %]
--->
-</small>
-
-<br/><br/>
-
-  <h3><span>Oblik zapisa</span></h3>
-
-       <ul class="redstar">
-               <li><a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_apa.tt') %]">APA stil citiranja</a></li>
-               <li><a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_isbd.tt') %]">katalo¾ni opis</a></li>
-               <li><a href="#" onClick="[% load_template('html_ffzg_results_short.tt') %]">lista rezultata</a></li>
-       </ul>
-
-</div>
 </div>
+
+<p>&nbsp;</p>
+<p>&nbsp;</p>

diff --git a/conf/output/tt/html_ffzg_results_short.tt b/conf/output/tt/html_ffzg_results_short.tt
index c18edcb..ca8c4e1 100644 (file)
--- a/conf/output/tt/html_ffzg_results_short.tt
+++ b/conf/output/tt/html_ffzg_results_short.tt
@@ -11,7 +11,7 @@
        <a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_nonstd.tt') %]">
        [% d('TitleProper').replace('<|>', '') -%]
                [%- IF d('Subtitle') -%] : 
-               [%- d('Subtitle') -%]
+               [%- d('Subtitle',' ') -%]
         [%- END -%]</a></span>
         [%- IF d('ParallelTitle') -%]
        = [% d('ParallelTitle') %]
@@ -35,12 +35,4 @@
        </div>
 </div>
 
-<div class="links">
-       <ul class="redstar">
-               <li><a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_nonstd.tt') %]">vi¹e informacija</a></li>
-               <li><a href="#" onClick="[% load_rec(record_uri, 'html_ffzg_results_apa.tt') %]">oblik za citiranje</a></li>
-       
-         </ul>
-</div>
-
 </div>