git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 28bd593)
Adicionando as ultimas modificacoes feitas pelo Edelberto
authorLoic Baron <loic.baron@lip6.fr>
Wed, 2 Jul 2014 17:34:51 +0000 (14:34 -0300)
committerLoic Baron <loic.baron@lip6.fr>
Wed, 2 Jul 2014 17:34:51 +0000 (14:34 -0300)
portal/actions.py patch | blob | history
portal/registrationview.py patch | blob | history
portal/templates/base.html patch | blob | history
portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp [deleted file] patch | blob | history
portal/templates/fibre/fibre__widget-login-fed-manager.html patch | blob | history
portal/templates/fibre/fibre__widget-topmenu.html patch | blob | history
portal/templates/fibre/fibre_home-view.html patch | blob | history
portal/templates/fibre/onelab__widget-topmenu.html patch | blob | history
portal/templates/onelab/onelab_base.html patch | blob | history

diff --git a/portal/actions.py b/portal/actions.py
index 17265c6..888d206 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -657,6 +657,7 @@ def create_user(wsgi_request, request):
 # Add the user to the SFA registry
     sfa_create_user(wsgi_request, request)
 
+    '''   
     # LDAP update user userEnabled = True
     try:
         mail = request['email']
@@ -669,7 +670,7 @@ def create_user(wsgi_request, request):
             ldap_modify_user(wsgi_request, request)
     except Exception, e:
         "LDAP create user failed"
-
+    '''
 def create_pending_user(wsgi_request, request, user_detail):
     """
     """
diff --git a/portal/registrationview.py b/portal/registrationview.py
index 4f8ab90..12a720d 100644 (file)
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -133,6 +133,7 @@ class RegistrationView (FreeAccessView, ThemeView):
                 user_request['public_key']  = file_content
                 
             if not errors:
+                '''
                 try:
                     # verify if is a  LDAP 
                     mail = user_detail['email']
@@ -144,8 +145,10 @@ class RegistrationView (FreeAccessView, ThemeView):
                     if dc == 'br' or 'eu':
                         # LDAP insert directly - but with userEnable = FALSE
                         ldap_create_user(wsgi_request, user_request, user_detail)
+                   
                 except Exception, e:
                     print "LDAP: problem em access the LDAP with this credentail" 
+                '''
                 create_pending_user(wsgi_request, user_request, user_detail)
                 self.template_name = 'user_register_complete.html'
             
diff --git a/portal/templates/base.html b/portal/templates/base.html
index decd041..839c955 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -72,7 +72,7 @@ $(document).ready(function() {
 <body>
 {% block container %}
        {% block topmenu %}
-       {% widget "_widget-topmenu.html" %}
+       {% widget "__widget-topmenu.html" %}
        {% endblock topmenu %}
        {% include 'messages-transient.html' %}
        {% block base_content %}
diff --git a/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp b/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp
deleted file mode 100644 (file)
index bdd90af..0000000
Binary files a/portal/templates/fibre/.fibre__widget-login-fed-manager.html.swp and /dev/null differ
diff --git a/portal/templates/fibre/fibre__widget-login-fed-manager.html b/portal/templates/fibre/fibre__widget-login-fed-manager.html
index 5754b35..8114d9e 100644 (file)
--- a/portal/templates/fibre/fibre__widget-login-fed-manager.html
+++ b/portal/templates/fibre/fibre__widget-login-fed-manager.html
@@ -9,11 +9,11 @@
          {% endif %}
        <div class="form-group">
        <label for="fed"></label>
-       <input type="radio" name="br" checked>
+       <input type="radio" name="base" value="br" checked>
                <img src="{{ STATIC_URL }}img/fibre/br.png" alt="Brazil" height="32" width="40" />
-       <input type="radio" name="eu">
+       <input type="radio" name="base" value="eu">
                <img src="{{ STATIC_URL }}img/fibre/eu.png" alt="Europe Union" height="32" width="32" />
-       <input type="radio" name="local">Local User
+       <input type="radio" name="base" value="local">Local User
        </div>
        <div class="form-group">
        <label for="username">Username </label>
diff --git a/portal/templates/fibre/fibre__widget-topmenu.html b/portal/templates/fibre/fibre__widget-topmenu.html
index b916394..b05d887 100644 (file)
--- a/portal/templates/fibre/fibre__widget-topmenu.html
+++ b/portal/templates/fibre/fibre__widget-topmenu.html
@@ -1,19 +1,16 @@
-{% insert_str prelude "js/bootstrap.js" %}
-{% insert_str prelude "css/bootstrap.css" %}
-{% insert_str prelude "css/topmenu.css" %}
-{% insert_str prelude "js/logout.js" %}
+
 <div id="header">
        <div class="wrapper">
                <div class="logo">
-                       <a href="/"><img width="145px" height="75px" src="{{ STATIC_URL }}img/fibre-logo.gif" alt=FIBRE" /></a>
+                       <a href="/"><img src="{{ STATIC_URL }}img/fibre-logo.gif" alt="FIBRE - Future Internet Testbeds Experimentation Between Brazil and Europe" width="150px" height="75px" /></a>
                </div>
                
                <div id="secondary">
                        <ul>
                                <li>News</li>
                                <li><a href="/portal/about">About</a></li>
-                               <li><a target="_blank" href="http://www.fibre-ict.eu">Public Website</a></li>
-                               <li><a target="_blank" href="http://intranet.fibre-ict.eu">Intranet</a></li>
+                               <li><a target="_blank" href="http://www.fibre-ict.eu/">Public Website</a></li>
+                               <li><a target="_blank" href="#">Intranet</a></li>
                        </ul>
                </div>
        </div>
@@ -22,13 +19,29 @@
        <div id="navigation">
                <div class="wrapper">
                <ul>
-                       <li>SLICES</li>
-                       <li><a href="/portal/validate">REQUESTS</a></li>
-                       <li><a href="/portal/institution">INSTITUTION</a></li>
-                       <li><a href="/portal/support/">SUPPORT</a></li>
+                       <li id="nav-account"><a href="/portal/account/">{{ username }}</a></li>
                        <li>|</li>
-                       <li><a href="/portal/account/">{{ username }}</a></li>
-                       <li><a id="logout" style="cursor:pointer;" data-username="{{ username }}">LOGOUT</a></li>
+                       <li id="nav-institution" class=""><a href="/portal/institution">INSTITUTION</a></li>
+                       <li class="slices">
+                               <a class="dropdown-toggle" data-toggle="dropdown" href="#">
+                                       SLICES <span class="caret"></span>
+                       </a>
+                               
+                               <div class="dropdown-menu">
+                                               <ul>
+                                                       <li><a href="/portal/slice_request/">Request Slice</a></li>
+                                                       <li><a href="/slice/ple.upmc.agent3/">ple.upmc.agent3</a></li>
+                                                   <li><a href="/slice/ple.upmc.agent/">ple.upmc.agent</a></li>
+                                                   <li><a href="/slice/ple.upmc.myslicedemo/">ple.upmc.myslicedemo</a></li>
+                                                   <li><a href="/slice/ple.upmc.slicestat/">ple.upmc.slicestat</a></li>
+                                                   <li><a href="/slice/ple.upmc.agent2/">ple.upmc.agent2</a></li>
+                                               </ul>
+                               </div>
+                               </li>
+                       <li id="nav-request"><a href="/portal/validate">REQUESTS</a></li>
+                       <li id="nav-support"><a href="/portal/support/">SUPPORT</a></li>
+                       <li>|</li>
+                       <li id="nav-logout" style="margin-top: 10px;"><a id="logout" style="cursor:pointer;" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> LOGOUT</a></li>
                </ul>
                </div>
        </div>
@@ -40,6 +53,14 @@
 </div>
 <script>
        $(document).ready(function() {
+               $('li.slices').mouseenter(function() {
+                       $('div#menu-slice-list').fadeIn(100);
+               });
+               $('div#menu-slice-list').mouseleave(function(e) {
+                       if (!$('li.slices').is(":hover")) {
+                               $(this).fadeOut(100);
+                       }
+               });
                // var slices = localStorage.getItem('slices');
                // if (slices.length == 0) {
                        // $.post("/rest/user/",{'filters':{'user_hrn':'$user_hrn'}}, function( data ) {
diff --git a/portal/templates/fibre/fibre_home-view.html b/portal/templates/fibre/fibre_home-view.html
index 20129dc..c0f06c3 100644 (file)
--- a/portal/templates/fibre/fibre_home-view.html
+++ b/portal/templates/fibre/fibre_home-view.html
@@ -73,8 +73,9 @@
                                        <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
                                {% else %}
                                <td>
-                                       {% include 'fibre__widget-login-manager.html' %}
-                                       {% include 'fibre__widget-login-ldap-manager.html' %}
+                    {# include 'fibre__widget-login-user.html' #}
+                                       {# include 'fibre__widget-login-ldap-user.html' #}
+                                       {% include 'fibre__widget-login-fed-manager.html' %}
                                {% endif %}
                                </td>
                                <td>
diff --git a/portal/templates/fibre/onelab__widget-topmenu.html b/portal/templates/fibre/onelab__widget-topmenu.html
index da834ac..33d5ba3 100644 (file)
--- a/portal/templates/fibre/onelab__widget-topmenu.html
+++ b/portal/templates/fibre/onelab__widget-topmenu.html
@@ -2,15 +2,15 @@
 <div id="header">
        <div class="wrapper">
                <div class="logo">
-                       <a href="/"><img src="{{ STATIC_URL }}img/onelab-portal.png" alt="OneLab - Future Internet Testbeds" /></a>
+                       <a href="/"><img src="{{ STATIC_URL }}img/fibre-logo.gif" alt="FIBRE" /></a>
                </div>
                
                <div id="secondary">
                        <ul>
                                <li>News</li>
                                <li><a href="/portal/about">About</a></li>
-                               <li><a target="_blank" href="http://www.onelab.eu">Public Website</a></li>
-                               <li><a target="_blank" href="http://intranet.onelab.eu">Intranet</a></li>
+                               <li><a target="_blank" href="http://http://www.fibre-ict.eu/">Public Website</a></li>
+                               <li><a target="_blank" href="http://intranet.fibre-ict.eu">Intranet</a></li>
                        </ul>
                </div>
        </div>
diff --git a/portal/templates/onelab/onelab_base.html b/portal/templates/onelab/onelab_base.html
index 8513951..6419129 100644 (file)
--- a/portal/templates/onelab/onelab_base.html
+++ b/portal/templates/onelab/onelab_base.html
@@ -33,7 +33,7 @@
 <body>
 {% block container %}
        {% block topmenu %}
-       {% include theme|add:"__widget-topmenu.html" %}
+       {% include theme|add:"_widget-topmenu.html" %}
        {% endblock topmenu %}
        {% include 'messages-transient.html' %}
        {% block base_content %}
myslice (django)