git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.server/pages/metadatadetails.zul b/server/user.jobengine.osgi.server/pages/metadatadetails.zul
index b40b6e81c7fe313487eb6a1c8f628f734f1ce653..8a578d5709822c86b00d321663ebf9d25dab7de1 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/metadatadetails.zul
+++ b/server/user.jobengine.osgi.server/pages/metadatadetails.zul
@@ -1,40 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<window id="window"  title="" width="900px" height="660px" position="top_center" sizable="true" border="normal" apply="org.zkoss.bind.BindComposer"\r
+<window id="window"  title="" width="900px" height="655px" position="top_center" sizable="true" border="normal" apply="org.zkoss.bind.BindComposer"\r
        viewModel="@id('vm') @init('user.jobengine.zk.model.MetadataDetailsModel')" forward="onCancel=closeButton.onClick">\r
        <style>\r
                .z-window-header{ background:#008ac8; color:white; font-size:16px; padding:10px; } .z-row:hover > .z-row-inner{ background:#7ad6ff40; }\r
        </style>\r
        <attribute name="onSize"><![CDATA[\r
-               String height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.059813084112149535);\r
+               Integer gridHeight=Integer.parseInt(self.getHeight().replace("px",""))-48;\r
+               String height= String.valueOf(gridHeight*1/18);\r
             item_houseid.setHeight(height+"px");\r
             Clients.resize(item_houseid);\r
             item_title.setHeight(height+"px");\r
             Clients.resize(item_title);\r
             item_type.setHeight(height+"px");\r
             Clients.resize(item_type);\r
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.21495327102803738);\r
-            item_description.setHeight(height+"px");\r
-            Clients.resize(item_description);\r
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.0599250936329588);\r
             media_houseid.setHeight(height+"px");\r
             Clients.resize(media_houseid);\r
             media_title.setHeight(height+"px");\r
             Clients.resize(media_title);\r
             media_type.setHeight(height+"px");\r
             Clients.resize(media_type);\r
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.41869158878504675);\r
+            height= String.valueOf(gridHeight*3/18);\r
+            item_description.setHeight(height+"px");\r
+            Clients.resize(item_description);\r
+            height= String.valueOf(gridHeight*9/18);\r
             media_description.setHeight(height+"px");\r
             Clients.resize(media_description);\r
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.41869158878504675*0.9);\r
+            height= String.valueOf(gridHeight*9/18*0.88);\r
             media_description_content.setHeight(height+"px");\r
             Clients.resize(media_description_content);\r
         ]]></attribute>\r
        <vlayout height="100%">\r
-               <div id="div" vflex="10">\r
+               <div id="div" vflex="true" >\r
                        <listbox vflex="1" style="border: none; background: #e3e3e3 !important;">\r
                                <listhead>\r
-                                       <listheader label="Tulajdonság" width="20%" />\r
-                                       <listheader label="Metaadat" />\r
+                                       <listheader label="" width="20%" />\r
+                                       <listheader label="" />\r
                                </listhead>\r
                                        <listitem id="item_houseid">\r
                                                <listcell label="Anyag azonosítója:" />\r
@@ -50,7 +50,7 @@
                                        </listitem>\r
                                        <listitem id="item_description">\r
                                                <listcell label="Anyag leírása" />\r
-                                               <listcell><textbox rows="7" disabled="true" width="99%" value="@load(vm.archivedMedia.item.description)"></textbox></listcell>\r
+                                               <listcell><textbox rows="6" disabled="true" width="99%" value="@load(vm.archivedMedia.item.description)"></textbox></listcell>\r
                                        </listitem>\r
                                        <listitem id="media_houseid">\r
                                                <listcell label="Média azonosítója:" />\r
@@ -71,14 +71,14 @@
                                        </listitem>\r
                                        <listitem id="media_description">\r
                                                <listcell label="Média leírása:" />\r
-                                               <listcell><textbox rows="15" inplace="true" width="99%" id="media_description_content"\r
+                                               <listcell><textbox rows="21" inplace="true" width="99%" id="media_description_content"\r
                                                        value="@load(vm.archivedMedia.media.description) @save(vm.archivedMedia.media.description,before='save')">\r
                                                </textbox></listcell>\r
                                        </listitem>\r
                        </listbox>\r
                </div>\r
                <div vflex="min">\r
-               <hbox width="100%"  pack="center" align="center">\r
+               <hbox width="100%" vflex="min" pack="center" align="center">\r
                        <button id="saveButton" label="Mentés" onClick="@command('save')"/>\r
                        <button id="closeButton" label="Mégse" onClick="@command('close')" />\r
                </hbox>\r

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 99779b4bafa08839473c563f3a9007fdc2f37bbf..2e5f00579f020615e4ac42de5daf5fcb78725915 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -190,13 +190,7 @@
                                                                                                                <label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />\r
                                                                                                        </hlayout>\r
                                                                                                        <html sclass="relevant">\r
-\r
-\r
-                                                                                                               \r
                                                                                                                <![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]>\r
-                                                                                                               \r
-                                                                                                               \r
-                                                                                                               \r
                                                                                                        </html>\r
                                                                                                </div>\r
                                                                                        </hlayout>\r
@@ -242,6 +236,7 @@
                                        <center border="none">\r
                                                <div height="100%">\r
                                                        <toolbar width="100%" height="40px" style="font-size:8px">\r
+                                                       <div style="width:400px; margin:auto;">\r
                                                                <div sclass="menuButtons">\r
                                                                        <toolbarbutton image="/img/ic_compare_arrows_black_18dp.png" autodisable="self" onClick="@command('showInResults')"\r
                                                                                disabled="@load(vm.selectedObject eq null)" label="Szinkronizálás" />\r
@@ -252,6 +247,7 @@
                                                                        <toolbarbutton image="/img/baseline_edit_black_18dp.png" autodisable="self" onClick="@command('openMetaDataDialog')"\r
                                                                                disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Szerkesztés" />\r
                                                                </div>\r
+                                                               </div>\r
                                                        </toolbar>\r
                                                        <div id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">\r
                                                                <div>\r