Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

Conflicts:
	plugins/queryupdater/static/js/queryupdater.js
	portal/sliceresourceview.py
	portal/templates/fed4fire/fed4fire_widget-slice-sections.html

jgarcia - Commit after merging HEAD files and SLA & Service Directory code

diff --cc myslice/urls.py
index 67865e7,2b0049d..a49156e
--- 1/myslice/urls.py
--- 2/myslice/urls.py
+++ b/myslice/urls.py
@@@ -87,11 -88,9 +88,12 @@@ urls = 
      (r'^slice/(?P<slicename>[^/]+)/?$', portal.sliceview.SliceView.as_view()),
      (r'^info/(?P<slicename>[^/]+)/?$', portal.slicetabinfo.SliceInfoView.as_view()),
      (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'^portal/', include('portal.urls')),
 +
 +    # SLA
 +    url(r'^sla/', include('sla.urls')),
  ]
  
  #this one would not match the convention

diff --cc plugins/queryupdater/static/js/queryupdater.js
index ac7fc0a,774392b..252d349
--- 1/plugins/queryupdater/static/js/queryupdater.js
--- 2/plugins/queryupdater/static/js/queryupdater.js
+++ b/plugins/queryupdater/static/js/queryupdater.js
@@@ -70,51 -73,15 +73,63 @@@
  
          do_update: function(e) {
              var self = e.data;
 -            self.spin();
 -            console.log("do_update");
 -
+ 
 +            var username = e.data.options.username;
 +            var urn = data.value;
              // XXX check that the query is not disabled
 -            manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
  
 -            // how to stop the spinning after the event? 
 -            // this should be triggered by some on_updatequery_done ?
 +            console.log("DATA VALUE: " + data.value);
 +
 +            if (data.value.toLowerCase().indexOf("iminds") >= 0){
 +
 +                $('#sla_dialog').show();
 +                $('#slamodal').modal('show');
 +                
 +                $(document).ready(function() {
 +                    $("#accept_sla").click(function(){
 +                        console.log("SLA ACCEPTED");
 +                        console.log("With username: " + username);
 +                        if(urn.toLowerCase().indexOf("wall2") >= 0){ 
 +                            $.post("/sla/agreements/simplecreate", 
 +                                { "template_id": "iMindsServiceVirtualwall",
 +                                  "user": username,
 +                                  "expiration_time": new Date() // jgarcia: FIXME
 +                                });
 +                        } else if(urn.toLowerCase().indexOf("wilab2") >= 0){
 +                            $.post("/sla/agreements/simplecreate", 
 +                                { "template_id":"iMindsServiceWiLab2",
 +                                  "user":username,
 +                                  "expiration_time": new Date() // jgarcia: FIXME
 +                                });
 +                        }
 +                        $('#slamodal').modal('hide');
-                         console.log("Executing raise_event after sending SLA");
-                         // manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
++                        self.spin();
++                        console.log("Executing do_update after sending SLA");
++                        // XXX check that the query is not disabled
++                        manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
++
++                        // how to stop the spinning after the event? 
++                        // this should be triggered by some on_updatequery_done ?
 +                    }); 
 +                });
 +
 +                $(document).ready(function() {
 +                    $("#dismiss_sla").click(function(){
 +                        console.log("SLA NOT ACCEPTED");
 +                        $('#slamodal').modal('hide');
 +                    }); 
 +                });
 +
 +            } else {
-                 console.log("Executing raise_event");
++                self.spin();
++                console.log("do_update");
++                // XXX check that the query is not disabled
 +                manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
++
++                // how to stop the spinning after the event? 
++                // this should be triggered by some on_updatequery_done ?
 +            }
++
          },
  
        // related buttons are also disabled in the html template

diff --cc portal/sliceresourceview.py
index 64a151b,f99c7d9..1ea6ead
--- 1/portal/sliceresourceview.py
--- 2/portal/sliceresourceview.py
+++ b/portal/sliceresourceview.py
@@@ -19,7 -19,7 +19,8 @@@ from plugins.queryupdater            im
  from plugins.testbeds                import TestbedsPlugin
  from plugins.scheduler2              import Scheduler2
  from plugins.columns_editor          import ColumnsEditor
 +from plugins.sladialog               import SlaDialog
+ from plugins.lists.simplelist        import SimpleList
  
  from myslice.theme import ThemeView
  
@@@ -203,24 -219,10 +221,25 @@@ class SliceResourceView (LoginRequiredV
                  },
          )
  
 +        # --------------------------------------------------------------------------
 +        # SLA View and accept dialog
 +        
 +        sla_dialog = SlaDialog(
 +            page                = page,
 +            title               = 'sla dialog',
 +            query               = main_query,
 +            togglable           = False,
 +            # start turned off, it will open up itself when stuff comes in
 +            toggled             = True,
 +            domid               = 'sla_dialog',
 +            outline_complete    = True,
 +            username            = request.user,
 +        )
 +
          template_env = {}
          template_env['list_resources'] = list_resources.render(self.request)
- #         template_env['list_reserved_resources'] = list_reserved_resources.render(self.request)
+         template_env['list_reserved_resources'] = list_reserved_resources.render(self.request)
+         template_env['list_reserved_leases'] = list_reserved_leases.render(self.request)
  
          template_env['columns_editor'] = filter_column_editor.render(self.request)
  

diff --cc portal/templates/_widget-slice-sections.html
index 7c89f2e,a3d5d95..175b09c
--- 1/portal/templates/_widget-slice-sections.html
--- 2/portal/templates/_widget-slice-sections.html
+++ b/portal/templates/_widget-slice-sections.html
@@@ -4,10 -4,9 +4,10 @@@
        <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li>
        <li class="active"><a class="link" href="/resources/{{ slice }}">Resources</a></li>
        <li><a href="/slice/{{ slice }}#users">Users</a></li>
-       <li><a href="/slice/{{ slice }}#experiment">Statistics</a></li>
-       <li><a href="/slice/{{ slice }}#experiment">Measurements</a></li>
+       <!--<li><a href="/slice/{{ slice }}#statistics">Statistics</a></li> -->
+       <li><a href="/slice/{{ slice }}#measurements">Measurements</a></li>
        <li><a href="/slice/{{ slice }}#experiment" data-toggle="tab">Experiment</a></li>
 +      <li><a href="/slice/{{ slice }}#sla">SLA</a></li>
  </ul>
  {% else %}
  <ul class="nav nav-tabs nav-section">
@@@ -15,10 -14,9 +15,10 @@@
        <li class="testbeds"><a href="#testbeds">Testbeds</a></li>
        <li><a class="link" href="/resources/{{ slice }}">Resources</a></li>
        <li class="users"><a href="#users">Users</a></li>
-       <li class="statistics"><a href="#experiment">Statistics</a></li>
-       <li class="measurements"><a href="#experiment">Measurements</a></li>
+ <!--  <li class="statistics"><a href="#statistics">Statistics</a></li> -->
+       <li class="measurements"><a href="#measurements">Measurements</a></li>
        <li class="experiment"><a href="#experiment" data-toggle="tab">Experiment</a></li>
 +      <li class="sla"><a href="#sla" data-toggle="tab">SLA</a></li>
  </ul>
  <script>
  $(document).ready(function() {

diff --cc portal/templates/fed4fire/fed4fire_widget-slice-sections.html
index fb9e64b,6e3a087..f223736
--- 1/portal/templates/fed4fire/fed4fire_widget-slice-sections.html
--- 2/portal/templates/fed4fire/fed4fire_widget-slice-sections.html
+++ b/portal/templates/fed4fire/fed4fire_widget-slice-sections.html
@@@ -1,24 -1,22 +1,27 @@@
  {% if section == "resources" %}
  <ul class="nav nav-tabs nav-section">
        <li><a href="/slice/{{ slice }}#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
-       <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li>
+ <!--  <li><a href="/slice/{{ slice }}#testbeds">Testbeds</a></li> -->
        <li class="active"><a class="link" href="/resources/{{ slice }}">Resources</a></li>
        <li><a href="/slice/{{ slice }}#users">Users</a></li>
-       <li><a href="/slice/{{ slice }}#experiment">Statistics</a></li>
-       <li><a href="/slice/{{ slice }}#experiment">Measurements</a></li>
-       <li><a href="/slice/{{ slice }}#experiment" data-toggle="tab">Experiment</a></li>
-       <li><a href="/slice/{{ slice }}#sla">SLA</a></li>
++
+ <!--  <li><a href="/slice/{{ slice }}#experiment">Statistics</a></li> 
+       <li><a href="/slice/{{ slice }}#measurements">Measurements</a></li>
+       <li><a href="/slice/{{ slice }}#experiment" data-toggle="tab">Experiment</a></li> -->
++
  </ul>
  {% else %}
  <ul class="nav nav-tabs nav-section">
        <li class="active"><a href="#info"><img src="{{ STATIC_URL }}icons/slices-xs.png" alt="About MySlice" /> {{ slice }}</a></li>
-       <li class="testbeds"><a href="#testbeds">Testbeds</a></li>
+       <!--<li class="testbeds"><a href="#testbeds">Testbeds</a></li> -->
        <li><a class="link" href="/resources/{{ slice }}">Resources</a></li>
        <li class="users"><a href="#users">Users</a></li>
-       <li class="statistics"><a href="#experiment">Statistics</a></li>
 -      <!--<li class="statistics"><a href="#experiment">Statistics</a></li> 
 -      <li class="measurements"><a href="#measurements">Measurements</a></li>
++
++      <!-- <li class="statistics"><a href="#experiment">Statistics</a></li>
 +      <li class="measurements"><a href="#experiment">Measurements</a></li>
-       <li class="experiment"><a href="#experiment" data-toggle="tab">Experiment</a></li>
+       <li class="experiment"><a href="#experiment" data-toggle="tab">Experiment</a></li> -->
 +      <li class="sla" style="display:none"><a href="#sla" data-toggle="tab">SLA</a></li>
++
  </ul>
  <script>
  $(document).ready(function() {

diff --cc portal/templates/fed4fire/fed4fire_widget-topmenu.html
Simple merge

diff --cc portal/templates/slice-resource-view.html
Simple merge

diff --cc portal/templates/slice-view.html
index 453096d,771edd4..91d3f73
--- 1/portal/templates/slice-view.html
--- 2/portal/templates/slice-view.html
+++ b/portal/templates/slice-view.html
@@@ -19,9 -19,8 +19,9 @@@
    <div class="tab-pane row" id="testbeds">...</div>
    <div class="tab-pane row" id="resources">...</div>
    <div class="tab-pane row" id="users">...</div>
-   <div class="tab-pane row" id="statistics">...</div>
+   <!-- <div class="tab-pane row" id="statistics">...</div> -->
    <div class="tab-pane row" id="measurements">...</div>
    <div class="tab-pane row" id="experiment">...</div>
 +  <div class="tab-pane row" id="sla">...</div>
  </div>        
  {% endblock %}