layout and style changes

[myslice.git] / portal / templates / home-view.html

diff --git a/portal/templates/home-view.html b/portal/templates/home-view.html
index ec1f54b..c88902d 100644 (file)
--- a/portal/templates/home-view.html
+++ b/portal/templates/home-view.html
@@ -1,14 +1,8 @@
-{# fine for either layout-unfold1.html (logged in) or layout-unfold2.html (needs a login prompt) #}
-{% extends layout_1_or_2 %}
+{% extends "layout.html" %}
 
-{% block unfold_margin %}
-{% include 'widget-login.html' %}
-{% endblock unfold_margin %}
-
-{% block unfold_main %}
-<!-- xxx ideally only onelab.css but ... xxx -->
+{% block content %}
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
-       <div id="home-dashboard">
+<div id="home-dashboard">
        <ul class="nav nav-tabs">
          <li class="active"><a href="#">USER</a></li>
          <li><a href="#">MANAGER</a></li>
@@ -16,25 +10,54 @@
        <div id="user">
                <table>
                        <tr>
-                               <td>PROFILE</td>
+                               <td>ACCOUNT</td>
                                <td>SLICES</td>
                                <td>SUPPORT</td>
                        </tr>
                        <tr>
-                               <td><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></td>
+                               <td><a href="/portal/account"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a></td>
                                <td><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></td>
-                               <td><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></td>
+                               <td><a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a></td>
                        </tr>
                        <tr>
                                <td>
-                                       <a href="/portal/register">Register</a>
+                                       {% include '_widget-login-user.html' %}
+                               </td>
+                               <td>
+                                       
+                               </td>
+                               <td class="support">
+                                       <div><a href="/portal/contact">Contact</a></div>
+                                       <div><a href="">Documentation</a></div>
                                </td>
                        </tr>
                </table>
        </div>
        <div id="manager">
-               
+               <table>
+                       <tr>
+                               <td>INSTITUTION</td>
+                               <td>SLICES</td>
+                               <td>SUPPORT</td>
+                       </tr>
+                       <tr>
+                               <td><a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a></td>
+                               <td><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></td>
+                               <td><a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a></td>
+                       </tr>
+                       <tr>
+                               <td>
+                                       {% include '_widget-login-manager.html' %}
+                               </td>
+                               <td>
+                                       
+                               </td>
+                               <td class="support">
+                                       <div><a href="/portal/contact">Contact</a></div>
+                                       <div><a href="">Documentation</a></div>
+                               </td>
+                       </tr>
+               </table>
        </div>
 </div>
-
-{% endblock unfold_main %}
+{% endblock %}