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

NIHVIVO-2944 Updated "Expecting Content" message based on login state and whether the user has permission to rebuild the search index.

Browse source
This commit is contained in:
cappadona 2011-07-18 11:55:31 +00:00
parent eb0f71fbc5
commit 9432886cac
3 changed files with 32 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
webapp/web/css/vitro.css
View file

@ -63,7 +63,7 @@
padding: .5em;
margin-bottom: 10px;
}
.rebuildSearchIndex {
.contentNote {
float: right;
padding: .6em;
background: #ffc;
@ -71,12 +71,12 @@
-webkit-border-radius: 6px;
border-radius: 6px;
}
.rebuildSearchIndex h4,
.rebuildSearchIndex p {
.contentNote h4,
.contentNote p {
margin: 0;
padding: 0;
}
.rebuildSearchIndex p {
.contentNote p {
font-size: .8em;
}

23
webapp/web/templates/freemarker/body/partials/classgroups-checkForData.ftl
View file

@ -14,16 +14,23 @@
<#assign noData = false />
</#if>
<#assign noDataNotification>
<span class="rebuildSearchIndex"><h4>Expecting content?</h4> <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p></span>
<#assign noDataNotification>
<#if user.loggedIn>
<#if user.authorizedToRebuildSearchIndex>
<span class="contentNote">
<h4>Expecting content?</h4>
<p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
</span>
</#if>
<#else>
<span class="contentNote">
<p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
</span>
</#if>
<h3>There is currently no content in the system</h3>
<#if user.loggedIn>
<#if user.hasSiteAdminAccess>
<p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
</#if>
<#else>
<p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
<#if user.loggedIn && user.hasSiteAdminAccess>
<p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
</#if>
</#assign>

19
webapp/web/templates/freemarker/body/partials/menupage/menupage-checkForData.ftl
View file

@ -18,15 +18,22 @@
</#if>
<#assign noDataNotification>
<span class="rebuildSearchIndex"><h4>Expecting content?</h4> <p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p></span>
<h3>There is currently no ${page.title} content in the system</h3>
<#if user.loggedIn>
<#if user.hasSiteAdminAccess>
<p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
<#if user.authorizedToRebuildSearchIndex>
<span class="contentNote">
<h4>Expecting content?</h4>
<p>Try <a title="Rebuild the search index for this site" href="${urls.base}/SearchIndex">rebuilding the search index</a>.</p>
</span>
</#if>
<#else>
<p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
<span class="contentNote">
<p>Please <a href="${urls.login}" title="log in to manage this site">log in</a> to manage content.</p>
</span>
</#if>
<h3>There is currently no ${page.title} content in the system</h3>
<#if user.loggedIn && user.hasSiteAdminAccess>
<p>You can <a href="${urls.siteAdmin}" title="Manage content">add content and manage this site</a> from the Site Administration page.</p>
</#if>
<p>You can browse all of the public content currently in the system using the <a href="${urls.index}" title="browse all content">index page</a>.</p>