Skip to content

Linnea Samila / Moya

Go to a project
Commit f1971e82 by Tuukka Kivilahti
Options

Merge branch 'master' into 'master' 

Master

Modified multiple XHTML files adding style classes to improve table layouts.

See merge request !210
2 parents 002c7791 7497cbf6
Inline Side-by-side
Showing with 318 additions and 161 deletions
code/moya-web/WebContent/actionlog/index.xhtml
......@@ -16,11 +16,9 @@
listener="#{actionLogMessageView.initView}" />
</f:metadata>
<ui:define name="content">
<h:outputStylesheet library="style"
name="templates/insomnia2/css/actionlog.css" />
<h1>#{i18n['actionlog.messagelist.header']}</h1>
<p>#{i18n['actionlog.messagelist.description']}</p>
<h:form id="actionlog">
<h:form id="actionlog" styleClass="moya_datatable4">
<h2>#{i18n['actionlog.create.header']}</h2>
<p:messages />
<h:panelGrid columns="2">
......
code/moya-web/WebContent/bill/billSummary.xhtml
......@@ -9,38 +9,40 @@
<f:event type="preRenderView" listener="#{billListView.initSummaryView}" />
</f:metadata>
<ui:define name="content">
<h:dataTable border="0" id="billSummary" value="#{billListView.billsummary}" var="sumline" styleClass="moya_datatable2">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.name']}" />
</f:facet>
<h:outputText value="#{sumline.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.boughtTotal']}" />
</f:facet>
<h:outputText value="#{sumline.active}">
<f:convertNumber />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.paid']}" />
</f:facet>
<h:outputText value="#{sumline.paid}">
<f:convertNumber />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.expired']}" />
</f:facet>
<h:outputText value="#{sumline.expired}">
<f:convertNumber />
</h:outputText>
</h:column>
</h:dataTable>
<h:form id="billsummary" styleClass="moya_datatable2">
<h:dataTable border="0" id="billSummary" value="#{billListView.billsummary}" var="sumline" styleClass="moya_datatable2">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.name']}" />
</f:facet>
<h:outputText value="#{sumline.name}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.boughtTotal']}" />
</f:facet>
<h:outputText value="#{sumline.active}">
<f:convertNumber />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.paid']}" />
</f:facet>
<h:outputText value="#{sumline.paid}">
<f:convertNumber />
</h:outputText>
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.expired']}" />
</f:facet>
<h:outputText value="#{sumline.expired}">
<f:convertNumber />
</h:outputText>
</h:column>
</h:dataTable>
</h:form>
</ui:define>
</ui:composition>
</h:body>
......
code/moya-web/WebContent/eventorg/editEvent.xhtml
......@@ -24,7 +24,7 @@
</p:outputPanel>
</h:form>
<h:form id="orgform">
<h:form id="orgform" styleClass="moya_datatable1">
<p:fieldset legend="#{i18n['eventorg.basicDetails']}">
<p:panelGrid columns="3">
<p:outputLabel for="id" value="#{i18n['event.id']}:" />
......@@ -78,7 +78,7 @@
<br /><br /><br /><br /><br />
<h2>#{i18n['event.domains.title']}</h2>
<h:form id="newDomainForm">
<h:form id="newDomainForm" styleClass="moya_datatable2">
<h:inputText value="#{eventorgView.newdomain}" />
<h:commandButton action="#{eventorgView.addDomain()}" value="#{i18n['eventdomain.add']}" />
<h:dataTable var="domain" value="#{eventorgView.eventdomains}">
......@@ -95,7 +95,7 @@
</h:form>
<h2>#{i18n['event.properties.title']}</h2>
<h:form id="propertyListForm">
<h:form id="propertyListForm" styleClass="moya_datatable2">
<h:dataTable var="prop" id="propertyListTable" value="#{eventPropertyView.properties}">
<h:column>
<f:facet name="header">#{i18n['lanEventProperty.key']}</f:facet>
......@@ -123,7 +123,7 @@
</h:dataTable>
</h:form>
<h:form id="propertyCreateForm">
<h:form id="propertyCreateForm" styleClass="moya_datatable1">
<h:selectOneMenu id="propval" value="#{eventPropertyView.createKey}">
<f:selectItems value="#{eventPropertyView.availablePropertyKeys}" />
</h:selectOneMenu>
......@@ -131,7 +131,7 @@
<h:message for="propval" />
</h:form>
<h:form id="propertyEditForm" rendered="#{!empty eventPropertyView.property}" enctype="#{eventPropertyView.property.key.data?'multipart/form-data':''}">
<h:form id="propertyEditForm" rendered="#{!empty eventPropertyView.property}" enctype="#{eventPropertyView.property.key.data?'multipart/form-data':''}" styleClass="moya_datatable2">
<h:panelGrid columns="3">
<h:outputLabel for="key" value="#{i18n['lanEventProperty.key']}" />
<h:outputText value="#{eventPropertyView.property.key}" id="key" />
......@@ -168,10 +168,10 @@
<p:commandButton ajax="false" action="#{eventPropertyView.saveProperty}" value="#{i18n['lanEventProperty.save']}" update=":propertyEditForm,:propertyListForm" />
</h:form>
<h2>#{i18n['event.privateProperties.title']}</h2>
<ui:fragment id="privatePropertyEditor" rendered="#{eventPropertyView.privatePropertyPermission}">
<h2>#{i18n['event.privateProperties.title']}</h2>
<h:form id="privPropList">
<h:form id="privPropList" styleClass="moya_datatable2">
<h:dataTable var="prop" value="#{eventPropertyView.privateProperties}">
<h:column>
<f:facet name="header">#{i18n['lanEventPrivateProperty.key']}</f:facet>
......
code/moya-web/WebContent/foodmanager/listFoodwaves.xhtml
......@@ -12,7 +12,7 @@
<h1>#{i18n['foodWave.list']}</h1>
</ui:define>
<ui:define name="content">
<h:form>
<h:form id="listFoodwaves" styleClass="moya_datatable2">
<p:dataTable styleClass="bordertable" value="#{foodWaveView.foodWaves}" sortBy="#{foodwave.time}" sortOrder="ascending" var="foodwave" editable="true" rowStyleClass="#{not foodwave.isOrderable() ? foodwave.isDelivered() ? 'hidden' : 'closed' : null}">
<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" />
<f:facet name="header">
......@@ -101,7 +101,7 @@
<br />
<br />
<h:form>
<h:form id="listfoodwaves_delivered" styleClass="moya_datatable2">
<p:dataTable styleClass="bordertable" value="#{foodWaveView.foodWaves}" sortBy="#{foodwave.time}" sortOrder="ascending" var="foodwave" editable="true" rowStyleClass="#{not foodwave.isOrderable() ? foodwave.isDelivered() ? 'closed' : 'hidden' : 'hidden'}">
<!-- rowStyleClass="#{foodWave.closed ? 'old' : null} -->
<p:ajax event="rowEdit" listener="#{foodWaveView.onEditFoodWave}" />
......
code/moya-web/WebContent/lectureadmin/lectureParticipants.xhtml
......@@ -13,7 +13,7 @@
<ui:define name="content">
<h:form id="viewlecturesform">
<h:form id="viewlecturesform" styleClass="moya_datatable2">
<p:fieldset rendered="#{lectureReportsView.lectureGroupsVisible}" id="lectureGroups" legend="#{i18n['lecture.selectgroup']}">
<p:dataTable value="#{lectureReportsView.lectureGroups}" var="lectureGroup">
......
code/moya-web/WebContent/lectureadmin/manageLectureGroups.xhtml
......@@ -13,7 +13,7 @@
<ui:define name="content">
<h:form id="managelecturegroups">
<h:form id="managelecturegroups" styleClass="moya_datatable2">
<p:dataTable id="lecturegroups" var="lectureGroup" value="#{lectureGroupView.lectureGroups}">
<p:column headerText="#{i18n['lectureGroup.name']}">
......
code/moya-web/WebContent/lectureadmin/manageParticipants.xhtml
......@@ -18,7 +18,7 @@
<p:commandButton value="#{i18n['no']}" type="button" styleClass="ui-confirmdialog-no" icon="ui-icon-close" />
</p:confirmDialog>
<p:fieldset legend="#{lectureReportsView.currentLecture.name}">
<p:fieldset legend="#{lectureReportsView.currentLecture.name}" styleClass="moya_datatable2">
<p:panelGrid columns="2">
<p:outputLabel value="#{i18n['lecture.description']}" />
<h:outputText value="#{lectureReportsView.currentLecture.description}" />
......@@ -37,10 +37,7 @@
</p:panelGrid>
</p:fieldset>
<br />
<br />
<br />
<br />
<h:form id="manageParticipants">
<h:form id="manageParticipants" styleClass="moya_datatable2">
<p:dataTable id="participants" value="#{lectureReportsView.currentLecture.participants}" var="user">
<p:column>
<h:outputText value="#{user.user.nick}" />
......@@ -69,9 +66,6 @@
</p:dataTable>
</h:form>
<br />
<br />
<br />
<br />
<h:form>
<p:fieldset styleClass="no_print" legend="#{i18n['manageparticipants.addUser']}">
......
code/moya-web/WebContent/lectures/viewLectures.xhtml
......@@ -23,7 +23,7 @@
</p:outputPanel>
<p:fieldset rendered="#{lectureUserView.lectureGroupsVisible}" id="lectureGroups" legend="#{i18n['lecture.selectgroup']}">
<p:dataTable value="#{lectureUserView.lectureGroups}" var="lectureGroup">
<p:dataTable value="#{lectureUserView.lectureGroups}" var="lectureGroup" >
<p:column headerText="#{i18n['lectureGroup.name']}">
<h:outputText value="#{lectureGroup.name}" />
</p:column>
......
code/moya-web/WebContent/license/manageCodes.xhtml
......@@ -12,7 +12,7 @@
<ui:define name="content">
<h:form id="licenseForm">
<h:form id="licenseForm" styleClass="moya_datatable2">
<p:dataTable border="1" id="games" value="#{licenseView.licenses}" var="license">
<p:column>
<f:facet name="header">
......@@ -51,7 +51,7 @@
<br /><br />
<h:form id="editgame" >
<h:form id="editgame" styleClass="moya_datatable6">
<p:panelGrid columns="2">
<f:facet name="header">
......
code/moya-web/WebContent/networkassociation/index.xhtml
......@@ -11,7 +11,7 @@
<f:event type="preRenderView" listener="#{networkAssociationView.initView}" />
</f:metadata>
<ui:define name="content">
<h:form>
<h:form id="networkassociation" styleClass="moya_datatable2">
<p:commandButton style="width: 0px; height: 0px;" value="#{i18n['networkassociation.create_association']}" action="#{networkAssociationView.createAssociation}" update="@form"/>
<p:messages autoUpdate="true" redisplay="false"></p:messages>
<h1>#{i18n['networkassociation.current_associations']}</h1>
......@@ -50,7 +50,7 @@
<p:commandButton value="#{i18n['networkassociation.drop_association']}" action="#{networkAssociationView.dropAssociation(activeAssoc.id)}" update="@form" immediate="true"/>
</p:column>
</p:dataTable>
<br />
<h1>#{i18n['networkassociation.pending_associations']}</h1>
<p:dataTable var="activeAssoc" value="#{networkAssociationView.pendingAssociations}">
<p:column headerText="#{i18n['networkassociation.create_time']}">
......@@ -88,8 +88,10 @@
</p:column>
</p:dataTable>
<br />
<h:panelGrid columns="3">
<h:outputText value="#{i18n['networkassociation.ip_address']}" />
<h:panelGrid columns="3" id="ip_mac_address">
<h:outputText value="#{i18n['networkassociation.ip_address']}"/>
<h:outputText value="#{i18n['networkassociation.mac_address']}" />
<h:outputText value="" />
......
code/moya-web/WebContent/pages/list.xhtml
......@@ -10,37 +10,39 @@
</f:metadata>
<ui:define name="content">
<h:form id="pageslist" styleClass="moya_datatable2">
<h1>#{i18n['sitepagelist.header']}</h1>
<h:dataTable styleClass="bordertable" id="user" value="#{sitePageView.pages}" var="page">
<h:column>
<f:facet name="header">
#
</f:facet>
<h:outputText value="#{page.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['sitepage.name']}" />
</f:facet>
<h:outputText value="#{page.name}" />
</h:column>
<h:column >
<f:facet name="header">
<h:outputText value="#{i18n['sitepage.roles']}" />
</f:facet>
<ul>
<ui:repeat var="r" value="#{page.allowedRoles}">
<li><h:outputText value="#{r.name}" /></li>
</ui:repeat>
</ul>
</h:column>
<h:column>
<h:link outcome="/pages/edit" value="#{i18n['sitepage.edit']}">
<f:param name="id" value="#{page.id}" />
</h:link>
</h:column>
</h:dataTable>
<h:dataTable styleClass="bordertable" id="user" value="#{sitePageView.pages}" var="page">
<h:column>
<f:facet name="header">
#
</f:facet>
<h:outputText value="#{page.id}" />
</h:column>
<h:column>
<f:facet name="header">
<h:outputText value="#{i18n['sitepage.name']}" />
</f:facet>
<h:outputText value="#{page.name}" />
</h:column>
<h:column >
<f:facet name="header">
<h:outputText value="#{i18n['sitepage.roles']}" />
</f:facet>
<ul>
<ui:repeat var="r" value="#{page.allowedRoles}">
<li><h:outputText value="#{r.name}" /></li>
</ui:repeat>
</ul>
</h:column>
<h:column>
<h:link outcome="/pages/edit" value="#{i18n['sitepage.edit']}">
<f:param name="id" value="#{page.id}" />
</h:link>
</h:column>
</h:dataTable>
</h:form>
</ui:define>
</ui:composition>
</h:body>
......
code/moya-web/WebContent/resources/cditools/map/list.xhtml
......@@ -13,7 +13,7 @@
<composite:implementation>
<h:form>
<h:form id="maplist" styleClass="moya_datatable2">
<h:dataTable border="1" id="productListTable" value="#{mapManageView.maps}" var="map">
<h:column>
<f:facet name="header">
......
code/moya-web/WebContent/resources/cditools/orgrole/list.xhtml
......@@ -15,7 +15,7 @@
<composite:implementation>
<h:form id="orgrolelist">
<h:form id="orgrolelist" styleClass="moya_datatable2">
<h:dataTable border="1" id="user" value="#{orgRoleDataView.orgRoles}"
var="orgRole">
<h:column>
......
code/moya-web/WebContent/resources/cditools/products/list.xhtml
......@@ -12,8 +12,8 @@
<composite:implementation>
<h:form>
<h:dataTable border="1" id="product" value="#{productListView.results}" var="product">
<h:form id="product_list" styleClass="moya_datatable2">
<h:dataTable border="1" id="product" value="#{productListView.results}" styleClass="moya_datatable2" var="product">
<h:column>
<f:facet name="header">
<h:outputText value="${i18n['product.name']}" />
......
code/moya-web/WebContent/resources/cditools/reader/backendReader.xhtml
......@@ -22,7 +22,7 @@ xmlns:reader="http://java.sun.com/jsf/composite/cditools/reader"
<composite:implementation>
<h:form id="autopoller">
<h:form id="autopoller" styleClass="moya_datatable2">
<h:panelGroup id="reader_autopoll">
<p:poll rendered="#{readerView.pollingMode}" interval="2" listener="#{cc.attrs.selectaction}" onerror="location.reload();" />
......
code/moya-web/WebContent/resources/cditools/reader/multireaderselect.xhtml
......@@ -10,9 +10,9 @@
<composite:implementation>
<h:form>
<h:form styleClass="moya_datatable2">
Valitut lukijat, valitse "vaihda lukija" poistaaksesi kaikki
<h3>Valitut lukijat, valitse "vaihda lukija" poistaaksesi kaikki </h3>
<p:dataTable border="1" value="#{readerListDataView.selectedReaders}" var="rr">
<p:column>
<f:facet name="header">
......@@ -22,8 +22,8 @@
</p:column>
</p:dataTable>
Valitse uusi / ensimmäinen lukija
<br />
<h3>Valitse uusi / ensimmäinen lukija</h3>
<p:dataTable border="1" id="reader" value="#{readerListDataView.readers}" var="rr">
<p:column>
<f:facet name="header">
......
code/moya-web/WebContent/resources/cditools/role/list.xhtml
......@@ -12,7 +12,7 @@
<composite:implementation>
<h:form id="rolelist" >
<h:form id="rolelist" styleClass="moya_datatable2">
<h:dataTable border="1" id="user" value="#{roleDataView.roles}" var="role">
<h:column>
<f:facet name="header">
......
code/moya-web/WebContent/resources/cditools/user/edit.xhtml
......@@ -15,10 +15,10 @@
<composite:implementation>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<p:panelGrid columns="3" cellpadding="1" columnClasses="topalign,topalign,topalign" styleClass="noBorders">
<p:panelGrid columns="2" columnClasses="topalign,topalign,topalign" styleClass="noBorders user_profile_page">
<h:form id="userform" enctype="multipart/form-data">
<p:fieldset legend="#{i18n['user.image']}">
<p:panelGrid columns="1" cellpadding="1">
<p:panelGrid columns="1" styleClass="user_image">
<ui:fragment rendered="#{not empty userView.selectedUser.id}">
<p:dialog id="chartPanel" for="webcamButton" dynamic="true" widgetVar="webcamDialog">
......@@ -27,6 +27,7 @@
</p:dialog>
<h:outputText rendered="#{empty userView.selectedUser.currentImage}" value="#{i18n['user.noCurrentImage']}" />
<ui:fragment rendered="#{!empty userView.selectedUser.currentImage}">
<img style="width: 150px;" src="#{request.contextPath}/dydata/userimage/#{userView.selectedUser.currentImage.id}.img" alt="image" />
</ui:fragment>
......@@ -34,13 +35,10 @@
<p:commandButton onerror="location.reload(true);" rendered="#{!cc.attrs.camAlwaysOn}" id="webcamButton" value="#{i18n['userimage.webcam']}" onclick="PF('webcamDialog').show()" type="button" />
<br />
<br />
<ui:fragment rendered="#{cc.attrs.camAlwaysOn}">
<p:photoCam widgetVar="pc" listener="#{userView.oncapture}" update="#{cc.attrs.photocamupdate}" />
<p:commandButton type="button" value="Capture" onclick="PF('pc').capture()" onerror="location.reload(true);" update="#{cc.attrs.photocamupdate}" />
</ui:fragment>
&nbsp;
<p:fileUpload id="uploadfile" value="#{userView.image}" mode="simple" required="true" requiredMessage="Required!" invalidSizeMessage="#{i18n['user.imageTooBig']}" sizeLimit="1024" />
<p:message for="uploadfile" />
......@@ -55,24 +53,22 @@
</p:inplace>
<p:message for="login" />
<br />
</ui:fragment>
<br />
<h:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.password']}" for="password" />
<br />
<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}">
<p:password validator="#{userValidator.password}" id="password" value="#{userView.password}" />
</p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="password" />
<br />
<p:outputLabel rendered="#{cc.attrs.creating}" value="#{i18n['user.passwordcheck']}" for="passwordcheck" />
<br />
<p:inplace rendered="#{cc.attrs.creating}" emptyLabel="#{i18n['user.insert']}">
<p:password validator="#{userValidator.password}" id="passwordcheck" value="#{userView.passwordcheck}" />
</p:inplace>
<p:message rendered="#{cc.attrs.creating}" for="passwordcheck" />
<br />
</p:panelGrid>
</p:fieldset>
......@@ -80,7 +76,7 @@
<h:form>
<p:fieldset legend="#{i18n['user.edit']}">
<p:panelGrid columns="3" styleClass="noBorders">
<p:panelGrid columns="3" styleClass="noBorders user_edit">
<p:outputLabel value="#{i18n['user.login']}" />
<h:outputText size="25" value="#{userView.selectedUser.login}" id="login" />
<h:message for="login" />
......@@ -170,25 +166,28 @@
</p:fieldset>
</h:form>
</ui:fragment>
</p:panelGrid>
<p:panelGrid>
<h:form id="userSelectableRoles">
<p:fieldset legend="#{i18n['user.userSelectableRoles']}" rendered="#{userView.showUserSelectableRoles and cc.attrs.showRoles}">
<p:panelGrid columns="2" styleClass="noBorders">
<p:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" value="#{userView.userSelectableRoles}">
<f:selectItems value="#{roleDataView.userSelectableRoles}" var="roleitem" itemLabel="#{roleitem.name}" itemValue="#{roleitem}" />
</p:selectManyCheckbox>
<div>
<h:message rendered="#{roleView.canReadRoles}" for="roles" />
</div>
</p:panelGrid>
<p:commandButton action="#{userView.saveUserSelectableRoles}" value="#{i18n['user.saveUserSelectableRoles']}" />
</p:fieldset>
<p:panelGrid columns="2" styleClass="noBorders">
<p:selectManyCheckbox converter="#{roleConverter}" layout="pageDirection" value="#{userView.userSelectableRoles}">
<f:selectItems value="#{roleDataView.userSelectableRoles}" var="roleitem" itemLabel="#{roleitem.name}" itemValue="#{roleitem}" />
</p:selectManyCheckbox>
<div>
<h:message rendered="#{roleView.canReadRoles}" for="roles" />
</div>
</p:panelGrid>
<p:commandButton action="#{userView.saveUserSelectableRoles}" value="#{i18n['user.saveUserSelectableRoles']}" />
</p:fieldset>
</h:form>
</p:panelGrid>
</composite:implementation>
</html>
code/moya-web/WebContent/resources/cditools/user/eventuserlist.xhtml
......@@ -10,7 +10,7 @@
<p:dataTable styleClass="bordertable" id="usertable" value="#{userSearchView.eventuserModel}" rows="100" paginator="true" lazy="true" var="user">
<p:dataTable styleClass="bordertable moya_datatable4" id="usertable" value="#{userSearchView.eventuserModel}" rows="100" paginator="true" lazy="true" var="user">
<p:column headerText="#{i18n['user.nick']}" sortBy="#{user.nick}">
<h:outputText styleClass="hoverable" value="#{(empty user.nick)?'----':user.nick}" />
......
code/moya-web/WebContent/resources/cditools/user/list.xhtml
......@@ -9,7 +9,7 @@
<composite:implementation>
<h:outputScript library="primefaces" name="jquery/jquery.js" target="head" />
<p:dataTable id="user" value="#{userSearchView.userModel}" rows="100" var="wra" paginator="true" lazy="true">
<p:dataTable id="user" value="#{userSearchView.userModel}" styleClass="moya_datatable4" rows="100" var="wra" paginator="true" lazy="true">
<p:column sortBy="#{wra.user.nick}" headerText="#{i18n['user.nick']}">
<h:outputText value="#{(empty wra.user.nick)?'----':wra.user.nick}" />
......
code/moya-web/WebContent/resources/templates/moyav2/css/print.css
@media print {
header#top { display: none; }
#left-bar { display: none; }
}
\ No newline at end of file
code/moya-web/WebContent/resources/templates/moyav2/css/style.css
......@@ -291,7 +291,8 @@ input, textarea, .ui-inputfield, select {
textarea {
border-radius: 5px;
}
input[type=text] {
input[type=text],
input[type=password]{
border-radius: 5px;
margin: 0 5px 0 0 !important;
min-height: 30px;
......@@ -614,6 +615,13 @@ USER MODE AND LOGIN
text-align: center;
line-height: 100px;
}
.user_profile_page table.user_edit td {
vertical-align: top;
min-height: 40px;
}
.user_profile_page table.user_edit td label {
text-transform: capitalize;
}
/*
......@@ -801,9 +809,6 @@ The Grid For Content
Table Styles
*/
#main table {
width: 100%;
}
#main table.ui-panelgrid {
background: none;
border-bottom: 0;
......@@ -846,7 +851,7 @@ Table Styles
width: 100%;
}
#main .ui-menu {
background: #70cbc3;
background: #263238;
}
#main .ui-menu ul.ui-menu-list li a {
color: #FFF;
......@@ -879,11 +884,43 @@ Table Styles
margin: 0 5px;
}
#advancedSearch {
padding: 25px;
background: #eeE;
margin: 10px 0;
}
/*
TABLE STYLES
*/
#main .useradmin_list table td a {
margin: 0 0 10px 0;
background: #70cbc3;
color: #FFF;
padding: 10px;
display: inline-block;
cursor: pointer;
}
.changePassword table td {
padding: 5px 0;
}
#main #networkassociation\:ip_mac_address tr:first-child td {
border: 0 !important;
font-weight: 800;
}
#main .moya_datatable1 table,
#main .moya_datatable2 table,
#main .moya_datatable3 table,
#main .moya_datatable4 table,
#main .moya_datatable5 table,
#main .moya_datatable6 table{
width: 100%;
}
#main .moya_datatable1 tr,
#main .moya_datatable1 table tr {
margin-bottom: 10px;
......@@ -994,4 +1031,121 @@ TABLE STYLES
#main .moya_datatable3 tfoot td:last-child {
font-weight: 800 !important;
color: #000 !important;
}
#main .moya_datatable4 table table td {
border: 0 !important;
}
#main .moya_datatable4 table thead th {
background: #70cbc3;
color: #FFF;
}
#main .moya_datatable4 table tr {
margin: 5px 0 !important;
padding: 5px 0 !important;
}
#main .moya_datatable4 table td {
padding: 10px !important;
border-bottom: 1px solid #eee !important;
border-right: 1px solid #ccc !important;
}
#main .moya_datatable4 table td:last-child {
border-right: 0 !important;
}
#main .moya_datatable4 table tr:nth-child(even) {
background: #f9f9f9;
}
#main .moya_datatable4 table input {
min-height: 20px !important;
border-radius:3px;
margin: 0 3px !important;
padding: 5px 10px !important;
}
#main .moya_datatable4 table thead th {
padding: 10px !important;
}
#main .moya_datatable4 tfoot td {
border: 0 !important;
color: #000;
font-weight: 300 !important;
padding: 10px !important;
}
#main .moya_datatable4 tfoot td:last-child {
font-weight: 800 !important;
color: #000 !important;
}
#main .moya_datatable4 .ui-paginator {
min-height: 30px;
}
#main .moya_datatable4 .ui-paginator span.ui-icon {
margin: 5px;
height: 16px;
width: 16px;
}
#main .moya_datatable4 .ui-paginator .ui-paginator-page {
margin: 0 5px;
}
#main .moya_datatable4 table td a,
#main .moya_datatable4 table td button {
background: #70cbc3;
color: #FFF;
border: 0;
cursor: pointer;
padding: 7px 10px;
transition: background 0.3s ease-in-out;
}
#main .moya_datatable4 table td a:hover,
#main .moya_datatable4 table td button:hover {
background: #555;
}
#main .moya_datatable6 table table td {
border: 0 !important;
}
#main .moya_datatable6 table thead th {
background: #70cbc3;
color: #FFF;
}
#main .moya_datatable6 table tr {
margin: 5px 0 !important;
padding: 5px 0 !important;
}
#main .moya_datatable6 table td {
padding: 10px !important;
border-bottom: 1px solid #eee !important;
border-right: 1px solid #ccc !important;
}
#main .moya_datatable6 table td:last-child {
border-right: 0 !important;
}
#main .moya_datatable6 table tr:nth-child(even) {
background: #f9f9f9;
}
#main .moya_datatable6 table input {
min-height: 20px !important;
border-radius:3px;
margin: 0 3px !important;
padding: 5px 10px !important;
}
#main .moya_datatable6 table thead th {
padding: 10px !important;
}
#main .moya_datatable6 tfoot td {
border: 0 !important;
color: #000;
font-weight: 300 !important;
padding: 10px !important;
}
#main .moya_datatable6 tfoot td:last-child {
font-weight: 800 !important;
color: #000 !important;
}
#main .moya_datatable6 .ui-widget-header {
color: #FFF;
text-shadow: 0 0 0;
}
#main .moya_datatable2 table td button span {
padding: 7px 10px !important;
font-size: 12px;
}
\ No newline at end of file
code/moya-web/WebContent/resources/templates/moyav2/js/main.js
......@@ -7,11 +7,16 @@ $ = jQuery;
$(document).ready(function() {
$('#open-user-login').click(function() {
$('#not-logged').slideToggle(300);
$(this).toggleClass('active');
$('#not-logged').slideToggle(300);
$(this).toggleClass('active');
});
$('#toggle-navigation').click(function() {
$('#left-bar').slideToggle(300);
});
$('#show_advanced_search').click(function() {
$('#advancedSearch').slideToggle(300);
});
});
\ No newline at end of file
code/moya-web/WebContent/tournaments/admin/index.xhtml
......@@ -12,7 +12,7 @@
<h1>#{i18n['tournaments.admin.title']}</h1>
<p>#{i18n['tournaments.admin.description']}</p>
<h2>#{i18n['tournaments.active_tournaments']}</h2>
<h:form>
<h:form id="tournamentsadmin" styleClass="moya_datatable2">
<p:dataTable value="#{tournamentAdminView.activeTournaments}" var="tournament">
<p:column>
<f:facet name="header">
......
code/moya-web/WebContent/tournaments/index.xhtml
......@@ -11,12 +11,12 @@
</f:metadata>
<ui:define name="content">
<h:form>
<h:form id="tournaments" styleClass="moya_datatable2">
<p:messages autoUpdate="true" redisplay="false"></p:messages>
<h1>#{i18n['tournaments.title']}</h1>
<p>#{i18n['tournaments.description']}</p>
<h2>#{i18n['tournaments.open_tournaments']}</h2>
<p:dataTable value="#{tournamentListView.setupPhaseTournaments}" var="tournament">
<p:dataTable value="#{tournamentListView.setupPhaseTournaments}" var="tournament" styleClass="moya_datatable2">
<p:column style="width:20px">
<p:rowToggler />
......@@ -95,8 +95,9 @@
</h:panelGrid>
</p:rowExpansion>
</p:dataTable>
<p></p>
<h2>#{i18n['tournaments.setup_closed_tournaments']}</h2>
<p:dataTable value="#{tournamentListView.setupClosedPhaseTournaments}" var="tournament">
<p:dataTable value="#{tournamentListView.setupClosedPhaseTournaments}" var="tournament" styleClass="moya_datatable2">>
<p:column style="width:20px">
<p:rowToggler />
</p:column>
......
code/moya-web/WebContent/tournaments/myparticipations.xhtml
......@@ -11,7 +11,7 @@
<ui:define name="content">
<h1>#{i18n['tournament.my_participations']}</h1>
<h:form>
<p:dataTable value="#{tournamentEditParticipationView.ownParticipations}" var="participation">
<p:dataTable value="#{tournamentEditParticipationView.ownParticipations}" var="participation" styleClass="moya_datatable2">>
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.name']}" />
......
code/moya-web/WebContent/user/changePassword.xhtml
......@@ -16,14 +16,14 @@
</ui:define>
<ui:define name="content">
<h:form id="userform">
<h:form id="user_change_password" styleClass="changePassword">
<h:panelGrid columns="2">
<h:outputLabel for="oldPwd" value="#{i18n['user.oldPassword']}:" />
<h:inputSecret id="oldPwd" value="#{passwordView.oldPassword}" />
<h:outputLabel value="#{i18n['user.password']}:" />
<h:inputSecret id="password" value="#{passwordView.password}" />
<h:outputLabel value="#{i18n['user.passwordcheck']}:" />
<h:inputSecret id="passwordcheck" value="#{passwordView.passwordcheck}" />
......
code/moya-web/WebContent/user/gameids.xhtml
......@@ -16,7 +16,7 @@
<h:form>
<p:messages autoUpdate="true" redisplay="false"></p:messages>
<h2>#{i18n['user.game.current_gameids']}</h2>
<p:dataTable value="#{userGameIDView.eventUser.gameIDs}" var="gameid">
<p:dataTable value="#{userGameIDView.eventUser.gameIDs}" var="gameid" styleClass="moya_datatable2">
<p:column>
<f:facet name="header">
<h:outputText value="#{i18n['tournament.game']}" />
......
code/moya-web/WebContent/useradmin/list.xhtml
......@@ -19,25 +19,24 @@
<h1>#{i18n['userlist.header']}</h1>
<h:form id="pageform">
<h:form styleClass="useradmin_list">
<h:panelGrid columns="2">
<h:panelGroup>
<a onclick="$('#advancedSearch').show(); $(this).hide();"><h:outputText value="#{i18n['userlist.showAdvancedSearch']}" /></a>
<a id="show_advanced_search"><h:outputText value="#{i18n['userlist.showAdvancedSearch']}" /></a>
<div id="advancedSearch" style="display: none;">
<h:selectBooleanCheckbox id="placeassoc" value="#{userSearchView.searchQuery.placeAssoc}" />
<h:outputLabel for="placeassoc" value="#{i18n['userlist.placeassoc']}" />
<br />
<h:outputLabel for="saldofilter" value="#{i18n['userlist.saldofilter']}" />
<h:selectOneMenu value="#{userSearchView.searchQuery.accountSaldoCompare}">
<f:selectItems value="#{userSearchView.searchQuery.accountCompareValues}" />
</h:selectOneMenu>
<h:inputText value="#{userSearchView.searchQuery.accountSaldo}">
<f:convertNumber minFractionDigits="0" maxFractionDigits="2" />
</h:inputText>
</h:inputText>
<br /><br />
<!--
<br />
<h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" />
......@@ -45,9 +44,8 @@
value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
</h:inputText>
-->
<br />
<h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" />
<strong><h:outputLabel for="rolefilter" value="#{i18n['userlist.rolefilter']}" /></strong><br />
<h:selectManyCheckbox layout="pageDirection" styleClass="nowrap" id="rolefilter" value="#{userSearchView.searchQuery.filterRoles}" converter="#{roleConverter}">
<f:selectItems value="#{roleDataView.roles}" var="r" itemLabel="#{r.name}" />
</h:selectManyCheckbox>
......@@ -72,7 +70,7 @@
<h:commandButton value="#{i18n['userlist.search']}" action="#{userSearchView.newSearch()}" />
</h:panelGroup>
<h:panelGroup>
<a onclick="$('#pageform\\:usercart').show(); $(this).hide();"><h:outputText value="#{i18n['usercart.showCart']}" /></a>
<a id="show_user_cart" onclick="$('#pageform\\:usercart').slideToggle(300);"><h:outputText value="#{i18n['usercart.showCart']}" /></a>
<p:panelGrid columns="1" id="usercart" styleClass="noborderTable" style="display:none;">
<h:commandButton actionListener="#{userSearchView.addToCart}" value="#{i18n['usercart.addSearchedUsers']}" />
......
code/moya-web/WebContent/useradmin/listCardTemplates.xhtml
......@@ -13,7 +13,7 @@
<f:event type="preRenderView" listener="#{cardView.initCardTemplatelist()}" />
</f:metadata>
<ui:define name="content">
<h:form id="cardTemplates">
<h:form id="cardTemplates" styleClass="moya_datatable2">
<h:dataTable value="#{cardView.cardTemplates}" var="card">
<h:column>
#{card.id}
......
code/moya-web/WebContent/voting/admincompolist.xhtml
......@@ -10,11 +10,11 @@
<f:event type="preRenderView" listener="#{compoView.initAdminListView()}" />
</f:metadata>
<ui:define name="content">
<h:outputStylesheet library="style" name="insomnia2/css/actionlog.css" />
<h:form id="admincompolist" styleClass="moya_datatable2">
<h1>#{i18n['voting.allcompos.header']}</h1>
<p>#{i18n['voting.allcompos.description']}</p>
<h:form>
<p:dataTable styleClass="bordertable" rowClasses="roweven,rowodd" id="compolisttable" value="#{compoView.compos}" var="compo">
<p:column headerText="#{i18n['voting.allcompos.name']}">
<h:outputText value="#{compo.name}" />
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!