Changeset 2245

Timestamp:

09/20/12 12:26:42 (12 years ago)

Author:

zastrow

Message:

 

Location:

SRUAggregator/trunk

Files:

• src/java/clarind/fcs/Aggregator.java (modified) (2 diffs)
• web/buttonAddForeignEndpoint.png (added)
• web/index.zul (modified) (7 diffs)

SRUAggregator/trunk/src/java/clarind/fcs/Aggregator.java

@@ -25 +25 @@
 import org.zkoss.zul.Iframe;
 import org.zkoss.zul.Window;
+
+
+
 import java.util.logging.*;
 
@@ -30 +33 @@
 
     private static Logger logger = Logger.getLogger("FCS-AGGREGATOR");
-    @Wire
-    private Grid anzeigeGrid;
+//    @Wire
+//    private Grid anzeigeGrid;
     @Wire
     private Textbox searchString;

SRUAggregator/trunk/web/index.zul

@@ +1 @@
+    <?page title="CLARIN-D Federated Content Search"?>
+<zk title="CLARIN-D Federated Content Search">
+<!--title="CLARIN-D Federated Content Search"-->
 
-<zk>
-<!--title="CLARIN-D Federated Content Search"-->
-    <window  id="mainWindow" contentStyle="background:white;" height="100%" apply="clarind.fcs.Aggregator"> 
+    <window  id="mainWindow" contentStyle="background:white;" height="100%" apply="clarind.fcs.Aggregator" > 
+        
         <borderlayout sclass="complex-layout"  >
             <!-- Kopf -->
@@ -8 +10 @@
                 <image src="clarindLogo.png"/>
             </north>
-            
+                 
             <!-- Linke Sidebar -->
-<!--            <west width="0px"  flex="true" splittable="true" margins="0,5,0,0">
- 
-            </west>-->
-      
-            <!-- Center - Inhalt -->
             <west autoscroll="true" splittable="true">
                 <panel >
-                    <panelchildren style="margin-top:10px;margin-left:10px;margin-right:10px;border:0;">                   
+                    <panelchildren style="margin-top:10px;margin-left:10px;margin-right:10px;border:0;">    
+                    
+                        
+                                       
+                        <separator />
+                        
                         <textbox id="searchString" value="Elefant" />
                         <button id="searchButton"  label="Search" image="buttonSearch.png"/>     
@@ -61 +63 @@
                                 <comboitem label="UPF;http://gilmere.upf.edu/pais_sru"/>
                             </combobox>
-                            
-                           
-                            
-                            <button id="addForeignEndpoint" label="Add" />
-                            
+
+                            <button id="addForeignEndpoint" label="Add" image="buttonAddForeignEndpoint.png"/>                          
                         </groupbox>
                         
@@ -72 +71 @@
             </west>
             
-            <!-- Rechte Sidebar -->  
+            <!-- Mittlerer Bereich-->  
             <center  flex="true"  margins="0,5,0,0" autoscroll="true" >
+               
                 <panel>
                     <panelchildren  id="resultsPanel" style="overflow: auto">
@@ -82 +82 @@
                                   <menuitem label="Export Results to CSV" id="exportResultsCSV" image="buttonExport.png" />
                                   <menuitem label="Export Results to TCF" id="exportResultsTCF" image="buttonExport.png" />                           
-                             </menupopup>                                
+                             </menupopup>    
+                               
+                               
+                               
                             </menu>                            
                             <menu label="Help" image="buttonHelp.png">
@@ -89 +92 @@
                                      <menuitem label="About" id="showAbout" image="buttonShowAbout.png" />
                                 </menupopup>   
-                            </menu>
-                                                                                 
+                            </menu>                                                                                                                 
+                        
                         </menubar>
-<!--                         <toolbar id="resultsToolbar"  height="20px">
-                           <toolbarbutton id="clearResults" label="Clear Results" image="buttonDelete.png"/>
-                            <toolbarbutton id="exportResults" label="Export Results" image="buttonExport.png"/>
-                            <toolbarbutton id="showHelp" label="Show Help" image="buttonHelp.png"/>
-                                
-                        </toolbar>
-                        -->
                         <vbox id="resultsVbox">
-                            <iframe src="help.html" width="100%" height="100%"/>
-                            <grid id="anzeigeGrid">
-                                <columns>
-                                    <column></column>
-                                    <column></column>  
-                                    <column></column>                                       
-                                </columns>
-                                <rows></rows>
-                            </grid>
-                            <html id="anzeigeResults" />
+                            <iframe src="help.html" width="800px" height="400px" />
                         </vbox>
                     </panelchildren>
@@ -122 +109 @@
         </borderlayout>
     </window>
+
 </zk>