Skip to content
This repository has been archived by the owner on Oct 24, 2018. It is now read-only.

Commit

Permalink
Various cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamtriggs committed Sep 30, 2011
1 parent 29a6ced commit 057f127
Show file tree
Hide file tree
Showing 20 changed files with 953 additions and 1,217 deletions.
@@ -1,47 +1,47 @@
<#--
$Id: $
$URL: $
*************************************************************************
Copyright (c) 2002-2009, DuraSpace. All rights reserved
Licensed under the DuraSpace License.
A copy of the DuraSpace License has been included in this
distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
-->
<#-- Browse for sidebar -->
<div class="ds-option-set-wrapper">
<h3 class="ds-option-set-head"><@dspace.message "ui.navigation.browse.header" /></h3>
<div id="Navigation_list_browse" class="ds-option-set">
<ul class="ds-option-list">
<li>
<h4 class="ds-sublist-head"><@dspace.message "ui.navigation.browse.subheader.all" /></h4>
<ul class="ds-simple-list">
<li>
<a href="<@dspace.url relativeUrl="/admin/editcommunities"/>" class=""><@dspace.message "ui.navigation.browse.communitylist" /></a>
</li>
<#list navigation.browseIndices as browseIndex>
<li>
<a href="<@dspace.url relativeUrl="/browse?type=${browseIndex.getName()}" />" class=""><@dspace.message "ui.navigation.browse.${browseIndex.getName()}" /></a>
</li>
</#list>
</ul>
<#if navigation.collectionContainer?has_content>
<#assign container=navigation.getCollectionContainer() />
<h4 class="ds-sublist-head"><@dspace.message "ui.navigation.browse.subheader.collection" /></h4>
<#elseif navigation.communityContainer?has_content>
<#assign container=navigation.getCommunityContainer() />
<h4 class="ds-sublist-head"><@dspace.message "ui.navigation.browse.subheader.community" /></h4>
</#if>
<#if container??>
<ul class="ds-simple-list">
<#list navigation.browseIndices as browseIndex>
<li>
<a href="<@dspace.url relativeUrl="/handle/${container.handle}/browse?type=${browseIndex.getName()}" />" class=""><@dspace.message "ui.navigation.browse.${browseIndex.getName()}" /></a>
</li>
</#list>
</ul>
</#if>
</li>
</ul>
</div>
<#--
$Id: $
$URL: $
*************************************************************************
Copyright (c) 2002-2009, DuraSpace. All rights reserved
Licensed under the DuraSpace License.
A copy of the DuraSpace License has been included in this
distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
-->
<#-- Browse for sidebar -->
<div class="ds-option-set-wrapper">
<h3 class="ds-option-set-head"><@dspace.message "ui.navigation.browse.header" /></h3>
<div id="Navigation_list_browse" class="ds-option-set">
<ul class="ds-option-list">
<li>
<h4 class="ds-sublist-head"><@dspace.message "ui.navigation.browse.subheader.all" /></h4>
<ul class="ds-simple-list">
<li>
<a href="<@dspace.url relativeUrl="/community-list"/>" class=""><@dspace.message "ui.navigation.browse.communitylist" /></a>
</li>
<#list navigation.browseIndices as browseIndex>
<li>
<a href="<@dspace.url relativeUrl="/browse?type=${browseIndex.getName()}" />" class=""><@dspace.message "ui.navigation.browse.${browseIndex.getName()}" /></a>
</li>
</#list>
</ul>
<#if navigation.collectionContainer?has_content>
<#assign container=navigation.getCollectionContainer() />
<h4 class="ds-sublist-head"><@dspace.message "ui.navigation.browse.subheader.collection" /></h4>
<#elseif navigation.communityContainer?has_content>
<#assign container=navigation.getCommunityContainer() />
<h4 class="ds-sublist-head"><@dspace.message "ui.navigation.browse.subheader.community" /></h4>
</#if>
<#if container??>
<ul class="ds-simple-list">
<#list navigation.browseIndices as browseIndex>
<li>
<a href="<@dspace.url relativeUrl="/handle/${container.handle}/browse?type=${browseIndex.getName()}" />" class=""><@dspace.message "ui.navigation.browse.${browseIndex.getName()}" /></a>
</li>
</#list>
</ul>
</#if>
</li>
</ul>
</div>
</div>
@@ -1,46 +1,46 @@
<#--
$Id: $
$URL: $
*************************************************************************
Copyright (c) 2002-2009, DuraSpace. All rights reserved
Licensed under the DuraSpace License.
A copy of the DuraSpace License has been included in this
distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
-->
<#-- My Account box for sidebar -->
<div class="ds-option-set-wrapper">
<h3 class="ds-option-set-head"><@dspace.message "ui.navigation.my.account" /></h3>
<div id="Navigation_list_account" class="ds-option-set">
<#if context.currentUser??>
<ul class="ds-simple-list">
<li>
<a href="<@dspace.url "/logout" />" class=""><@dspace.message "ui.navigation.logout" /></a>
</li>
<li>
<a href="<@dspace.url "/profile" />" class=""><@dspace.message "ui.navigation.profile" /></a>
</li>
<li>
<a href="<@dspace.url "/submissions" />" class=""><@dspace.message "ui.navigation.submissions" /></a>
</li>
<li>
<a href="<@dspace.url "/mydspace" />" class=""><@dspace.message "ui.layout.navbar-default.users" /></a><br/><@dspace.message "ui.layout.navbar-default.users-authorized" />
</li>
<#if isadmin?? && isadmin==true>
<li>
<a href="<@dspace.url "/admin" />" class=""><@dspace.message "ui.navigation.administer" /></a>
</li>
</#if>
</ul>
<#else>
<ul class="ds-simple-list">
<li>
<a href="<@dspace.url "/login" />" class=""><@dspace.message "ui.navigation.login" /></a>
</li>
<li>
<a href="<@dspace.url "/register" />" class=""><@dspace.message "ui.navigation.register" /></a>
</li>
</ul>
</#if>
</div>
<#--
$Id: $
$URL: $
*************************************************************************
Copyright (c) 2002-2009, DuraSpace. All rights reserved
Licensed under the DuraSpace License.
A copy of the DuraSpace License has been included in this
distribution and is available at: http://scm.dspace.org/svn/repo/licenses/LICENSE.txt
-->
<#-- My Account box for sidebar -->
<div class="ds-option-set-wrapper">
<h3 class="ds-option-set-head"><@dspace.message "ui.navigation.my.account" /></h3>
<div id="Navigation_list_account" class="ds-option-set">
<#if context.currentUser??>
<ul class="ds-simple-list">
<li>
<a href="<@dspace.url "/logout" />" class=""><@dspace.message "ui.navigation.logout" /></a>
</li>
<li>
<a href="<@dspace.url "/profile" />" class=""><@dspace.message "ui.navigation.profile" /></a>
</li>
<li>
<a href="<@dspace.url "/submissions" />" class=""><@dspace.message "ui.navigation.submissions" /></a>
</li>
<li>
<a href="<@dspace.url "/mydspace" />" class=""><@dspace.message "ui.layout.navbar-default.users" /></a>
</li>
<#if isadmin?? && isadmin==true>
<li>
<a href="<@dspace.url "/admin" />" class=""><@dspace.message "ui.navigation.administer" /></a>
</li>
</#if>
</ul>
<#else>
<ul class="ds-simple-list">
<li>
<a href="<@dspace.url "/login" />" class=""><@dspace.message "ui.navigation.login" /></a>
</li>
<li>
<a href="<@dspace.url "/register" />" class=""><@dspace.message "ui.navigation.register" /></a>
</li>
</ul>
</#if>
</div>
</div>
17 changes: 7 additions & 10 deletions freemarkerui-webapp/src/main/webapp/error/internal.ftl
@@ -1,10 +1,7 @@
<#import "/includes/dspace.ftl" as dspace />

<h1><@dspace.message "ui.error.internal.title" /></h1>

<p><@dspace.message "ui.error.internal.text1" /></p>

<#include "/includes/components/contact-info.ftl" />

<p align="center"><a href="<@dspace.url ""/>"><@dspace.message "ui.general.gohome" /></a></p>

<#import "/includes/dspace.ftl" as dspace />

<h1><@dspace.message "ui.error.internal.title" /></h1>
<p><@dspace.message "ui.error.internal.text1" /></p>
<#include "/includes/components/contact-info.ftl" />
<p align="center"><a href="<@dspace.url ""/>"><@dspace.message "ui.general.gohome" /></a></p>

@@ -1,10 +1,10 @@
<#import "/includes/dspace.ftl" as dspace />

<page align="center">
<p><a href="<@dspace.url "/feedback" />">
<#if dspacename??>
<#assign showingArgs = [dspacename]>
<h3><@dspace.messageArgs "ui.components.contact-info.details", showingArgs/></h3>
</#if></a></p>
</page>

<#import "/includes/dspace.ftl" as dspace />
<page align="center">
<p><a href="<@dspace.url "/feedback" />">
<#if dspacename??>
<#assign showingArgs = [dspacename]>
<h3><@dspace.messageArgs "ui.components.contact-info.details", showingArgs/></h3>
</#if>
</a></p>
</page>

157 changes: 74 additions & 83 deletions freemarkerui-webapp/src/main/webapp/pages/admin/authorize-advanced.ftl
@@ -1,84 +1,75 @@
<#import "/includes/dspace.ftl" as dspace />

<head><script type="text/javascript" src="<@dspace.url "/utils.js" />"></script></head>

<h1><@dspace.message "ui.dspace-admin.authorize-advanced.advanced" /></h1>

<div><@dspace.message "ui.dspace-admin.authorize-advanced.text" /><a href="<@dspace.url "/help/site-admin.html#advancedpolicies" />" onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.morehelp" /></a></div>

<form method="post" action="<@dspace.url "/admin/authorize" />">

<table class="miscTable" align="center" summary="Advanced policy manager">
<tr>
<%-- <td>Collection:</td> --%>
<th id="t1"><label for ="tcollection"><@dspace.message "ui.dspace-admin.authorize-advanced.col" /></label></th>
<td headers="t1">
<select size="10" name="collection_id" id="tcollection">
<#if collections??>
<#list collections as c>
<option value="${c.getID()}"> ${c.getMetadata("name")}</option>
</#list>
</#if>
</select>
</td>
</tr>

<tr>
<%-- <td>Content Type:</td> --%>
<th id="t2"><label for="tresource_type"><@dspace.message "ui.dspace-admin.authorize-advanced.type" /></label></th>
<td headers="t2">
<select name="resource_type" id="tresource_type">
<#if item?? && bitstream??>
<option value="${item}%>"><@dspace.message "ui.dspace-admin.authorize-advanced.type1" /></option>
<option value="${bitstream}"><@dspace.message "ui.dspace-admin.authorize-advanced.type2 " /></option>
</#if>
</select>
</td>
</tr>

<tr>
<%-- <td>Group:</td> --%>
<th id="t3"><@dspace.message "ui.dspace-admin.general.group-colon" /></th>
<td headers="t3">
<select size="10" name="group_id" id="tgroup_id">
<#if groups??>
<#list groups as grp>
<option value="${grp.getID()}"> ${grp.getName()}</option>
</#list>
</#if>
</select>
</td>
</tr>

<tr>
<%-- <tr><td>Action:</td> --%>
<th id="t4"><label for="taction_id"><@dspace.message "ui.dspace-admin.general.action-colon" /></label></th>
<td headers="t4">
<select name="action_id" id="taction_id">
<#if actiontext??>
<#list actiontext as at>
<option value="${at_index}">${at}</option>
</#list>
</#if>
</select>
</td>
</tr>
</table>

<div align="center">

<table width="70%">
<tr>
<td align="left">
<%-- <input type="submit" name="submit_advanced_add" value="Add Policy"> --%>
<input type="submit" name="submit_advanced_add" value="<@dspace.message "ui.dspace-admin.authorize-advanced.add" />" />
</td>
<td align="right">
<%-- <input type="submit" name="submit_advanced_clear" value="Clear Policies"> (warning: clears all policies for a given set of objects) --%>
<input type="submit" name="submit_advanced_clear" value="<@dspace.message "ui.dspace-admin.authorize-advanced.clear" />"/></td> <td><@dspace.message "ui.dspace-admin.authorize-advanced.warning" />
</td>
</tr>
</table>

</div>
<#import "/includes/dspace.ftl" as dspace />
<head>
<script type="text/javascript" src="<@dspace.url "/utils.js" />"></script>
</head>
<h1><@dspace.message "ui.dspace-admin.authorize-advanced.advanced" /></h1>
<div>
<@dspace.message "ui.dspace-admin.authorize-advanced.text" />
<a href="<@dspace.url "/help/site-admin.html#advancedpolicies" />" onClick="javascript: popup_window(this, 'group_popup'); return false;"><@dspace.message "ui.morehelp" /></a>
</div>
<form method="post" action="<@dspace.url "/admin/authorize" />">
<table class="miscTable" align="center" summary="Advanced policy manager">
<tr>
<th id="t1"><label for ="tcollection"><@dspace.message "ui.dspace-admin.authorize-advanced.col" /></label></th>
<td headers="t1">
<select size="10" name="collection_id" id="tcollection">
<#if collections??>
<#list collections as c>
<option value="${c.getID()}"> ${c.getMetadata("name")}</option>
</#list>
</#if>
</select>
</td>
</tr>
<tr>
<th id="t2"><label for="tresource_type"><@dspace.message "ui.dspace-admin.authorize-advanced.type" /></label></th>
<td headers="t2">
<select name="resource_type" id="tresource_type">
<#if item?? && bitstream??>
<option value="${item}%>"><@dspace.message "ui.dspace-admin.authorize-advanced.type1" /></option>
<option value="${bitstream}"><@dspace.message "ui.dspace-admin.authorize-advanced.type2 " /></option>
</#if>
</select>
</td>
</tr>
<tr>
<th id="t3"><@dspace.message "ui.dspace-admin.general.group-colon" /></th>
<td headers="t3">
<select size="10" name="group_id" id="tgroup_id">
<#if groups??>
<#list groups as grp>
<option value="${grp.getID()}"> ${grp.getName()}</option>
</#list>
</#if>
</select>
</td>
</tr>
<tr>
<th id="t4"><label for="taction_id"><@dspace.message "ui.dspace-admin.general.action-colon" /></label></th>
<td headers="t4">
<select name="action_id" id="taction_id">
<#if actiontext??>
<#list actiontext as at>
<option value="${at_index}">${at}</option>
</#list>
</#if>
</select>
</td>
</tr>
</table>
<div align="center">
<table width="70%">
<tr>
<td align="left">
<input type="submit" name="submit_advanced_add" value="<@dspace.message "ui.dspace-admin.authorize-advanced.add" />" />
</td>
<td align="right">
<input type="submit" name="submit_advanced_clear" value="<@dspace.message "ui.dspace-admin.authorize-advanced.clear" />"/>
</td>
<td>
<@dspace.message "ui.dspace-admin.authorize-advanced.warning" />
</td>
</tr>
</table>
</div>
</form>

0 comments on commit 057f127

Please sign in to comment.