From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Tue, 5 Aug 2014 14:22:19 +0000 (+0200)
Subject: moved urls from portal urls
X-Git-Tag: myslice-1.0~29^2~2
X-Git-Url: http://git.onelab.eu/?p=unfold.git;a=commitdiff_plain;h=6b2b529bd1b93c14b5d2fb9ee8c1aab9dc1300ed

moved urls from portal urls
---

diff --git a/myslice/urls.py b/myslice/urls.py
index fa72cb9f..e64eb598 100644
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -17,7 +17,12 @@ import portal.dashboardview
 import portal.homeview
 import portal.newsview
 
+from portal.about                   import AboutView
 from portal.registrationview        import RegistrationView
+from portal.accountview             import AccountView, account_process
+from portal.institution             import InstitutionView
+
+from portal.supportview             import SupportView
 from portal.contactview             import ContactView
 
 from portal.termsview               import TermsView
@@ -101,13 +106,19 @@ urls = [
     (r'^testbeds/(?P<slicename>[^/]+)/?$', portal.slicetabtestbeds.SliceTabTestbeds.as_view()),
     (r'^measurements/(?P<slicename>[^/]+)/?$', portal.slicetabmeasurements.SliceTabMeasurements.as_view()),
     (r'^experiment/(?P<slicename>[^/]+)/?$', portal.slicetabexperiment.ExperimentView.as_view()),
-    #
+    
+    url(r'^about/?$', AboutView.as_view(), name='about'),
+    
+    url(r'^institution/?$', InstitutionView.as_view(), name='institution'),
     (r'^management/requests/?$', portal.managementtabrequests.ManagementRequestsView.as_view()),
     (r'^management/about/?$', portal.managementtababout.ManagementAboutView.as_view()),
     #
     url(r'^register/?$', RegistrationView.as_view(), name='registration'),
+    url(r'^account/?$', AccountView.as_view(), name='account'),
+    url(r'^account/account_process/?$', account_process),
     url(r'^contact/?$', ContactView.as_view(), name='contact'),
     url(r'^terms/?$', TermsView.as_view(), name='terms'),
+    url(r'^support/?$', SupportView.as_view(), name='support'),
     #
     url(r'^portal/', include('portal.urls')),
 
diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 6fcb05b5..5be52ddd 100644
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -72,6 +72,12 @@ div.breadcrumbs {
     color:gray;
     font-size:10pt;
 }
+div.breadcrumbs a {
+    color:gray;
+}
+div.breadcrumbs a:hover {
+    text-decoration:underline;
+}
 .tab-pane {
     padding-top:15px;
 }
diff --git a/portal/templates/onelab/onelab_account-view.html b/portal/templates/onelab/onelab_account-view.html
index 9941e97c..585e39bd 100644
--- a/portal/templates/onelab/onelab_account-view.html
+++ b/portal/templates/onelab/onelab_account-view.html
@@ -4,7 +4,7 @@
 <div class="row">
 	<div class="col-md-12">
 		 <div class="breadcrumbs">
-		 	 Account &nbsp;>&nbsp; {{ person.email }}
+		 	 Account &nbsp;>&nbsp; <a href="/account">{{ person.email }}</a>
 		 </div>
 	</div>
 </div>
diff --git a/portal/templates/onelab/onelab_registration_view.html b/portal/templates/onelab/onelab_registration_view.html
index 62011060..9e763236 100644
--- a/portal/templates/onelab/onelab_registration_view.html
+++ b/portal/templates/onelab/onelab_registration_view.html
@@ -17,7 +17,7 @@
 	<div class="col-md-12">
 		<ul>
 		  {% for error in errors %}
-		  <li>{{ error }}</li>
+		  <li style="color:white;">{{ error }}</li>
 		  {% endfor %}
 		</ul>
 	</div>
diff --git a/portal/templates/onelab/onelab_widget-topmenu.html b/portal/templates/onelab/onelab_widget-topmenu.html
index a4fae39b..cfb9abbf 100644
--- a/portal/templates/onelab/onelab_widget-topmenu.html
+++ b/portal/templates/onelab/onelab_widget-topmenu.html
@@ -20,9 +20,9 @@
 					</div>
 				</li>
 				{%if 'is_pi'  in pi %}	
-				<li id="nav-institution" class=""><a href="/portal/institution">MANAGEMENT</a></li>
+				<li id="nav-institution" class=""><a href="/institution">MANAGEMENT</a></li>
 				 {%endif%}
-				<li><a href="/portal/support/">SUPPORT</a></li>
+				<li><a href="/support/">SUPPORT</a></li>
 			</ul>
 		</div>
 		{% else %}
@@ -32,12 +32,12 @@
 		<div class="col-sm-5 col-md-5 secondary">
 			<ul>
 				<li><a href="/news">News</a></li>
-				<li><a href="/portal/about">About</a></li>
+				<li><a href="/about">About</a></li>
 				<li><a target="_blank" href="http://new.onelab.eu">Public Website</a></li>
 				<li><a target="_blank" href="http://intranet.onelab.eu">Intranet</a></li>
 			</ul>
 			{% if username %}
-			<div class="account">You are logged in as &nbsp;<a href="/portal/account/">{{ username }}</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</a></div>
+			<div class="account">You are logged in as &nbsp;<a href="/account/">{{ username }}</a> &nbsp;&nbsp;|&nbsp;&nbsp; <a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</a></div>
 			{% endif %}
 		</div>
 	</div>