Templates: Homeview Dashboard made generic with partial for the specifics
authorLoic Baron <loic.baron@lip6.fr>
Thu, 7 May 2015 15:37:25 +0000 (17:37 +0200)
committerLoic Baron <loic.baron@lip6.fr>
Thu, 7 May 2015 15:37:25 +0000 (17:37 +0200)
portal/templates/_login.html [new file with mode: 0644]
portal/templates/fed4fire/fed4fire_dashboard_links.html [new file with mode: 0644]
portal/templates/fed4fire/fed4fire_home-view.html
portal/templates/fed4fire/fed4fire_jfed_button.html [new file with mode: 0644]
portal/templates/fed4fire/fed4fire_login.html [new file with mode: 0644]
portal/templates/fed4fire/fed4fire_registration_view.html [deleted file]
portal/templates/home-view.html
portal/templates/onelab/onelab_home-view.html
portal/templates/onelab/onelab_registration_view.html [deleted file]

diff --git a/portal/templates/_login.html b/portal/templates/_login.html
new file mode 100644 (file)
index 0000000..3dffebb
--- /dev/null
@@ -0,0 +1,15 @@
+<div class="col-sm-2"></div>
+<div class="col-sm-4 slogan">
+    <h2>
+        Your Easy Access to Computer Networking Testbeds:
+    </h2>
+    <h3>
+        A wide variety of world class testbeds available through your one account
+    </h3>
+</div>
+<div class="col-sm-5 col-sm-offset-1">
+    <div class="row">
+        {% widget '_widget-login-user.html' %}
+    </div>
+</div>
+<div class="col-sm-1"></div>
diff --git a/portal/templates/fed4fire/fed4fire_dashboard_links.html b/portal/templates/fed4fire/fed4fire_dashboard_links.html
new file mode 100644 (file)
index 0000000..925c2b7
--- /dev/null
@@ -0,0 +1,10 @@
+<p>
+    <span class="glyphicon glyphicon-stats"></span> <a target="_blank" href="https://flsmonitor.fed4fire.eu">Testbeds' status</a>
+    </br />
+    <span class="glyphicon glyphicon-stats"></span> <a href="/portal/reputation">Testbeds' reputation</a>
+    
+</p>
+<p>
+    <span class="glyphicon glyphicon-book"></span> <a target="_blank" href="http://doc.fed4fire.eu/">Documentation</a>
+</p>
+
index ba48951..45b4645 100644 (file)
@@ -26,7 +26,7 @@
     <div class="row">
         <div class="col-sm-4">
             <h3>
-                <img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="" />EXPERIMENT
+                <a href="/portal/slice_request/"><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="" />EXPERIMENT</a>
             </h3>
             <div>
                 <span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
              
                 <div id="home-project-tree"><img class="projects-loading" src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
             </div>
-                        
-            <div class="experiment-tools">
-                <h4 title="Some tools do their own slice creation and management.">Experiment now</h4>
-                
-                <p class="jfed">
-                    <button id="start" class="btn btn-primary" type="button" onclick="launchjFed()"><span class="glyphicon glyphicon-cloud"></span> Start jFed</button>
-                </p>
-                <div id='java7Dialog' title="Old Java version detected" >
-                <p>The latest version of jFed is only compatible with Java 8 or higher. We detected that you are using an older version.</p>
-                <p>Please upgrade to Java 8 to get access to the newest version of jFed. Otherwise, you can use jFed 5.3.2, which is Java 7-compatible.</p>
-                </div>
-                
-                <div id='noJavaDialog' title="No Java detected" >
-                <p>jFed requires Java to run. We however couldn't detect a Java installation in your browser.</p>
-                <p>Please install the latest version of Java to continue.</p>
-                </div>
-
-            </div>
+            {% include theme|add:"_jfed_button.html" %}
         </div>
         <div class="col-sm-4">
             <div class="row">
                     <p>
                         <span class="glyphicon glyphicon-envelope"></span> <a href="/portal/contact/">Contact</a>
                     </p>
-                    <p>
-                        <span class="glyphicon glyphicon-stats"></span> <a target="_blank" href="https://flsmonitor.fed4fire.eu">Testbeds' status</a>
-                        </br />
-                        <span class="glyphicon glyphicon-stats"></span> <a href="/portal/reputation">Testbeds' reputation</a>
-                        
-                    </p>
-                    <p>
-                        <span class="glyphicon glyphicon-book"></span> <a target="_blank" href="http://doc.fed4fire.eu/">Documentation</a>
-                    </p>
+                    {% include theme|add:"_dashboard_links.html" %}
                 </div>
             </div>            
         </div>
     </div>
 </div>
 {% else %}
-<div class="container home">
+<div class="container-fluid home">
        <div class="">
-               <div class="col-sm-4 col-sm-offset-1 slogan">
-                       <h1>
-                               Fed4FIRE Portal
-                       </h1>
-                       <h3>
-                               Your easy access to Future Internet Research and Experimentation testbeds belonging to the 
-                               <a target="_blank" href="http://www.fed4fire.eu/">Fed4FIRE</a> federation.
-                       </h3>
-                       <br />
-                       <h4>
-                                <a href='http://doc.fed4fire.eu'>Want to learn more?</a>
-                       </h4>
-               </div>
-               <div class="col-sm-4 col-sm-offset-1" style="width:400px; top:16px; float:left;">
-                       <div class="row">
-                               {% widget '_widget-login-user.html' %}
-                       </div>
-               </div>
+        {% include theme|add:"_login.html" %}
        </div>
 </div>
 
diff --git a/portal/templates/fed4fire/fed4fire_jfed_button.html b/portal/templates/fed4fire/fed4fire_jfed_button.html
new file mode 100644 (file)
index 0000000..92729de
--- /dev/null
@@ -0,0 +1,16 @@
+<div class="experiment-tools">
+    <h4 title="Some tools do their own slice creation and management.">Experiment now</h4>
+    <p class="jfed">
+        <button id="start" class="btn btn-primary" type="button" onclick="launchjFed()"><span class="glyphicon glyphicon-cloud"></span> Start jFed</button>
+    </p>
+    <div id='java7Dialog' title="Old Java version detected" >
+    <p>The latest version of jFed is only compatible with Java 8 or higher. We detected that you are using an older version.</p>
+    <p>Please upgrade to Java 8 to get access to the newest version of jFed. Otherwise, you can use jFed 5.3.2, which is Java 7-compatible.</p>
+    </div>
+    <div id='noJavaDialog' title="No Java detected" >
+    <p>jFed requires Java to run. We however couldn't detect a Java installation in your browser.</p>
+    <p>Please install the latest version of Java to continue.</p>
+    </div>
+
+</div>
+
diff --git a/portal/templates/fed4fire/fed4fire_login.html b/portal/templates/fed4fire/fed4fire_login.html
new file mode 100644 (file)
index 0000000..0ec31a8
--- /dev/null
@@ -0,0 +1,18 @@
+<div class="col-sm-4 col-sm-offset-1 slogan">
+       <h1>
+               Fed4FIRE Portal
+       </h1>
+       <h3>
+               Your easy access to Future Internet Research and Experimentation testbeds belonging to the 
+               <a target="_blank" href="http://www.fed4fire.eu/">Fed4FIRE</a> federation.
+       </h3>
+       <br />
+       <h4>
+                <a href='http://doc.fed4fire.eu'>Want to learn more?</a>
+       </h4>
+</div>
+<div class="col-sm-4 col-sm-offset-1" style="width:400px; top:16px; float:left;">
+       <div class="row">
+               {% widget '_widget-login-user.html' %}
+       </div>
+</div>
diff --git a/portal/templates/fed4fire/fed4fire_registration_view.html b/portal/templates/fed4fire/fed4fire_registration_view.html
deleted file mode 100644 (file)
index ed24384..0000000
+++ /dev/null
@@ -1,202 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}        
-
-<div class="row">
-       <div class="col-md-12">
-       <h1><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Registration" />User sign-up</h1>
-       </div>
-</div>
-<div class="row">
-       <div class="col-md-12">
-               <p><strong>Questions? <a href="/contact" >Contact us.</a></strong></p>
-  </div>
-</div>
-{% if errors %}
-<div class="row">
-       <div class="col-md-12">
-               <ul class="error">
-                 {% for error in errors %}
-                 <li>{{ error | safe }}</li>
-                 {% endfor %}
-               </ul>
-       </div>
-</div>
-{% endif %}
-<form action="/register" class="cmxform form-horizontal" method="post" enctype="multipart/form-data">
-<div class="row">
-       <div class="col-md-12">
-                       <p>
-                               {% csrf_token %}
-                               <label for="authority_hrn" class="control-label">Organization</label>
-                       </p>
-                       <p>
-                               <select id="org_name" name="org_name" class="form-control" style="width:590px" value="{{ organization }}" 
-                               title="Choose your organization (company/university) from the list that apears when you click in the field and start to type.
-                                Use the arrow keys to scroll through the list; type part of the name to narrow down the list. We will send an email to 
-                                the managers that we have on record for your organization, asking them to validate your sign-up request." required>
-                    <option value="">select an organization</option>
-                {% if authorities %}
-                    {% for authority in authorities %}
-                        {% if authority.name %}
-                            <option value="{{ authority.authority_hrn }}">{{authority.name}}</option>
-                        {% else %}
-                            <option value="{{ authority.authority_hrn }}">{{authority.authority_hrn}}</option>
-                        {% endif %}
-                    {% endfor %}
-                {% else %}
-                    <option value:"">No authority found !!!</option>
-                {% endif %}
-                </select>
-            </p>
-            {% include theme|add:"_authority_notListed.html" %}
-               </p> 
-       </div>
-</div>
-
-<div class="row">
-       <div class="col-md-6">
-        <p>
-                       <label for="firstname" class="control-label">Personal information</label>
-               </p>
-        <p>
-                       <input type="text" name="firstname" class="form-control" style="width:350px" minlength="2" value="{{ first_name }}" placeholder="First name" required />
-           </p>
-        <p>
-                       <input type="text" name="lastname" size="25" class="form-control" style="width:350px" minlength="2" value="{{ last_name }}" placeholder="Last name" required />
-           </p>
-        <p>
-               <input type="email" name="email" size="25"  class="form-control" style="width:350px" value="{{ email }}" 
-                       title="Your e-mail address will be your identifier for logging in. We contact you to verify your account and then, occasionally, for important issues."
-                       placeholder="Email" required />
-               </p>
-       </div>  
-
-       <div class="col-md-6">
-        <p>
-             <label for="password" class="control-label">Authentication</label>
-               </p>
-               <p>     
-             <input type="password"  id="password" name="password"   class="form-control" style="width:250px" minlength="8" value="{{ password }}" title="Your password allows you to log in to this portal." placeholder="Password" required />
-           </p>
-        <p>
-                       <input type="password"  id="confirmpassword" name="confirmpassword" style="width:250px"  minlength="8" class="form-control" value="" placeholder="Confirm password" required />
-           </p>
-        <p>
-                       <select name="question" class="form-control" style="width:350px" id="key-policy" 
-                               title="Your public/private key pair allows you to access the testbeds." required >        
-                               <option value="generate">Generate my keys for me (recommended)</option>
-                               <option value="upload">Upload my public key (advanced users only)</option>
-                       </select>
-           </p>
-           <div style="display:none;" id="upload_key">
-               <label for="file" class="control-label">Upload public key</label>
-               <input type="file" name="user_public_key" class="form-control" style="width:200px" id="user_public_key" />
-               <br />
-                       <div class="alert alert-danger" id="pkey_del_msg">
-                               In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to 
-                               <a href="/portal/manual_delegation" target="_blank">delegate your credentials to the portal.</a>
-                       </div>
-           </div>
-       </div>
-</div>
-<div class="row">
-       <div class="col-md-12">
-        <p>
-                       <input type="checkbox" name="agreement" value="agreement" required />&nbsp;&nbsp; I agree to the 
-                       <a href="#" data-toggle="modal" data-target="#myModal">terms and conditions.</a> 
-               </p>
-       </div>
-</div>
-{% include theme|add:"_register_info.html" %}
-<div class="row">
-       <div class="col-md-12">
-               <div id="register">
-                       <p>
-               <input class="submit btn btn-onelab" type="submit" value="Sign up" />
-              </p>
-           </div>
-       </div>
-</div>
-</form>
-       <!-- Modal - columns selector -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-       <div class="modal-dialog">
-               <div class="modal-content">
-                       <div class="modal-header">
-                               <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                                       <h4 class="modal-title" id="myModalLabel">Terms & Conditions</h4>
-                       </div>
-                       <div class="modal-body">
-
-                       </div>
-                       <div class="modal-footer">
-                               <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                       </div>
-               </div>
-       </div>
-</div>
-
-    
-<script>
-
-$(document).ready(function(){
-    /*
-    var availableTags = [
-    {% if authorities %}
-        {% for authority in authorities %}
-            {% if authority.name %}
-                {value:"{{ authority.authority_hrn }}",label:"{{authority.name}}"},
-                       // show hrn if we don't have the name
-            {% else %}
-                {value:"{{ authority.authority_hrn }}",label:"{{authority.authority_hrn}}"},
-            {% endif %}
-        {% endfor %}    
-    {% else %}
-        {value:"",label:"No authority found !!!"}
-    {% endif %}
-    ];
-       // sorting the list
-    
-       availableTags.sort(function(a,b){
-               var nameA=a.value.toLowerCase(), nameB=b.value.toLowerCase();
-               if (nameA < nameB) {
-               return -1;
-               }
-               if (nameA > nameB) {
-               return 1;
-               }
-       return 0;
-       }); 
-    */
-    
-       // auto-complete the form
-    jQuery("#org_name").combobox();
-
-    //setting the default value in the org_list
-    var temp="fed4fire.global"; 
-    $("#org_name").val(temp);
-
-    /*
-    // Must be executed in Python as Admin Query - User is not logged in
-
-    $.post("/rest/authority/",{'filters':{'authority_hrn':'CONTAINS'+temp}}, function( data ) {
-        $.each( data, function( key, val ) {
-            console.log(val);
-        });
-    });
-    */
-       $('[title!=""]').qtip();
-       $("form").validate();
-       $("form").submit(function() {
-               if ($('select option:selected').val() == 'upload') {
-                       if ($('input[name=user_public_key]').val() == '') {
-                               alert('Please specify the key file to upload');
-                               return false;
-                       }
-               }
-       });
-});
-</script>
-{% endblock %}
-
index 379547c..45b4645 100644 (file)
 {% widget '_widget-news.html' %}
 </div> -->
 {% if username %}
+
+{% block head %} 
+<script type="text/javascript" src="https://java.com/js/dtjava.js"></script>
+{% endblock head %}
+
 {% widget "_widget-no_credentials.html" %}
 <div class="container dashboard">
+       <div class="row">
+           <div class="col-md-12" id="credentials_msg" style="display:none;">
        {%if 'no_creds'  in user_cred %}
-        <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
-    {%endif%}
+       <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">NO CREDENTIALS</a> are delegated to the portal!</p>
+       {%endif%}
        {%if 'creds_expired'  in user_cred %}
-        <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
+       <p class="command"><a href="#" style="color:red" data-toggle="modal" data-target="#myModal">EXPIRED CREDENTIALS</a> Please delegate again your credentials to the portal!</p>
     {%endif%}
-
-       <div class="row">
-               {% if pi %}
-               <div class="col-md-3">
-                       <h3>
-                               EXPERIMENT
-                       </h3>
-                       <div>
-                               <a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Create Slice</button>
-                       </div>
-                       <div>
-                               <p><strong>Your slices </strong>
-                                       <span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
-                                       However, on the OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
-                                       such as on the PlanetLab Europe portal, those slices will not appear here."
-                                       class="glyphicon glyphicon-info-sign">
-                               </span>
-
-                               </p>
-                       </div>
-                       <div>   
-                               <div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
-                       </div>
-               </div>
-               <div class="col-md-3">
-                       <h3>MANAGEMENT</h3>
-                       <div>
-                               <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="validaterequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Validate Requests</button>
-                       </div>
-               </div>
-               <div class="col-md-3">
-                       <h3>
-                               SUPPORT
-                       </h3>
-                       <div>
-                               <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
-                       </div>
-               </div>
-               
-               <div class="col-md-3">
-                       <h3>
-                               ACCOUNT
-                       </h3>
-                       <div>
-                               <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
-                       </div>
-                       <div>
-                               {% if person.last_name %}
-                                       {{person.first_name}} {{person.last_name}}<br />
-                               {% endif %}
-                       <span class="label">Username:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
-               </div>
-               </div>
-       </div>
-       {%else%}
-       <div class="row">
-               <div class="col-md-4">
-                       <h3>
-                               EXPERIMENT
-                       </h3>
-                       <div>
-                               <a href="#"><img src="{{ STATIC_URL }}img/icon_slices.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="slicerequestbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-plus"></span> Request Slice</button>
-                       </div>
-                       <div>
-                               <p><strong>Your slices </strong>
-                               <span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
-                                       However, on the OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
-                                       such as on the PlanetLab Europe portal, those slices will not appear here."
-                                       class="glyphicon glyphicon-info-sign">
-                               </span>
-                               </p>
-                       </div>
-                       <div>   
-                               <div id="home-slice-list"><img src="{{ STATIC_URL }}img/loading.gif" alt="Loading Slices" /></div>
-                       </div>
-                       {% if pending_slices %}
-                       <p><strong>Pending slices</strong>
-                       <span title="Slices that you have requested and are pending for validation by the contact person of your organization."
-                               class="glyphicon glyphicon-info-sign">
-                       <ul>
-                       {% for slices in pending_slices %}
-                       <li>{{slices}}</li>
-                       {% endfor %}
-                       </ul>
-                       </span>
-                       </p>
-                       {%endif%}       
-               </div>
-               <div class="col-md-4">
-                       <h3>
-                               SUPPORT
-                       </h3>
-                       <div>
-                               <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="ticketbtn" type="button" class="btn btn-default"><span class="glyphicon glyphicon-envelope"></span> Contact</button>
-                       </div>
-               </div>
-               
-               <div class="col-md-4">
-                       <h3>
-                               ACCOUNT
-                       </h3>
-                       <div>
-                               <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_color.png" alt="" /></a>
-                       </div>
-                       <div>
-                               <button id="logoutbtn" type="button" class="btn btn-default" data-username="{{ username }}"><span class="glyphicon glyphicon-off"></span> Logout</button>
-                       </div>
-                       <div>
-                               {% if person.last_name %}
-                                       {{person.first_name}} {{person.last_name}}<br />
-                               {% endif %}
-                       <span class="label">Username:</span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
-               </div>
-               </div>
-       </div>
-       {%endif%}
-
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-sm-4">
+            <h3>
+                <a href="/portal/slice_request/"><img src="{{ STATIC_URL }}img/icon_slices_small.png" alt="" />EXPERIMENT</a>
+            </h3>
+            <div>
+                <span class="glyphicon glyphicon-cog"></span> <a href="/portal/project_request/">Create/Join project</a>
+            </div>
+            <div class="dashboard-create-slice">
+                <span class="glyphicon glyphicon-plus"></span> <a href="/portal/slice_request/">Create slice</a>
+            </div>
+            <div class="projects-tree">
+                Your projects and slices
+                <span title="A <b>slice</b> is a set of testbed resources on which you can conduct an experiment. 
+                Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
+                However, on the Fed4FIRE portal, you will only see slices that you have created through Fed4FIRE. If you have created slices elsewhere, 
+                those slices will not appear here. <br /><br /> A <b>project</b> is a sub-authority under the responsability of your institution gathering users, 
+                who will be able to create slices for their experiments." class="glyphicon glyphicon-info-sign">&nbsp;</span> 
+             
+                <div id="home-project-tree"><img class="projects-loading" src="{{ STATIC_URL }}img/loading.gif" alt="Loading projects" /></div>
+            </div>
+            {% include theme|add:"_jfed_button.html" %}
+        </div>
+        <div class="col-sm-4">
+            <div class="row">
+                <div class="col-sm-12">
+                    <h3>
+                        <a href="/portal/account/"><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="" /></a><a href="/portal/account/">ACCOUNT</a>
+                    </h3>
+                    {% if person.last_name %}
+                    <p>
+                        {{person.first_name}} {{person.last_name}}
+                    </p>
+                    {% endif %}
+                    <p>
+                        <span class="glyphicon glyphicon-user"></span> <a href='/portal/account/' title="Click here to see and edit your account details.">{{person.email}}</a>
+                    </p>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-sm-12">
+                    <h3>
+                        <a href="/portal/institution"><img src="{{ STATIC_URL }}img/icon_authority_color_small.png" alt="" /></a><a href="/portal/institution">MANAGEMENT</a>
+                    </h3>
+                   
+                    <div>
+                        <span class="glyphicon glyphicon-ok"></span> <a href="/portal/institution#requests">Validate Requests</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="col-sm-4">
+            <div class="row">
+                <div class="col-sm-12">
+                    <h3>
+                        <a href="/portal/support"><img src="{{ STATIC_URL }}img/icon_support_small.png" alt="" /></a><a href="/portal/support">SUPPORT</a>
+                    </h3>
+                    <p>
+                        <span class="glyphicon glyphicon-envelope"></span> <a href="/portal/contact/">Contact</a>
+                    </p>
+                    {% include theme|add:"_dashboard_links.html" %}
+                </div>
+            </div>            
+        </div>
+    </div>
 </div>
 {% else %}
 <div class="container-fluid home">
        <div class="">
-               <div class="col-sm-2"></div>
-               <div class="col-sm-4 slogan">
-                       <h2>
-                               Your Easy Access to Computer Networking Testbeds:
-                       </h2>
-                       <h3>
-                               A wide variety of world class testbeds available through your one account
-                       </h3>
-               </div>
-               <div class="col-sm-5 col-sm-offset-1">
-                       <div class="row">
-                               {% widget '_widget-login-user.html' %}
-                       </div>
-               </div>
-               <div class="col-sm-1"></div>
+        {% include theme|add:"_login.html" %}
        </div>
 </div>
+
+<script type="text/javascript">
+       $(document).ready(function() {
+        localStorage.clear();
+    });
+</script>
+
 {% endif %}
 
 
 <script type="text/javascript">
+   var config = {
+       java8_jnlp: 'http://jfed.iminds.be/jfed-f4f-java8.jnlp',
+       java7_jnlp: 'http://jfed.iminds.be/jfed-f4f-java7.jnlp'
+   };
+
+   var certkey = "{{jfed_identity}}";
+
        $(document).ready(function() {
+           {%if 'no_creds' in user_cred or 'creds_expired' in user_cred %}
+        localStorage.clear();
+        /*
+        $.post("/cache/clear/", function( data ) {
+        });
+        */
+        {% endif %}
                $('a.home-tab').click(function() {
                        $('ul.nav-tabs li').removeClass('active');
                        $(this).parent().addClass('active');
                        $('div.home-panel').hide();
                        $('div#'+$(this).data('panel')).show();
                });
-               $('button#validaterequestbtn').click(function() {
-                       window.location="/portal/institution#requests";
-               });
-               $('button#ticketbtn').click(function() {
-                       window.location="/portal/contact/";
-               });
-               $('button#signupbtn').click(function() {
-                       window.location="/portal/register/";
-               });
-               $('button#slicerequestbtn').click(function() {
-                       window.location="/portal/slice_request/";
-               });
-
-        myslice.loadSlices();
-        
-});
+               
+    });
 </script>
-
+<script src='https://authority.ilabt.iminds.be/js/jquery/jquery-ui.min.js'></script>
+<script src="//java.com/js/dtjava.js"></script>
+<script src='https://authority.ilabt.iminds.be/js/jfed_webstart_f4fportal.js'></script>
+<link rel='stylesheet' href='https://authority.ilabt.iminds.be/js/jquery/jquery-ui.css' />
 {% endblock %}
index c9be8b6..3cf7990 100644 (file)
 {% else %}
 <div class="container-fluid home">
     <div class="">
-        <div class="col-sm-2"></div>
-        <div class="col-sm-4 slogan">
-            <h2>
-                Your Easy Access to Computer Networking Testbeds:
-            </h2>
-            <h3>
-                A wide variety of world class testbeds available through your one account
-            </h3>
-        </div>
-        <div class="col-sm-5 col-sm-offset-1">
-            <div class="row">
-                {% widget '_widget-login-user.html' %}
-            </div>
-        </div>
-        <div class="col-sm-1"></div>
+        {% include theme|add:"_login.html" %}
     </div>
 </div>
 <script type="text/javascript">
diff --git a/portal/templates/onelab/onelab_registration_view.html b/portal/templates/onelab/onelab_registration_view.html
deleted file mode 100644 (file)
index b0bb14a..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-{% extends "layout.html" %}
-
-{% block content %}        
-
-<div class="row">
-       <div class="col-md-12">
-       <h1><img src="{{ STATIC_URL }}icons/user-xs.png" alt="User Registration" />User sign-up</h1>
-       </div>
-</div>
-<div class="row">
-       <div class="col-md-12">
-               <p><strong>Questions? <a href="/contact" >Contact us.</a></strong></p>
-  </div>
-</div>
-
-{% if errors %}
-<div class="row">
-       <div class="col-md-12">
-               <ul class="error">
-                 {% for error in errors %}
-                 <li>{{ error | safe }}</li>
-                 {% endfor %}
-               </ul>
-       </div>
-</div>
-{% endif %}
-<form action="/register" class="cmxform form-horizontal" method="post" enctype="multipart/form-data">
-<div class="row">
-       <div class="col-md-6">
-           <div>
-                               {% csrf_token %}
-                               <label for="authority_hrn" class="control-label">Organization</label>
-                               <p></p>
-                <div class="ui-widget">
-                               <select id="org_name" name="org_name" class="form-control" style="width:590px" value="{{ organization }}" 
-                               title="Choose your organization (company/university) from the list that apears when you click in the field and start to type.
-                                Use the arrow keys to scroll through the list; type part of the name to narrow down the list. We will send an email to 
-                                the managers that we have on record for your organization, asking them to validate your sign-up request." required>
-                    <option value="">select an organization</option>
-                {% if authorities %}
-                    {% for authority in authorities %}
-                        {% if authority.name %}
-                                <option value="{{ authority.authority_hrn }}">{{authority.name}}</option>
-                        {% else %}
-                            <option value="{{ authority.authority_hrn }}">{{authority.authority_hrn}}</option>
-                        {% endif %}
-                    {% endfor %}               
-                {% else %}
-                    <option value:"">No authority found !!!</option>
-                {% endif %}
-                </select>
-                </div>
-                               <p></p>
-                {% include theme|add:"_authority_notListed.html" %}
-               </div>
-       </div>
-</div>
-
-<div class="row">
-       <div class="col-md-6">
-          <p>
-                       <label for="firstname" class="control-label">Personal information</label>
-          </p>
-          <p>
-                       <input type="text" name="firstname" class="form-control" style="width:350px" minlength="2" value="{{ first_name }}" placeholder="First name" required />
-           </p>
-           <p>
-                       <input type="text" name="lastname" size="25" class="form-control" style="width:350px" minlength="2" value="{{ last_name }}" placeholder="Last name" required />
-           </p>
-               <p>
-               <input type="email" name="email" size="25"  class="form-control" style="width:350px" value="{{ email }}" title="Your e-mail address will be your identifier for logging in. We contact you to verify your account and then, occasionally, for important issues." placeholder="Email" required />
-               </p>
-       </div>  
-
-       <div class="col-md-6">
-           <p>
-             <label for="password" class="control-label">Authentication</label>
-               </p>    
-               <p>
-             <input type="password"  id="password" name="password"   class="form-control" style="width:250px" minlength="8" value="{{ password }}" 
-                       title="Your password allows you to log in to this portal."
-                       placeholder="Password" required />
-           </p>
-           <p>
-                       <input type="password"  id="confirmpassword" name="confirmpassword" style="width:250px"  minlength="8" class="form-control" value="" 
-                               placeholder="Confirm password" required />
-           </p>
-           <p>
-                       <select name="question" class="form-control" style="width:350px" id="key-policy" 
-                               title="Your public/private key pair allows you to access the testbeds." required >        
-                               <option value="generate">Generate my keys for me (recommended)</option>
-                               <option value="upload">Upload my public key (advanced users only)</option>
-                       </select>
-           </p>
-           <div style="display:none;" id="upload_key">
-               <label for="file" class="control-label">Upload public key</label>
-               <input type="file" name="user_public_key" class="form-control" style="width:200px" id="user_public_key" />
-               <br />
-                       <div class="alert alert-danger" id="pkey_del_msg">
-                               In order for the portal to contact testbeds on your behalf, so as to list and reserve resources, you will need to 
-                               <a href="/portal/manual_delegation" target="_blank">delegate your credentials to the portal.</a>
-                       </div>
-           </div>
-       </div>
-</div>
-<div class="row">
-       <div class="col-md-12">
-               <p>
-                       <input type="checkbox" name="agreement" value="agreement" required />&nbsp;&nbsp; I agree to the 
-                       <a href="#" data-toggle="modal" data-target="#myModal">terms and conditions.</a> 
-               </p>
-       </div>
-</div>
-{% include theme|add:"_register_info.html" %}
-<div class="row">
-       <div class="col-md-12">
-               <div id="register">
-                       <p>
-               <input class="submit btn btn-onelab" type="submit" value="Sign up" />
-               </p>
-               </form>
-           </div>
-       </div>
-</div>
-
-       <!-- Modal - columns selector -->
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-                       <div class="modal-dialog">
-                       <div class="modal-content">
-                               <div class="modal-header">
-                                       <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                                               <h4 class="modal-title" id="myModalLabel">Terms & Conditions</h4>
-                               </div>
-                               <div class="modal-body">
-                    {% include theme|add:"_terms_and_conditions.html" %}
-                               </div>
-                               <div class="modal-footer">
-                                       <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-                               </div>
-                       </div>
-                       </div>
-</div>
-    
-<script>
-$(document).ready(function(){
-
-       // auto-complete the form
-    jQuery("#org_name").combobox();
-    
-    {% if theme == 'fed4fire' %}
-    //setting the default value in the org_list
-    var temp="fed4fire.global"; 
-    $("#org_name").val(temp);
-    {% endif %}
-
-       $('[title!=""]').qtip();
-       $("form").validate();
-       $("form").submit(function() {
-               if ($('select option:selected').val() == 'upload') {
-                       if ($('input[name=user_public_key]').val() == '') {
-                               alert('Please specify the key file to upload');
-                               return false;
-                       }
-               }
-       });
-});
-</script>
-{% endblock %}