litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-336 Add the alert icon to the site admin page, if there were warnings at startup.

Browse source
This commit is contained in:
j2blake 2011-09-27 14:38:33 +00:00
parent 06ef9f8127
commit c6f8a50de6
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
View file

@ -33,6 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory; import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener; import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
import edu.cornell.mannlib.vitro.webapp.search.controller.IndexController; import edu.cornell.mannlib.vitro.webapp.search.controller.IndexController;
import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
public class BaseSiteAdminController extends FreemarkerHttpServlet { public class BaseSiteAdminController extends FreemarkerHttpServlet {
@ -58,7 +59,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
Map<String, Object> body = new HashMap<String, Object>(); Map<String, Object> body = new HashMap<String, Object>();
body.put("dataInput", getDataInputData(vreq)); body.put("dataInput", getDataInputData(vreq));
body.put("siteConfig", getSiteConfigUrls(vreq)); body.put("siteConfig", getSiteConfigData(vreq));
body.put("indexCacheRebuild", getIndexCacheRebuildUrls(vreq)); body.put("indexCacheRebuild", getIndexCacheRebuildUrls(vreq));
body.put("ontologyEditor", getOntologyEditorData(vreq)); body.put("ontologyEditor", getOntologyEditorData(vreq));
body.put("dataTools", getDataToolsUrls(vreq)); body.put("dataTools", getDataToolsUrls(vreq));
@ -120,29 +121,30 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
return map; return map;
} }
protected Map<String, String> getSiteConfigUrls(VitroRequest vreq) { protected Map<String, Object> getSiteConfigData(VitroRequest vreq) {
Map<String, String> urls = new HashMap<String, String>(); Map<String, Object> data = new HashMap<String, Object>();
if (PolicyHelper.isAuthorizedForActions(vreq, new ManageUserAccounts())) { if (PolicyHelper.isAuthorizedForActions(vreq, new ManageUserAccounts())) {
urls.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin")); data.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin"));
} }
if (PolicyHelper.isAuthorizedForActions(vreq, new EditSiteInformation())) { if (PolicyHelper.isAuthorizedForActions(vreq, new EditSiteInformation())) {
urls.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean")); data.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean"));
} }
if (PolicyHelper.isAuthorizedForActions(vreq, new ManageMenus())) { if (PolicyHelper.isAuthorizedForActions(vreq, new ManageMenus())) {
urls.put("menuManagement", UrlBuilder.getUrl("/individual", data.put("menuManagement", UrlBuilder.getUrl("/individual",
"uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu", "uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu",
"switchToDisplayModel", "true")); "switchToDisplayModel", "true"));
} }
if (PolicyHelper.isAuthorizedForActions(vreq, new SeeStartupStatus())) { if (PolicyHelper.isAuthorizedForActions(vreq, new SeeStartupStatus())) {
urls.put("startupStatus", UrlBuilder.getUrl("/startupStatus")); data.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
data.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear());
} }
return urls; return data;
} }
protected Map<String, Object> getOntologyEditorData(VitroRequest vreq) { protected Map<String, Object> getOntologyEditorData(VitroRequest vreq) {

7
webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
View file

@ -24,7 +24,12 @@
</#if> </#if>
<#if siteConfig.startupStatus?has_content> <#if siteConfig.startupStatus?has_content>
<li><a href="${siteConfig.startupStatus}">Startup Status</a></li> <li>
<a href="${siteConfig.startupStatus}">Startup Status</a>
<#if siteConfig.startupStatusAlert>
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
</#if>
</li>
</#if> </#if>
</ul> </ul>
</section> </section>