Moved dir /img to /resources/org/zanata/webtrans/images/public-img an…

…d update references, include Glossary option under administration menu

server/zanata-war/pom.xml

@@ -41,7 +41,6 @@
 				<directory>src/main/resources</directory>
 				<filtering>true</filtering>
 			</resource>
-
 		</resources>
 
 		<plugins>
@@ -205,6 +204,12 @@
 									<directory>src/main/webapp-jboss</directory>
 									<filtering>true</filtering>
 								</resource>
+								<resource>
+                                    <directory>src/main/resources/org/zanata/webtrans/images</directory>
+                                    <includes>
+                                        <include>public-img/**</include>
+                                    </includes>
+                                </resource>
 							</webResources>
 						</configuration>
 					</plugin>
@@ -472,6 +477,12 @@
 									<directory>src/main/webapp-jboss</directory>
 									<filtering>true</filtering>
 								</resource>
+								<resource>
+                                    <directory>src/main/resources/org/zanata/webtrans/images</directory>
+                                    <includes>
+                                        <include>public-img/**</include>
+                                    </includes>
+                                </resource>
 							</webResources>
 						</configuration>
 					</plugin>

server/zanata-war/src/main/resources/messages.properties

@@ -151,6 +151,7 @@ jsf.FirstExternalLoginMessage=Please verify the email address below and click Sa
 jsf.ForgotYourPassword=Forgot your password?
 jsf.FoundResultsizeProjectsMatchingQuerySearchquery=Found #{projectSearch.resultSize} Projects matching query '#{projectSearch.searchQuery}'
 jsf.GenerateProjectConfig=Generate project configuration file (zanata.xml)
+jsf.Glossary=Glossary
 jsf.Help=Help
 jsf.HelpUrl=Help URL
 jsf.HelpUrlToolTip=The help URL for the server (shown on welcome page and every page's header)

server/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml

@@ -15,7 +15,7 @@
             <s:validateAll>
                 <ui:insert/>
             </s:validateAll>
-            <h:graphicImage value="/img/error.gif" rendered="#{invalid}" styleClass="errors"/>
+            <h:graphicImage value="/public-img/error.gif" rendered="#{invalid}" styleClass="errors"/>
             <s:message styleClass="errors"/>
         </span>
 

server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml

@@ -10,16 +10,16 @@
 	<ul class="ui-tabs-nav">
 		<li id="tab_home" class="ui-tabs-nav-issues"><s:link
 			id="home" view="/home.xhtml" propagation="none">
-			<span><img src="#{request.contextPath}/img/silk/home.png" />#{messages['jsf.Home']}</span>
+			<span><img src="#{request.contextPath}/public-img/silk/home.png" />#{messages['jsf.Home']}</span>
 		</s:link> 
 		</li>
 		<li id="tab_projects" class="ui-tabs-nav-issues"><s:link
 			id="Projects" view="/project/home.xhtml" propagation="none">
-			<span><img src="#{request.contextPath}/img/silk/photos.png" />#{messages['jsf.Projects']}</span>
+			<span><img src="#{request.contextPath}/public-img/silk/photos.png" />#{messages['jsf.Projects']}</span>
 		</s:link> </li>
 		<li id="tab_tribes"><s:link id="Languages"
 			view="/language/home.xhtml" propagation="none">
-			<span><img src="#{request.contextPath}/img/silk/world.png" />#{messages['jsf.Languages']}</span>
+			<span><img src="#{request.contextPath}/public-img/silk/world.png" />#{messages['jsf.Languages']}</span>
 		</s:link> <s:div id="tribesTabDiv">
 			<s:fragment rendered="#{memberLanguage.size != 0}">
 				<rich:jQuery selector="#tab_tribes"
@@ -38,7 +38,7 @@
 		<s:fragment rendered="#{s:hasRole('admin')}">
 			<li id="tab_admin" class="ui-tabs-nav-issues"><s:link
 				id="Administration" view="/admin/home.xhtml" propagation="none">
-				<span><img src="#{request.contextPath}/img/silk/wrench.png" />#{messages['jsf.Administration']}
+				<span><img src="#{request.contextPath}/public-img/silk/wrench.png" />#{messages['jsf.Administration']}
 				↓</span>
 			</s:link>
 			<ul>
@@ -54,18 +54,27 @@
 					propagation="none">#{messages['jsf.ManageLanguage']}</s:link></li>
 				<li id="Admin_Manage_search"><s:link id="Admin_Manage_search_a"
 					view="/admin/search.xhtml" propagation="none">#{messages['jsf.ManageSearch']}</s:link></li>
+
+				<li id="tab_glossary">
+                  <s:link id="Glossary" view="/glossary/view.xhtml" propagation="none">
+                    <span>
+                        <img src="#{request.contextPath}/public-img/crystal_project/_16x16/mimetypes/templates.png" />#{messages['jsf.Glossary']}
+                    </span>
+                  </s:link>
+                </li>
+
 			</ul>
 			</li>
 		</s:fragment>
 		<s:fragment rendered="#{identity.loggedIn}">
 			<li id="tab_profile"><s:link id="MyProfile"
 				view="/profile/view.xhtml" propagation="none">
-				<span><img src="#{request.contextPath}/img/silk/user.png" />#{messages['jsf.MyProfile']}</span>
+				<span><img src="#{request.contextPath}/public-img/silk/user.png" />#{messages['jsf.MyProfile']}</span>
 			</s:link></li>
 		</s:fragment>
 		<li id="tab_help" class="ui-tabs-nav-issues"><s:link
 			id="help" view="/help/view.xhtml" propagation="none">
-			<span><img src="#{request.contextPath}/img/silk/help.png" />#{messages['jsf.Help']}</span>
+			<span><img src="#{request.contextPath}/public-img/silk/help.png" />#{messages['jsf.Help']}</span>
 		</s:link> 
 		</li>
 

server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml

@@ -19,7 +19,7 @@
                          valueChangeListener="#{projectHome.verifySlugAvailable}">
               <a4j:support event="onblur" reRender="slugField" ajaxSingle="true"/>
             </h:inputText>
-            <h:graphicImage id="slugHelp" value="/img/msginfo.png" styleClass="input_help">
+            <h:graphicImage id="slugHelp" value="/public-img/msginfo.png" styleClass="input_help">
 	        <rich:toolTip>
 	          <em><code>#{messages['jsf.ProjectIdExample']}</code></em>
 	        </rich:toolTip>

server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

@@ -14,7 +14,7 @@
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 		<title>#{messages['jsf.ZanataMainTitle']}</title>
 		<link rel="shortcut icon"
-		  href="#{request.contextPath}/img/favicon.ico" type="image/x-icon" />
+		  href="#{request.contextPath}/public-img/favicon.ico" type="image/x-icon" />
 		<a:loadStyle src="/stylesheet/reset-fonts-grids.css" />
 		<a:loadStyle src="/stylesheet/base-min.css" />
 		<a:loadStyle src="/stylesheet/theme.css" />
@@ -29,7 +29,7 @@
 			<div id="banner">
         		<div id="headerlogo">
 					<s:link view="/home.xhtml" propagation="none">
-						<img src="#{requestContextPath}/img/logo.png" alt="#{messages['jsf.ZanataMainDescription']}" />
+						<img src="#{requestContextPath}/public-img/logo.png" alt="#{messages['jsf.ZanataMainDescription']}" />
 					</s:link>
 				</div>
         		<div id="header_top_right">
@@ -51,7 +51,7 @@
 				<div id="loading_top_right">
 					<a:status>
 					<f:facet name="start">
-					<h:graphicImage value="/img/loading.gif" />
+					<h:graphicImage value="/public-img/loading.gif" />
 					</f:facet>
 					</a:status>
 				</div>

server/zanata-war/src/main/webapp/account/register.xhtml

@@ -21,7 +21,7 @@
                       value="#{register.person.name}">
                <a4j:support event="onblur" reRender="nameField" ajaxSingle="true"/>
             </h:inputText>
-            <h:graphicImage id="nameHelp" value="../img/msginfo.png" styleClass="input_help">
+            <h:graphicImage id="nameHelp" value="../public-img/msginfo.png" styleClass="input_help">
               <rich:toolTip>
                 #{messages['jsf.NameToolTip']}
               </rich:toolTip>
@@ -34,7 +34,7 @@
                       value="#{register.person.email}">
                <a4j:support event="onblur" reRender="emailField" ajaxSingle="true"/>
             </h:inputText>
-            <h:graphicImage id="emailHelp" value="../img/msginfo.png" styleClass="input_help">
+            <h:graphicImage id="emailHelp" value="../public-img/msginfo.png" styleClass="input_help">
               <rich:toolTip>
                 #{messages['jsf.EmailToolTip']}
               </rich:toolTip>
@@ -47,7 +47,7 @@
                       value="#{register.username}">
                <a4j:support event="onblur" reRender="usernameField" ajaxSingle="true"/>
             </h:inputText>
-            <h:graphicImage id="usernameHelp" value="../img/msginfo.png" styleClass="input_help">
+            <h:graphicImage id="usernameHelp" value="../public-img/msginfo.png" styleClass="input_help">
               <rich:toolTip>
                 #{messages['jsf.UsernameToolTip']}
               </rich:toolTip>
@@ -98,7 +98,7 @@
       </f:facet>
       <f:facet name="controls">
         <h:panelGroup>
-          <h:graphicImage value="../img/close.gif" styleClass="hidelink" id="hideTermsLink"/>
+          <h:graphicImage value="../public-img/close.gif" styleClass="hidelink" id="hideTermsLink"/>
           <rich:componentControl for="termsOfUse" attachTo="hideTermsLink" operation="hide" event="onclick"/>
         </h:panelGroup>
       </f:facet>

server/zanata-war/src/main/webapp/admin/server_configuration.xhtml

@@ -21,7 +21,7 @@
               <h:inputText id="url" value="#{serverConfigurationBean.serverUrl}">
                 <a4j:support event="onblur" reRender="urlField" ajaxSingle="false"/>
               </h:inputText>
-              <h:graphicImage id="urlHelp" value="../img/msginfo.png" styleClass="input_help">
+              <h:graphicImage id="urlHelp" value="../public-img/msginfo.png" styleClass="input_help">
                 <rich:toolTip>
                   #{messages['jsf.UrlToolTip']}
                   <br/>
@@ -35,7 +35,7 @@
               <h:inputText id="url" value="#{serverConfigurationBean.registerUrl}">
                 <a4j:support event="onblur" reRender="registerField" ajaxSingle="false"/>
               </h:inputText>
-              <h:graphicImage id="urlHelp" value="../img/msginfo.png" styleClass="input_help">
+              <h:graphicImage id="urlHelp" value="../public-img/msginfo.png" styleClass="input_help">
                 <rich:toolTip>
                   #{messages['jsf.RegisterUrlToolTip']}
                   <br/>
@@ -49,7 +49,7 @@
               <h:inputText id="url" value="#{serverConfigurationBean.emailDomain}">
                 <a4j:support event="onblur" reRender="emailDomainField" ajaxSingle="false"/>
               </h:inputText>
-              <h:graphicImage id="urlHelp" value="../img/msginfo.png" styleClass="input_help">
+              <h:graphicImage id="urlHelp" value="../public-img/msginfo.png" styleClass="input_help">
                 <rich:toolTip>
                   #{messages['jsf.EmailDomainNameToolTip']}
                   <br/>
@@ -63,7 +63,7 @@
               <h:inputText id="url" value="#{serverConfigurationBean.adminEmail}">
                 <a4j:support event="onblur" reRender="adminEmailField" ajaxSingle="false"/>
               </h:inputText>
-              <h:graphicImage id="urlHelp" value="../img/msginfo.png" styleClass="input_help">
+              <h:graphicImage id="urlHelp" value="../public-img/msginfo.png" styleClass="input_help">
                 <rich:toolTip>
                   #{messages['jsf.EmailToolTip']}
                   <br/>

server/zanata-war/src/main/webapp/profile/edit.xhtml

@@ -25,7 +25,7 @@
               <h:inputText id="name" value="#{profileAction.name}" required="true" >
                 <a4j:support event="onblur" reRender="nameField" ajaxSingle="true"/>
               </h:inputText>
-              <h:graphicImage id="nameHelp" value="../img/msginfo.png" styleClass="input_help">
+              <h:graphicImage id="nameHelp" value="../public-img/msginfo.png" styleClass="input_help">
                 <rich:toolTip>
                   #{messages['jsf.NameToolTip']}
                 </rich:toolTip>
@@ -36,7 +36,7 @@
               <h:inputText id="email" value="#{profileAction.email}" required="true" >
                   <a4j:support event="onblur" reRender="emailField" />
               </h:inputText>
-	       <h:graphicImage id="usernameHelp" value="../img/msginfo.png" styleClass="input_help">
+	       <h:graphicImage id="usernameHelp" value="../public-img/msginfo.png" styleClass="input_help">
                 <rich:toolTip>
                   #{messages['jsf.EmailToolTip']}
                 </rich:toolTip>

server/zanata-war/src/main/webapp/stylesheet/tabs.css

@@ -103,8 +103,6 @@
 }
 .ui-tabs-nav a, .ui-tabs-nav a span {
     display: block;
-
-    /*background: transparent url(../img/tab_grey.png) no-repeat;*/
 }
 .ui-tabs-nav li a {
     margin: 1px 0 0; /* position: relative makes opacity fail for disabled tab in IE */
@@ -187,7 +185,7 @@
 }
 .ui-tabs-loading em {
     padding: 0 0 0 20px;
-    background: url(../img/loading.gif) no-repeat 0 50%;
+    background: url(../public-img/loading.gif) no-repeat 0 50%;
 }
 
 /* Additional IE specific bug fixes... */
@@ -280,4 +278,4 @@
 .menu ul{ margin-left:10px; height:40px; line-height:40px;}
 .menu ul li a:link,.menu ul li a:visited{ display:inline-block; width:150px; text-align:center; /*color:#fff*/}
 .menu ul li a:hover{ /* color:#FFF;*/ text-decoration:none;}
-.menu ul li a:link.selected,.menu ul li a:visited.selected{ background:url(../img/menu_active_bg.png) repeat-x left top; font-weight:bold}
+.menu ul li a:link.selected,.menu ul li a:visited.selected{ background:url(../public-img/menu_active_bg.png) repeat-x left top; font-weight:bold}