[elvystrac] r1822 - file list slightly changed
- From: elvys@xxxxxxxxxxxxxxxxxxxxxx
- To: elvystrac@xxxxxxxxxxxxx
- Date: Tue, 23 Feb 2010 10:39:24 +0100
Author: DavidK
Date: 2010-02-23 10:39:24 +0100 (Tue, 23 Feb 2010)
New Revision: 1822
Added:
trunk/server/webServer2/WebContent/images/icons/detail2sharp.png
trunk/server/webServer2/WebContent/images/icons/detail2soft.png
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml
trunk/server/webServer2/WebContent/styles/components/file/fileListComponent.css
Log:
file list slightly changed
Modified:
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
===================================================================
---
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-23 09:37:48 UTC (rev 1821)
+++
trunk/server/webServer2/JavaSource/cz/elvys/webServer/messages/labels_cs.properties
2010-02-23 09:39:24 UTC (rev 1822)
@@ -10,8 +10,9 @@
elvys.file.type.video=Video
elvys.role.user=U\u017Eivatel
-elvys.role.admin=Mana\u017Eer
-elvys.role.superadmin=Administr\u00E1tor
+elvys.role.admin=Spr\u00E1vce
+elvys.role.superadmin=Hlavn\u00ED spr\u00E1vce
+elvys.role.manager=Mana\u017Eer
login.title=P\u0159ihl\u00E1\u0161en\u00ED
login.username=U\u017Eivatelsk\u00E9 jm\u00E9no
@@ -19,7 +20,7 @@
login.submit=P\u0159ihl\u00E1sit
login.welcome=p\u0159ihl\u00E1\u0161en\u00ED do syst\u00E9mu
login.reconnect=Byli jste odhl\u00E1\u0161eni. P\u0159ihla\u0161te se
pros\u00EDm znovu.
-login.createdby=\u00A9 2010 SECO Music s.r.o.
+login.createdby=\u00A9 2010 JUX s.r.o.
login.lostPassword=Zapomn\u011Bli jste heslo? Klikn\u011Bte zde, porad\u00EDme
V\u00E1m.
login.lostPassword.infoMessage=Vypl\u0148te pros\u00EDm Va\u0161e
u\u017Eivatelsk\u00E9 jm\u00E9no. Na V\u00E1\u0161 email bude automaticky
odesl\u00E1n email s dal\u0161\u00EDmi pokyny.
@@ -254,7 +255,7 @@
elvys.list.title=Seznam kiosk\u016F
elvys.list.body.title=Seznam kiosk\u016F
-elvys.list.body.create.tooltip=Vytvo\u0159it nov\u00fd kiosek
+elvys.list.body.create.tooltip=Vytvo\u0159it nov\u00FD kiosek
elvys.list.table.header=Seznam kiosk\u016F
elvys.list.table.id=Id
elvys.list.table.elvysname=N\u00E1zev
@@ -290,21 +291,21 @@
elvys.list.body.delete.tooltip.question=Opravdu chcete odstranit kiosek?
elvys.list.body.delete.tooltip.no=Ne
elvys.list.body.delete.tooltip.yes=Ano
-elvys.list.body.delete.tooltip=Odstranit kiosek ze syst\u00e9mu
+elvys.list.body.delete.tooltip=Odstranit kiosek ze syst\u00E9mu
elvys.list.table.catcCount=Kategorie
-elvys.edit.form.title.create=Nov\u00fd kiosek
+elvys.edit.form.title.create=Nov\u00FD kiosek
elvys.edit.form.title.modify=Upravit kiosek
-elvys.edit.form.name=N\u00e1zev kiosku
-elvys.edit.form.address.tooltip=Vypl\u0148te pros\u00edm adresu kiosku, tzn.
ulici a \u010d\u00edslo popisn\u00e9.
+elvys.edit.form.name=N\u00E1zev kiosku
+elvys.edit.form.address.tooltip=Vypl\u0148te pros\u00EDm adresu kiosku, tzn.
ulici a \u010D\u00EDslo popisn\u00E9.
elvys.edit.form.address=Adresa
-elvys.edit.form.city=M\u011bsto
-elvys.edit.form.zipCode=PS\u010c
-elvys.edit.form.companylist=Spole\u010dnost
-elvys.edit.form.button.ok=Ulo\u017eit
+elvys.edit.form.city=M\u011Bsto
+elvys.edit.form.zipCode=PS\u010C
+elvys.edit.form.companylist=Spole\u010Dnost
+elvys.edit.form.button.ok=Ulo\u017Eit
elvys.edit.form.button.cancel=Storno
-elvys.edit.form.resolutionlist=Rozli\u0161en\u00ed obrazovky
-elvys.edit.form.resolutionlist.tooltip=Vyberte rozli\u0161en\u00ed, kter\u00e9
odpov\u00edd\u00e1 rozli\u0161en\u00ed kiosku. Jedn\u00e1 se po\u010det
obrazov\u00fdch bod\u016f, tzv. pixel\u016f, kter\u00e9 je obrazovka
schopn\u00e1 zobrazit.
+elvys.edit.form.resolutionlist=Rozli\u0161en\u00ED obrazovky
+elvys.edit.form.resolutionlist.tooltip=Vyberte rozli\u0161en\u00ED, kter\u00E9
odpov\u00EDd\u00E1 rozli\u0161en\u00ED kiosku. Jedn\u00E1 se po\u010Det
obrazov\u00FDch bod\u016F, tzv. pixel\u016F, kter\u00E9 je obrazovka
schopn\u00E1 zobrazit.
elvys.setting.header=Nastaven\u00ED rozvr\u017Een\u00ED obrazovky
elvys.setting.layoutlist.layout.day=Denn\u00ED
@@ -425,7 +426,10 @@
file.list.component.user=U\u017Eivatel
file.list.component.note=Pozn\u00E1mka
file.list.component.defaultnote=Klikn\u011Bte pro vlo\u017Een\u00ED
pozn\u00E1mky.
-file.list.component.operations=Operace
+file.list.component.planned=V\u00FDskyty
+file.list.component.planned.icon.tooltip=Zobrazit seznam
pl\u00E1nov\u00E1n\u00ED dokumentu
+file.list.component.planned.modal.header=Existuj\u00EDc\u00ED
pl\u00E1nov\u00E1n\u00ED
+file.list.component.operations=Akce
file.list.component.select=Zvolit
file.list.component.downloadtooltip=St\u00E1hnout dokument
file.list.component.deletetooltip=Smazat dokument
Added: trunk/server/webServer2/WebContent/images/icons/detail2sharp.png
===================================================================
(Binary files differ)
Property changes on:
trunk/server/webServer2/WebContent/images/icons/detail2sharp.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/server/webServer2/WebContent/images/icons/detail2soft.png
===================================================================
(Binary files differ)
Property changes on:
trunk/server/webServer2/WebContent/images/icons/detail2soft.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified:
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
2010-02-23 09:37:48 UTC (rev 1821)
+++
trunk/server/webServer2/WebContent/secured/components/file/fileListComponent.xhtml
2010-02-23 09:39:24 UTC (rev 1822)
@@ -79,12 +79,12 @@
sortMode="single"
reRender="fileListButtons, searchPanel"
columnClasses="fileList-table-column-class"
- columnsWidth="250,50,150,75,250,100">
+ columnsWidth="250,50,75,100,250,75,100">
<f:facet name="header">
<rich:columnGroup>
- <rich:column colspan="6">
+ <rich:column colspan="7">
<div class="controlPanel">
<h:panelGroup
rendered="#{showUploadIcon}">
<h:commandButton id="UploadNew"
@@ -147,16 +147,16 @@
</h:outputText>
<!-- -->
</h:column>
+ <rich:column
+ sortBy="#{file.uploaded}">
+ <f:facet
name="header">#{lbl['file.list.component.time']}</f:facet>
+ <elvys:dateTimeLabel id="UploadDate"
value="#{file.uploaded}"/>
+ </rich:column>
<rich:column
sortBy="#{file.user.surname}">
<f:facet
name="header">#{lbl['file.list.component.user']}</f:facet>
<elvys:userLabel id="usrLbl"
value="#{file.user}"/>
</rich:column>
- <rich:column
- sortBy="#{file.uploaded}">
- <f:facet
name="header">#{lbl['file.list.component.time']}</f:facet>
- <elvys:dateTimeLabel id="UploadDate"
value="#{file.uploaded}"/>
- </rich:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{lbl['file.list.component.note']}"
/>
@@ -178,6 +178,28 @@
</rich:inplaceInput>
</h:column>
+ <!-- ALREADY PLANNED? -->
+ <rich:column >
+ <f:facet
name="header">#{lbl['file.list.component.planned']}</f:facet>
+ <h:outputText
+ value="2"
+
styleClass="existing-plannings-not-link"
+ rendered="false"/>
+ <h:panelGroup rendered="true">
+ <a4j:commandLink
+ id="ShowFilePlanningsButton"
+ value="2"
+
reRender="FilePlanningsModalContent"
+
onclick="Richfaces.showModalPanel('FilePlanningsModal')"
+
styleClass="existing-plannings-link">
+ </a4j:commandLink>
+ <rich:toolTip
for="ShowFilePlanningsButton"
+
value="#{lbl['file.list.component.planned.icon.tooltip']}"
+ direction="bottom-left"
styleClass="short_tooltip"/>
+ </h:panelGroup>
+ </rich:column>
+
+
<!-- OPERATIONS -->
<h:column>
<f:facet
name="header">#{lbl['file.list.component.operations']}</f:facet>
@@ -246,7 +268,7 @@
minWidth="200"
height="150"
width="200"
- zindex="2000"
+ zindex="2500"
rendered="#{showDeleteIcon}">
<f:facet name="header">
<h:outputText
value="#{lbl['file.list.component.modal.delete']}" />
@@ -281,6 +303,53 @@
</h:form>
</center>
</rich:modalPanel>
+
+<!-- FILE PLANNINGS MODAL -->
+<rich:modalPanel id="FilePlanningsModal" minWidth="400" minHeight="500"
+ zindex="4000">
+ <f:facet name="header">
+ <h:outputText
value="#{lbl['file.list.component.planned.modal.header']}" />
+ </f:facet>
+
+ <rich:panel id="FilePlanningsModalContent"
+ styleClass="modal-layout-list-win" >
+ <h:panelGroup style="overflow:auto; display: block;">
+
+ <!-- CLOSE BUTTON -->
+ <h:panelGroup style="float: right; width: 50%;">
+ <h:form id="CloseButtonForm" style="overflow:
auto;">
+ <!-- CLOSE BUTTON -->
+ <a4j:commandButton
+ id="elvysSettingCloseButton"
+ reRender="FileListComponent,
FilePlanningsModalContent"
+
onclick="Richfaces.hideModalPanel('FilePlanningsModal')"
+ image="/images/icons/close.gif"
+ style="position: absolute;
right: -10px; top: -28px;" />
+ </h:form>
+ </h:panelGroup>
+
+ <!-- FORM -->
+ <h:panelGroup>
+ <h:form>
+ OD - DO, kiosek 1 <br/>
+ OD - DO, kiosek 432 <br/>
+ OD - DO, kiosek 11 <br/>
+ <!-- <a4j:commandButton
+ image="/images/icons/close.gif"
+
reRender="ChooseFileModalContent"
+
onclick="Richfaces.hideModalPanel('FileStatisticsModal')" />
+ -->
+ </h:form>
+ </h:panelGroup>
+ </h:panelGroup>
+ </rich:panel>
+</rich:modalPanel>
+
+
+
+
+
+
</h:panelGroup>
</ui:component>
Modified:
trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml
===================================================================
---
trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml
2010-02-23 09:37:48 UTC (rev 1821)
+++
trunk/server/webServer2/WebContent/secured/components/file/fileListModalComponent.xhtml
2010-02-23 09:39:24 UTC (rev 1822)
@@ -54,7 +54,8 @@
<!-- MODAL WINDOW -->
<rich:modalPanel id="#{modalWinId}" autosized="true"
minHeight="200"
- minWidth="950" zindex="2000">
+ minWidth="950"
+ zindex="2000">
<f:facet name="header">
<h:outputText value="#{modalWinHeader}" />
</f:facet>
@@ -64,8 +65,8 @@
<h:panelGroup style="overflow:auto; display: block;">
<!-- CLOSE BUTTON -->
- <h:panelGroup id="layoutInfos" style="float: right;
width: 50%;">
- <h:form id="listOfLayoutsForm" style="overflow:
auto;">
+ <h:panelGroup style="float: right; width: 50%;">
+ <h:form id="CloseButtonForm" style="overflow:
auto;">
<!-- CLOSE BUTTON -->
<a4j:commandButton
id="elvysSettingCloseButton"
Modified:
trunk/server/webServer2/WebContent/styles/components/file/fileListComponent.css
===================================================================
---
trunk/server/webServer2/WebContent/styles/components/file/fileListComponent.css
2010-02-23 09:37:48 UTC (rev 1821)
+++
trunk/server/webServer2/WebContent/styles/components/file/fileListComponent.css
2010-02-23 09:39:24 UTC (rev 1822)
@@ -8,7 +8,16 @@
padding-left: 10px;
}
+.existing-plannings-not-link {
+ padding-left: 5px;
+ display: block;
+}
+.existing-plannings-link {
+ padding-left: 5px;
+ display: block;
+}
+
.file-list-area-all {
}
Other related posts:
- » [elvystrac] r1822 - file list slightly changed - elvys
