Commits

Yuri Prezument committed 4426cdd

small changes to layouts

  • Participants
  • Parent commits e0fdcf7

Comments (0)

Files changed (5)

 	<th width="70%">Library: {{lib}}</th>
 	<th width="30%">Owner: {{owner}}</th>
 </tr>
-{% if manager %}
+{% if writer %}
 <tr>
 	<td colspan="2" align="right">
-		<a id="toggle" href="javascript:toggle();">Manage Rights</a>
+		{% if manager %}<a id="toggle" href="javascript:toggle();">Manage Rights</a> | {% endif %}
+		<a href="/repo?lib={{lib}}">Import files from BitBucket</a>
 	</td>
 </tr>
 {% endif %}
 	</form>
 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 	<input type="button" value="Create new file" / onclick="return promptCreateFilename('{{lib}}')" />
-	<br /><br />
-	<a href="/repo?lib={{lib}}">Import files from BitBucket</a>
 </td>
 </tr>
 {% endif %}
            </tr>
 		<tr>
 			<td align="left">
-				<form {% if readonly %}style="display: none;"{%else%}style="display: inline;"{% endif %}>
+				<form {% if readonly %}style="display: none;"{%else%}style="display: inline;"{% endif %}/>
 					<b>Change:</b> <input type="checkbox" id="change" onchange="changePermission()" disabled="disabled"/> 
 				</form>
 				{% if readonly %}&nbsp;{% endif %}
 {% extends "maintemplate.html" %}
 {% block content %}
+<img src="image/logo.png" />
 <h3>Your Libraries:</h3>
 {% if rights %}
 <table border="1" cellpadding="5" cellspacing="1">
         template_values = {'page': 'Libraries',
                            'rights': rights,
                            'user': user,
-                           'log_in_out_url': log_in_out_url
+                           'log_in_out_url': log_in_out_url,
+                           'hidebanner': True
                            }
         path = os.path.join(os.path.dirname(__file__), "libraries.html")
         page = template.render(path, template_values)     

maintemplate.html

 		a:hover {text-decoration:underline;}  /* mouse over link */
 		a:active {text-decoration:underline;}  /* selected link */
 		th {font-size:105%;}
-		div.header {
+		div.banner {
 			float: left;
 		}
-		div.logout {
+		div.menu {
 			float: right;
 		}
 		div.content {
 {% endblock %}
 
 <!-- Header -->
-<div align="right" class="header">
-<a href="/"><img src="/image/logosmall.png" border="0" /></a>
+<div class="banner">
+{% if not hidebanner %}<a href="/"><img src="/image/logosmall.png" border="0" /></a>{% endif %}
 </div>
-<div class="logout">
+<div class="menu">
 {% if user %}
+	<a href="/">View All Libraries</a> | 
+	{% if lib %}<a href="/browse?lib={{lib}}">Browse '{{lib}}'</a> |{% endif %} 
 	Logged in as:
 	<b id="username">{{user.email}}</b> - 
 	<a href="{{log_in_out_url}}">Log out</a>
 	Content
 	{% endblock %}
 {% endif %}
-{% if lib and not nobacklink%}
-<a href="/browse?lib={{lib}}">Back to Library</a>
-{% endif %}
 </div>
 </body>
 </html>