diff --git a/pom.xml b/pom.xml index 0567325e9b..05c9915054 100644 --- a/pom.xml +++ b/pom.xml @@ -35,7 +35,7 @@ 2.1.1-SNAPSHOT 2.0.2-SNAPSHOT 2.1.2-SNAPSHOT - 3.3.3.Final + 4.3.0.Final @@ -244,7 +244,17 @@ import - + + + org.richfaces + richfaces-bom + ${richfaces.version} + import + pom + + + + org.jboss.seam bom ${seam.version} @@ -271,14 +281,6 @@ - - org.richfaces - richfaces-bom - 4.2.3.Final - import - pom - - org.apache.solr diff --git a/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java b/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java index e785c59866..472becafad 100644 --- a/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java +++ b/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java @@ -169,13 +169,11 @@ public HLocale getLocale() return localeDAO.findByLocaleId(new LocaleId(localeId)); } - public boolean filterDocumentByName(Object docObject) + public boolean filterDocumentByName(String docName) { - final HDocument document = (HDocument) docObject; - if (this.documentNameFilter != null && this.documentNameFilter.length() > 0) { - return document.getName().toLowerCase().contains(this.documentNameFilter.toLowerCase()); + return docName.toLowerCase().contains(this.documentNameFilter.toLowerCase()); } else { diff --git a/zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java b/zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java index 0a77ed08a3..c4660df368 100644 --- a/zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java +++ b/zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java @@ -102,11 +102,13 @@ public void setProjectSlug(String projectSlug) public String editVersion(String versionSlug) { + // TODO Avoid this type of redirection return "/iteration/edit/" + projectSlug + "/" + versionSlug; } public String sourceDocs(String versionSlug) { - return "/iteration/source_files/" + projectSlug + "/" + versionSlug; + // TODO Avoid this type of redirection + return ""; } } diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml index b404350d7a..4f24b1cfa9 100644 --- a/zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml +++ b/zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml @@ -42,21 +42,21 @@ if( showUsername ) { jQuery('#identityLabel').html( usernameLabel ); - jQuery('#' + usernamefieldSelector).show(); + jQuery(usernamefieldSelector).show(); } else { - jQuery('#' + usernamefieldSelector).hide(); + jQuery(usernamefieldSelector).hide(); } var passwordfieldSelector = "[id='#{rich:clientId('providerPasswordField')}']"; if( showPassword ) { - jQuery('#' + passwordfieldSelector).show(); + jQuery(passwordfieldSelector).show(); } else { - jQuery('#' + passwordfieldSelector).hide(); + jQuery(passwordfieldSelector).hide(); } ${onProviderChange} diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml index 6d7110c162..d1dcc68cfa 100755 --- a/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml +++ b/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml @@ -17,6 +17,7 @@ href="#{request.contextPath}/images/favicon.ico" type="image/x-icon" /> + diff --git a/zanata-war/src/main/webapp/WEB-INF/pages.xml b/zanata-war/src/main/webapp/WEB-INF/pages.xml index aaa44ce1f5..c926895a1d 100644 --- a/zanata-war/src/main/webapp/WEB-INF/pages.xml +++ b/zanata-war/src/main/webapp/WEB-INF/pages.xml @@ -520,6 +520,13 @@ + + + + + + + diff --git a/zanata-war/src/main/webapp/iteration/source_files.xhtml b/zanata-war/src/main/webapp/iteration/source_files.xhtml index 4c3a666504..a5e3459dbc 100644 --- a/zanata-war/src/main/webapp/iteration/source_files.xhtml +++ b/zanata-war/src/main/webapp/iteration/source_files.xhtml @@ -43,16 +43,19 @@ - - - - - - - - - + + + + + + + + + + + + - #{messages['jsf.iteration.files.Path']} #{doc.path} - @@ -74,15 +77,14 @@ - - #{doc.name} - + diff --git a/zanata-war/src/main/webapp/project/home.xhtml b/zanata-war/src/main/webapp/project/home.xhtml index ecc0319464..45d5c08dd9 100644 --- a/zanata-war/src/main/webapp/project/home.xhtml +++ b/zanata-war/src/main/webapp/project/home.xhtml @@ -30,42 +30,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -128,35 +130,38 @@ - - - - - - - - - - - - - +
+ + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + +
diff --git a/zanata-war/src/main/webapp/project/project.xhtml b/zanata-war/src/main/webapp/project/project.xhtml index 884702398c..dc0c092fbd 100644 --- a/zanata-war/src/main/webapp/project/project.xhtml +++ b/zanata-war/src/main/webapp/project/project.xhtml @@ -1,6 +1,7 @@ Documents: #{_version.documents.size} - + #{messages['jsf.TranslateLinks']} - - - - - - - - #{language.localeId.id} - - - - - - - - - - #{language.localeId.id} - - - - - - - - - #{language.localeId.id} - - - - - - - - - - #{language.localeId.id} - - - - + + + + + + + + + + + + #{language.localeId.id} + + + + + + + + + + #{language.localeId.id} + + + + + + + + + #{language.localeId.id} + + + + + + + + + + #{language.localeId.id} + + + + + diff --git a/zanata-war/src/main/webapp/resources/css/jsf-skin.css b/zanata-war/src/main/webapp/resources/css/jsf-skin.css new file mode 100644 index 0000000000..bf64c86fa1 --- /dev/null +++ b/zanata-war/src/main/webapp/resources/css/jsf-skin.css @@ -0,0 +1,133 @@ +/* ====================== Rich Data Table ==========================*/ + +table.rf-dt { + width: 100%; + empty-cells: show; + border:0; + background-color:#EEEEEE; +} + +.rf-dt-shdr th:first-child { + border-top-left-radius: 5px; +} + +.rf-dt-shdr th:last-child { + border-top-right-radius: 5px; + border-right:0; +} +/* Header cell */ +th.rf-dt-shdr-c { + padding: 15px 8px 15px 8px; + text-align: center; + font-size: 13px; + color: #ffffff; + font-family: Arial, Verdana, sans-serif; + white-space: nowrap; + background-color:#461446; + background-image: none; +} + +.rf-dt tbody tr:hover { + background-color: #FFFFFF; +} + +/* Table cell */ +td.rf-dt-c { + padding: 14px; + font-size: 12px; + color: #595959; + font-family: Arial, Verdana, sans-serif; + border-left:0; + border-right:0; +} + +.noBorderTable { + border-width: 0px; + background:none; +} + +.noBorderTable .rich-table-headercell { + border-width: 0px; +} + +.noBorderTable .rich-table-cell { + border-width: 0px; +} + +/* ====================== End Rich Data Table ========================== */ + +/* ====================== Rich Data Scroller =========================== */ +span.rf-ds { + +} + +/* Enabled Buttons */ +a.rf-ds-btn { + background-image: none; + border-radius: 2px; + background-color: transparent; +} + +a.rf-ds-btn:hover { + color: #000000; + background-color: #dcdcdc; +} + +/* Disabled Buttons */ +span.rf-ds-dis { + background-color: transparent; + background-image: none; + border-radius: 2px; +} + +/* Number button */ +a.rf-ds-nmb-btn { + border-top-color: transparent; + background-image: none; +} + +a.rf-ds-nmb-btn:hover { + border-color: transparent; + background-color: transparent; + background-image: none; +} + +/* ====================== End Rich Data Scroller =========================== */ + +/* ====================== Rich Panel =========================== */ +div.rf-p { + border-radius: 3px; + margin-bottom: 10px; + border-width: 1px; + border-style: solid; + padding: 1px; + background-color: #EEE; + border-color: #EEEEEE; +} + +/* Header */ +.rf-p .rf-p-hdr { + background-image: none; + padding: 6px; + font-size:12px; + border-radius: 3px; + text-align: center; + border-style: solid; + border-color: #461446; + background-color: #461446; + color: white; + font-weight: bold; + font-family: Arial, Verdana, sans-serif; +} + +/* Body */ +.rf-p .rf-p-b { + padding: 10px; + font-size: 11px; + color: black; + font-family: Arial, Verdana, sans-serif; + border: 1px solid; + border-color: #EEEEEE; +} + +/* ====================== Rich Data Panel =========================== */ \ No newline at end of file diff --git a/zanata-war/src/main/webapp/resources/css/zanata.css b/zanata-war/src/main/webapp/resources/css/zanata.css index 1071be1c1e..612634f79c 100644 --- a/zanata-war/src/main/webapp/resources/css/zanata.css +++ b/zanata-war/src/main/webapp/resources/css/zanata.css @@ -706,114 +706,6 @@ a.readonly_link,a.readonly_link:visited,a.readonly_link:link { /* ----------------------- JSF components CSS -------------------------*/ -/* Copy of Richfaces Table styles*/ -.rich-table-thead { /*border-bottom: solid 1px silver;*/ -} - -.rich-table-subheader th:first-child { - border-top-left-radius: 5px; -} - -.rich-table-subheader th:last-child { - border-top-right-radius: 5px; - border-right:0; -} - -.rich-table-subheadercell { - padding: 15px 8px 15px 8px; - text-align: center; - font-size: 13px; - color: #ffffff; - font-family: Arial, Verdana, sans-serif; - white-space: nowrap; - background-color:#461446; -} - -.rich-table .rich-table-header { - background-image: none; - padding: 2px 3px; -} - -.rich-table-headercell -{ - border-radius: 5px; - text-align: center; -} - -.rich-table { - width: 100%; - empty-cells: show; - border:0; - background-color:#EEEEEE; -} - -.rich-table tbody tr:hover { - background-color: #FFFFFF; -} - -.rich-table-cell { - padding: 14px; - font-size: 12px; - color: #595959; - font-family: Arial, Verdana, sans-serif; - border-left:0; - border-right:0; -} - -.noBorderTable { - border-width: 0px; - background:none; -} - -.noBorderTable .rich-table-headercell { - border-width: 0px; -} - -.noBorderTable .rich-table-cell { - border-width: 0px; -} - -/* End of Richfaces Table styles */ - - -/* Copy of Richfaces Panel styles*/ -.rich-panel .rich-panel-header { - background-image: none; - padding: 6px; - font-size:12px; -} - -.rich-panel-header { - border-radius: 3px; - text-align: center; - border-style: solid; - border-color: #461446; - background-color: #461446; - font-size: 11px; - color: white; - font-weight: bold; - font-family: Arial, Verdana, sans-serif; -} - -.rich-panel { - border-radius: 3px; - margin-bottom: 10px; - border-width: 1px; - border-style: solid; - padding: 1px; - background-color: #EEE; - border-color: #EEEEEE; -} - -.rich-panel-body { - padding: 10px; - font-size: 11px; - color: black; - font-family: Arial, Verdana, sans-serif; - border: 1px solid; - border-color: #EEEEEE; -} -/* End of Richfaces Panel styles */ /* Copy of Richfaces Simple toggle styles*/ .rich-stglpanel-header { @@ -866,64 +758,6 @@ a.readonly_link,a.readonly_link:visited,a.readonly_link:link { border-color:#461446; } -/* Richfaces Data scroller styles */ -.rich-datascr-button:active { - background: #CCC; - background: -moz-linear-gradient(top, #DDD 0%, white 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #DDD), - color-stop(100%, white) ); - background: -webkit-linear-gradient(top, #DDD 0%, white 100%); - background: -o-linear-gradient(top, #DDD 0%, white 100%); - background: -ms-linear-gradient(top, #DDD 0%, white 100%); - background: linear-gradient(top, #DDD 0%, white 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dddddd', - endColorstr='#ffffff', GradientType=0 ); -} - -.rich-datascr-button-dsbld { - color: silver; - cursor: default; -} - -.rich-datascr-button-dsbld:hover { - cursor: default; -} - -.rich-datascr-button { - border: none; - width: 23px; - cursor: pointer; - text-align: center; - font-size: 14px; - background: none; -} - -.rich-datascr-button:hover { -} - -.rich-datascr-act { - color: #5F5F5F; - border: 0px; - font-family: Arial, Verdana, sans-serif; - font-size: 11px; - font-weight: bold; - text-align: center; - border-radius: 5px; - padding: 3px; -} - -.rich-datascr-inact { - cursor: pointer; - text-align: center; - border: 0px; - border-radius: 5px; - color: #5F5F5F; - font-family: Arial, Verdana, sans-serif; - font-size: 11px; -} - -/* End Richfaces Data scroller styles */ - /* Richfaces Tab panel styles */ .rich-tab-active { background-color: #461446;