Merge pull request #29 from zanata/FilterStatesUI

Remove 'has error' filter out of 'complete' filtering option
zanata · Jul 8, 2013 · c65bb7c · c65bb7c
2 parents f84710e + 71737c4
commit c65bb7c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
@@ -206,9 +206,9 @@ public void onFilterOptionsChanged(ValueChangeEvent<Boolean> event)
 
    public void toggleCompleteChk()
    {
-      if(translatedChk.getValue() == approvedChk.getValue() && approvedChk.getValue() == hasErrorChk.getValue())
+      if(translatedChk.getValue() == approvedChk.getValue())
       {
-         if(hasErrorChk.getValue() == true)
+         if(approvedChk.getValue() == true)
          {
             completeChk.setValue(true);
          } 
@@ -258,7 +258,6 @@ public void onCompleteChkChanged(ValueChangeEvent<Boolean> event)
    {
       translatedChk.setValue(event.getValue());
       approvedChk.setValue(event.getValue());
-      hasErrorChk.setValue(event.getValue());
       onFilterOptionsChanged(event);
    }
 
@@ -270,5 +269,6 @@ public void setOptionsState(ConfigurationState state)
       untranslatedChk.setValue(state.isFilterByUntranslated());
       approvedChk.setValue(state.isFilterByApproved());
       rejectedChk.setValue(state.isFilterByRejected());
+      hasErrorChk.setValue(state.isFilterByHasError());
    }
 }
diff --git a/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml b/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
@@ -43,8 +43,12 @@
 
         .hasError {
             border-left:3px solid #FF4500;
+            padding-right:5px;
+            opacity:0.6;
+            transition: .3s;
+            display:inline !important;
         }
-        
+
 		.filterListToggle {
 			font-size:16px;
 			cursor:pointer;
@@ -109,7 +113,7 @@
 			-moz-transition: .3s;
 		}
 
-		.filterList li span:hover {
+		.filterList li span:hover, .hasError:hover {
 			background-color: #fff;
 			opacity: 1;
 		}
@@ -166,11 +170,12 @@
 					<li>
 						<g:CheckBox ui:field="approvedChk" styleName="{style.approved} {style.checkbox}"><ui:msg>Approved</ui:msg></g:CheckBox>
 					</li>
-					<li>	
-						<g:CheckBox ui:field="hasErrorChk" styleName="{style.hasError} {style.checkbox}"><ui:msg>Has warning</ui:msg></g:CheckBox>
-					</li>
 				</ul>
 			</li>
+
+			<li class="{style.drop-down}">	
+				<g:CheckBox ui:field="hasErrorChk" styleName="{style.hasError} {style.checkbox}"><ui:msg>Has warning</ui:msg></g:CheckBox>
+			</li>
 		</ul>
 	</g:HTMLPanel>
 </ui:UiBinder>