rbbt-rest 1.4.10 → 1.4.11

data/share/views/help/entity.haml

@@ -128,7 +128,7 @@
   the report you need to use the Reload button on the top of the page.
   An exception to this are Actions. These can be opened in separate windows,
   in which case it works as usual, but are more often opened from the 
-  *Action Section* of the report, which will be covered bellow. The Action 
+  *Action Section* of the report, which will be covered below. The Action 
   Section has its own Reload button.
 
   To Star button toggles the favourite status of the current Entity or
@@ -157,7 +157,7 @@
 
   Reports may have any type of content, however, they are usually based on
   a common template. It has a title on the top row, a side bar on the left,
-  a description on the right, at the top, and the Actions Section bellow
+  a description on the right, at the top, and the Actions Section below
   it.  Note that, depending on the particular report, the description may
   be empty or there might not be any actions associated to it.
 
@@ -177,7 +177,7 @@
   type of Entity. When Actions are available for a Report, they are displayed
   in the Actions Section. This section is composed on an horizontal bar
   with a button for each each action. When a button is clicked the action
-  is displayed bellow the bar. If the action takes some time, a 'Loading...'
+  is displayed below the bar. If the action takes some time, a 'Loading...'
   message will appear. The bar includes a button to reload an action that
   has already been computed. If the action accepts parameters, the user
   will be required to set them. To set the parameters click on the button

data/share/views/help/workflow.haml

@@ -31,7 +31,7 @@
   optional for workflow development and may be missing). Each task has its
   own page, which contains the input form. Submitting the form takes you to
   the results page. Form and result pages follow a general template, which
-  we shall review bellow. 
+  we shall review below. 
   
   Workflow and task pages, like any other page in this system, are subject
   to being redefined; in this case by the workflow author. This makes it

data/share/views/job_result/job_control.haml

@@ -9,10 +9,11 @@
       %li
         %a(href="/#{[workflow.to_s, task, jobname] * "/"}?_format=raw") raw
 
-  - if job.files.any?
+  - files = job.files - ["html", "html.info"]
+  - if files.any?
     %dt Files
     %dd.job_files
       %ul
-        - job.files.each do |file|
+        - files.sort.each do |file|
           %li
             %a(href="/#{[workflow.to_s, task, jobname, "file", file] * "/"}")= file

data/share/views/job_result/tsv.haml

@@ -1,12 +1,17 @@
-- table_id = [workflow.to_s, task, jobname] * "_"
-- table_class = 'workflow_tsv_result'
-- begin
-  - page = result.size > 50 ? "1" : nil
-- rescue
-  - page = "1" 
-
-- rows, total_size = tsv_rows(result, page)
-- header = result.all_fields
-
-= workflow_partial('partials/table', workflow, task, 
-  locals.merge(:table_id => table_id, :page => page, :table_class => table_class, :rows => rows, :total_size => total_size, :header => result.all_fields, :row_ids => :use, :table_url => jobname ? File.join('/', workflow.to_s, task, jobname) : nil))
+- if result.any?
+  - table_id = [workflow.to_s, task, jobname] * "_"
+  - table_class = 'workflow_tsv_result'
+  - begin
+    - page = result.size > 50 ? "1" : nil
+  - rescue
+    - page = "1" 
+
+  - rows, total_size = tsv_rows(result, page)
+  - header = result.all_fields
+
+  = workflow_partial('partials/table', workflow, task, 
+    locals.merge(:table_id => table_id, :page => page, :table_class => table_class, :rows => rows, :total_size => total_size, :header => result.all_fields, :row_ids => :use, :table_url => jobname ? File.join('/', workflow.to_s, task, jobname) : nil))
+
+- else
+
+  Empty result

data/share/views/layout.haml

@@ -23,7 +23,7 @@
   = serve_css
 
 
-  - record_js '/js/deffer'
+  - record_js '/js/defer'
 
   // Third party frameworks
 
@@ -54,52 +54,27 @@
 
 %body
 
-  /{{{ CONTENT
-  /-----------
-  #content
-    - $wait = false
-    = yield
-
-
   /{{{ TOP MENU
   /------------
   #top_menu
     = partial_render('layout/top_menu')
 
-
+  /{{{ MODAL
+  /---------
   #modal
-  #coda
-    = serve_js
-    :javascript
-      var production = #{production? ? "true" : "false"};
-      start_defferred()
-
-    - if $wait
-      :javascript
-        var url = window.location.toString();
-        var wait_timeout = 2000;
-
-        function reload(){
-
-          $.ajax({url: add_parameters(url, '_layout=false'), cache:false, 
-          success: function(data, stat, req){
-            if (req.status == 202){
-              $('#content').html(data)
-              window.setTimeout(reload, wait_timeout);
-            }else{
-              window.location = url;
-            }
-          },
-
-          error:function(jqXHR, status, thrownError){
-            if (undefined === jqXHR.responseText || jqXHR.responseText == ''){
-              $('#content').html('No response. Server down?')
-            }else{
-              $('#content').html(jqXHR.responseText)
-            }
-          }})
-        }
-
-        window.setTimeout(reload, wait_timeout);
-   
 
+  /{{{ CONTENT
+  /-----------
+  #content
+    - @reload_page = false
+    = yield
+
+  /{{{ FOOTER
+  /----------
+  #footer
+    =partial_render('layout/footer')
+
+  /{{{ CODA
+  /--------
+  #coda
+    =partial_render('layout/coda')

data/share/views/layout/coda.haml

@@ -0,0 +1,40 @@
+= serve_js
+:javascript
+  var production = #{production? ? "true" : "false"};
+  $('.offcanvas').click(function(e){ 
+    if( e.target !== this ) 
+      return;
+    $(this).toggleClass('show') 
+  })
+
+  start_deferred()
+
+- if @reload_page 
+  :javascript
+    var url = window.location.toString();
+    var wait_timeout = 2000;
+
+    function reload(){
+
+      $.ajax({url: add_parameters(url, '_layout=false'), cache:false, 
+      success: function(data, stat, req){
+        if (req.status == 202){
+          $('#content').html(data)
+          window.setTimeout(reload, wait_timeout);
+        }else{
+          window.location = url;
+        }
+      },
+
+      error:function(jqXHR, status, thrownError){
+        if (undefined === jqXHR.responseText || jqXHR.responseText == ''){
+          $('#content').html('No response. Server down?')
+        }else{
+          $('#content').html(jqXHR.responseText)
+        }
+      }})
+    }
+
+    window.setTimeout(reload, wait_timeout);
+
+

data/share/views/layout/top_menu/finder.haml

@@ -1,4 +1,4 @@
 %form.collapse(action='/find' method="POST")
-  %input(type="text" name="term")
+  %input(type="search" name="term")
   %button.secondary.radius.button(type="submit") Find
  

data/share/views/partials/form.haml

@@ -31,9 +31,9 @@
 
 
   .input.submit
+    %input(type="submit")
     - if klass =~ /workflow_task/
       %input.jobname(type='text' name='jobname' placeholder='optional job name')
       %select.format(name="_format")
         - [:html, :json, :raw, :binary].each do |format|
           %option(value=format)= format.to_s
-    %input(type="submit")

data/share/views/partials/table.haml

@@ -32,7 +32,7 @@
         - header.each do |header|
           %th= header
 
-  %tbody
+  %tbody<
     - rows.each do |row|
       - case row_ids
       - when :consume

data/share/views/public/js/app.js

@@ -12,15 +12,15 @@ function update_rbbt(){
  //$('table.tablesorter').tablesorter()
  $('body > #modal').modal()
  $('.action_controller').action_controller()
- $('#top_menu li.favourites').favourites('update_list_selects').favourites('update_map_selects')
+ $('#top_menu .favourites').favourites('update_list_selects').favourites('update_map_selects')
 
- start_defferred()
+ start_deferred()
  fit_content()
 }
 
 $(function(){
 
- register_dom_update('#top_menu > ul > li.reload', function(item){
+ register_dom_update('#top_menu > .reload', function(item){
   item.click(function(){
    var url = window.location.toString();
    url = url.replace(/#$/, '');
@@ -43,7 +43,7 @@ $(function(){
   })
  })
 
- $('#top_menu li.favourites').favourites()
+ $('#top_menu .favourites').favourites()
 
  update_rbbt()
 })

data/share/views/public/js/defer.js

@@ -0,0 +1,26 @@
+var deferred_execution = [];
+
+function defer(deps, func){
+  if (undefined === func){
+    func = deps;
+    deps = undefined;
+  }
+  if (undefined !== deps){
+    deferred_execution.push([deps, func]);
+  }else{
+    deferred_execution.push(func)
+  }
+}
+
+function start_deferred(){
+  $(deferred_execution).each(function(pos,func){
+    if (typeof(func) == 'object'){
+      require_js(func[0], func[1]);
+    }else{
+      func.call();
+    }
+  })
+  deferred_execution = [];
+}
+
+

data/share/views/public/js/helpers.js

@@ -56,6 +56,7 @@ function parse_parameters(params){
  return ret
 }
 
+var required_js = [];
 function require_js(url, success){
  if (typeof url == 'object'){
    if (url.length > 1){
@@ -78,7 +79,13 @@ function require_js(url, success){
   }
 
   url = url.replace('/js/', '/js-find/')
-  $.ajax({url: url, cache:cache, dataType:'script', async: async, success: success} ).fail(function(jqxhr, settings, exception){ })
+
+  if ($.inArray(url, required_js) >= 0){
+    if (typeof success == 'function'){ success.call() }
+  }else{
+    var _success = function(){ if (typeof success == 'function'){ success.call() }; required_js.push(url); }
+    $.ajax({url: url, cache:cache, dataType:'script', async: async, success: _success} ).fail(function(jqxhr, settings, exception){ console.log('Failed to load ' + url) })
+  }
  }
 }
 

data/share/views/public/js/rbbt/actions.js

@@ -36,7 +36,7 @@ $.widget("rbbt.action_controller", {
   },
 
   _update_jobs: function(){
-    var job_list = $('#top_menu .user ul.jobs')
+    var job_list = $('#top_menu .user .jobs')
     job_list.html("")
     for(i in this.options.bookmarked){
       var url = this.options.bookmarked[i];
@@ -77,7 +77,7 @@ $.widget("rbbt.action_controller", {
     controller.on('click', '> ul.controls > li.description', function(e){ tool._display_description(this); return false});
     controller.on('click', '> ul.controls > li.pin', function(e){ tool._toggle_pin(this); return false});
     controller.on('click', '> ul.controls > li.url', function(e){ tool._toogle_track(this); return false});
-    $('#top_menu li.user ul.jobs').on('click', 'a.remove_element', function(){
+    $('#top_menu .user ul.jobs').on('click', 'a.remove_element', function(){
       var link = $(this).next('a')
       tool._untrack(link.attr('href'))
     })

data/share/views/public/js/rbbt/hide.js

@@ -8,13 +8,13 @@ $.widget("rbbt.hide_toggle", {
    if (this.options.title === undefined){  this.options.title = element.attr('hide-title') }
    if (this.options.title === undefined){  this.options.title = "toggle" }
 
-   var button = this.options.button = $('<a>').addClass('hide_toggle').html(this.options.title)
+   var button = this.options.button = $('<a>').addClass('hide_toggle').html(this.options.title).attr('data-title', this.options.title)
 
    button.click(function(){ tool.toggle(); update_rbbt(); return false })
    if (this.options.container !== undefined){
      $(this.options.container).first().append(button)
    }
-   this.hide()
+   //this.hide()
  },
 
  _swap: function(){
@@ -29,8 +29,8 @@ $.widget("rbbt.hide_toggle", {
 
  hide: function(){
    var tool = this;
-   this.element.addClass('hidden').removeClass('shown')
-   this.options.button.addClass('hidden').removeClass('shown')
+   this.element.addClass('hidden').removeClass('shown').removeClass('show')
+   this.options.button.addClass('hidden').removeClass('shown').removeClass('show')
 
    if (this.options.container === undefined){ this._swap(); }
  },
@@ -41,8 +41,8 @@ $.widget("rbbt.hide_toggle", {
    }else{
      $(this.options.container).find('.hide_toggle.shown').trigger('click')
    }
-   this.element.addClass('shown').removeClass('hidden')
-   this.options.button.addClass('shown').removeClass('hidden')
+   this.element.addClass('shown').addClass('show').removeClass('hidden')
+   this.options.button.addClass('shown').addClass('show').removeClass('hidden')
  },
 
  toggle: function(){
@@ -55,6 +55,10 @@ $.widget("rbbt.hide_toggle", {
 
 })
 
-$('#top_menu > ul > li.hide').hide_toggle({container: '#top_menu li.container'})
+$('#top_menu .hide').hide_toggle({container: '#top_menu .container'})
 
-$('.sidebar').hide_toggle({container: '#top_menu li.container', title: 'Side'})
+$('.sidebar').hide_toggle({container: '#top_menu .container', title: 'Side'})
+
+$('.actions.togglable_hide .action_controller').parents('.togglable_hide').first().hide_toggle({container: '#top_menu .container'}) 
+
+register_dom_update('.fixable', function(elem){ elem.hide_toggle({container: '#top_menu .container', title: "Fixed"}) })

data/share/views/public/js/rbbt/menu.js

@@ -1,4 +1,4 @@
-register_dom_update('dl.tabs > dt, dl.rbbt_tabs > dt.next, dl.rbbt_menu > .next, dl.rbbt_vertical_menu > .next, dl.rbbt_accordion > .next', function(title){
+register_dom_update('dl.dropdown_menu > .next, dl.menu > .next, dl.tabs > dt, dl.rbbt_tabs > dt.next, dl.rbbt_menu > .next, dl.rbbt_vertical_menu > .next, dl.rbbt_accordion > .next', function(title){
   title.click(function(){
     var option = $(this)
     var content = option.next()
@@ -17,6 +17,7 @@ register_dom_update('dl.tabs > dt, dl.rbbt_tabs > dt.next, dl.rbbt_menu > .next,
       option.addClass('show');
       menu.addClass('show')
     }
+    return false;
   })
 })
 

data/share/views/public/js/rbbt/modal.js

@@ -26,7 +26,7 @@ $.widget("rbbt.modal", {
     modal.on('click', 'a.toggle_favourite', function(){ 
       var url = $(tool.element).find('> .content').attr('target-href')
       if (url !== undefined){
-        $('#top_menu li.favourites').favourites('toggle_page', url)
+        $('#top_menu .favourites').favourites('toggle_page', url)
       }
       return false
     })
@@ -45,7 +45,7 @@ $.widget("rbbt.modal", {
 
   update_star: function(){
     var url = this._shown_url()
-    if ($('#top_menu li.favourites').favourites('is_favourite', url)){
+    if ($('#top_menu .favourites').favourites('is_favourite', url)){
       $(this.element).find('a.toggle_favourite').addClass('active');
     }else{
       $(this.element).find('a.toggle_favourite').removeClass('active');
@@ -58,6 +58,7 @@ $.widget("rbbt.modal", {
 
     modal.find('> .content').html(content)
     this.element.show()
+    this.element.addClass('show');
     update_rbbt()
   },
 
@@ -86,12 +87,14 @@ $.widget("rbbt.modal", {
       }
 
       tool.element.show()
+      this.element.addClass('show');
       if (undefined !== complete){ complete()}
       update_rbbt()
     })
   },
 
   close: function(){
+    this.element.removeClass('show');
     this.element.hide()
   }
 })

data/share/views/public/js/rbbt/reveal.js

@@ -1,21 +1,23 @@
 $.widget("rbbt.reveal", {
   options: {
-   modal: $('body > #modal')
+   modal: $('#modal').first()
   },
 
   _create: function() {
    var tool = this;
-   var modal = this.options.modal
+   var modal = this.options.modal;
+
    tool.element.click(function(){
+    var modal = $('#modal').first();
     var link = $(this);
     var source_id = link.attr('attr-reveal_id');
     var title     = link.attr('attr-reveal_title');
     var content = $('#' + source_id);
 
-    var height = window.innerHeight - $('#top_menu').outerHeight(true) - 50 ;
-    var width = window.innerWidth - 100;
+    var height = window.innerHeight - $('#top_menu').outerHeight(true);
     modal.css('height',height)
-    modal.css('width', width)
+    //var width = window.innerWidth;
+    //modal.css('width', width)
 
     modal.modal('show', content.html(), title, source_id);
     return false