rbbt-rest 1.1.4 → 1.1.5

data/share/views/public/js/_fix_tablesorter_science.js

@@ -23,3 +23,16 @@ $.tablesorter.addParser({
   type: 'text' 
 });
 
+$.tablesorter.addParser({ 
+  // set a unique id
+  id: 'percentage', 
+  is: function(s) { 
+    return /\d+\s*%/.test(s); 
+  }, 
+  format: function(s) { 
+    var num =  $.tablesorter.formatFloat(s);
+    return num;
+  }, 
+  type: 'numeric' 
+});
+

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

@@ -10,8 +10,13 @@ function load_action(link){
     if (jqXHR.status == 202){
       action_controller.removeClass('active');
 
-      if (action_div.html() == ""){
-        action_div.html("<span class='loading'>Loading ...</span>");
+      var response = $(jqXHR.responseText)
+      var stat = response.find('span.status').html()
+      var message = response.find('ul.step_messages li:first').html()
+      if (undefined === message){
+        action_div.html("<span class='loading'>Loading [" + stat + "] ...</span>");
+      }else{
+        action_div.html("<span class='loading'>Loading [" + stat + ": " + message + "] ...</span>");
       }
     }else{ 
       action_controller.addClass('active'); 
@@ -92,6 +97,7 @@ function setup_action(){
 
   var body = $('body');
 
+  body.on('click', '.action_controller > ul.actions  li > a.entity_map_action', activate_action)
   body.on('click', '.action_controller > ul.actions  li > a.entity_list_action', activate_action)
   body.on('click', '.action_controller > ul.actions  li > a.entity_action', activate_action)
   body.on('click', '.action_controller > ul.actions > li.select > a', show_actions)

data/share/views/public/js/base.js

@@ -34,6 +34,7 @@ function setup_page_reload(){
   var body = $('body');
   body.on('click', 'a#reload_page', function(){
     var url = window.location.toString();
+    url = url.replace(/#$/, '');
 
     url = remove_parameter(url, '_update');
     url = add_parameters(url, '_update=reload');
@@ -47,9 +48,11 @@ function setup_page_reload(){
 }
 
 function setup_fragments(){
+
   register_dom_update(('a.fragment'), function(link){
     link.each(function(){replace_link($(this))});
   })
+
   register_dom_update(('a.modal_fragment'), function(link){
     link.click(function(){
       var modal = $('#modal1')
@@ -66,6 +69,13 @@ function deactivate_off_links(){
   body.on('click', 'a.off', function(){return false})
 }
 
+$('body').on('click', 'a#permalink', function(){
+  var url = window.location.toString()
+  url = add_parameter(url, '_permalink', 'true')
+  window.location = url
+  return false
+})
+   
 function setup_finder(){
   //register_dom_update("#header li.search input", function(elem){
   //  elem.autocomplete({
@@ -92,14 +102,15 @@ function fit_content(){
 function update_rbbt(){
   update_dom();
   start_defferred();
+  apply_highlights();
 }
 
 function setup_rbbt(){
   setup_fragments();
   setup_action();
   setup_page_reload();
-  setup_favourites();
   deactivate_off_links();
+  update_favourite_entities_star();
   setup_finder();
   setup_offcanvas();
   setup_list_management();

data/share/views/public/js/entities.js

@@ -5,6 +5,7 @@ function page_type(path){
 
   if (path.match(/^\/entity\//)){ return "entity"; }
   if (path.match(/^\/entity_action\//)){ return "entity_action"; }
+  if (path.match(/^\/entity_map\//)){ return "entity_map"; }
   if (path.match(/^\/entity_list\//)){ return "entity_list"; }
   if (path.match(/^\/entity_list_action\//)){ return "entity_list_action"; }
   return undefined;
@@ -24,7 +25,7 @@ function page_entity(path){
 function page_entity_list(path){
   if (undefined === path){ path = window.location.pathname; }
 
-  switch(page_type()){
+  switch(page_type(path)){
     case "entity_list":
     return restore_element(path.split("/")[3]);
     default:
@@ -32,28 +33,50 @@ function page_entity_list(path){
   }
 }
 
+function page_entity_map(path){
+  if (undefined === path){ path = window.location.pathname; }
+
+  switch(page_type(path)){
+    case "entity_map":
+    return restore_element(path.split("/")[4]);
+    default:
+    return undefined
+  }
+}
+
+function page_entity_map_column(path){
+  if (undefined === path){ path = window.location.pathname; }
+
+  switch(page_type(path)){
+    case "entity_map":
+    return restore_element(path.split("/")[3]);
+    default:
+    return undefined
+  }
+}
+
 function page_entity_type(path){
   if (undefined === path){ path = window.location.pathname; }
   var entity_type;
 
-  switch(page_type()){
+  switch(page_type(path)){
     case "entity":
     case "entity_list":
     case "entity_action":
     case "entity_list_action":
+    case "entity_map":
     return restore_element(path.split("/")[2]);
     break;
   }
   return undefined;
 }
 
-function page_entity_base_type(){
-  return page_entity_type().split(":")[0]
+function page_entity_base_type(path){
+  return page_entity_type(path).split(":")[0]
 }
 
-
-function page_entity_format(){
-  return page_entity_type().split(":")[1]
+function page_entity_format(path){
+  return page_entity_type(path).split(":")[1]
 }
 
 function page_entity_info(params){
@@ -72,4 +95,13 @@ function list_link(type, id){
   return a
 }
 
+function map_link(type, column, id){
+  var a = $('<a>' + id +'</a>');
+  var url = "/entity_map/" + clean_element(type) + "/" + clean_element(column) + "/" + clean_element(id)
+  var base_type = type.split(":")[0]
+
+  a.addClass('entity_map').addClass(type).addClass(base_type).attr('href', url).attr('title', id)
+  return a
+}
+
 

data/share/views/public/js/favourites.js

@@ -1,91 +1,144 @@
-function setup_favourites(){
+// HELPERS
 
-  register_dom_update('a#toggle_favourite', function(link){
-    link.click(function(){
-      var link = $(this);
+function get_favourite_entities(){
+  //return JSON.parse($.ajax({url: '/favourite_entities', async: false, cache: false}).responseText)
+  return JSON.parse(get_ajax({url: '/favourite_entities', async: false, cache: false}))
+}
 
-      var type        = page_type();
-      switch(type){
-        case "entity":
-        var entity      = page_entity();
-        var entity_type = page_entity_type();
-        var entity_info = page_entity_info();
+function get_favourite_entity_lists(){
+  //return JSON.parse($.ajax({url: '/favourite_entity_lists', async: false, cache: false}).responseText)
+  return JSON.parse(get_ajax({url: '/favourite_entity_lists', async: false, cache: false}))
+}
 
-        if (link.hasClass('active')){
-          method = "/remove_favourite_entity/";
-        }else{
-          method = "/add_favourite_entity/";
-        }
-        var url = method + clean_element(entity_type) + "/" + entity;
+function get_favourite_entity_maps(){
+  //return JSON.parse($.ajax({url: '/favourite_entity_maps', async: false, cache: false}).responseText)
+  return JSON.parse(get_ajax({url: '/favourite_entity_maps', async: false, cache: false}))
+}
 
-        $.ajax({url: url, type: 'POST', data: entity_info, success: function (){ update_favourite_entities() }})
+function toggle_favourite(link){
+  var link = $(link);
+  var path;
 
-        return false
-        case "entity_list":
-        var entity_list      = page_entity_list();
-        var entity_type = page_entity_type();
+  if (link.parents('.reveal-modal').length == 0){
+    path = undefined;
+  }else{
+    path = link.closest('.reveal-modal').find('.embedded').first().attr('target-href');
+  }
 
-        if (link.hasClass('active')){
-          method = "/remove_favourite_entity_list/";
-        }else{
-          method = "/add_favourite_entity_list/";
-        }
-        var url = method + clean_element(entity_type) + "/" + entity_list;
+  var type = page_type(path);
+  switch(type){
+    case "entity":
+    var entity      = page_entity(path);
+    var entity_type = page_entity_type(path);
+    var entity_info = page_entity_info(path);
 
-        $.ajax({url: url, type: 'POST', success: function (){ update_favourite_entity_lists() }})
+    if (link.hasClass('active')){
+      method = "/remove_favourite_entity/";
+    }else{
+      method = "/add_favourite_entity/";
+    }
+    var url = method + clean_element(entity_type) + "/" + entity;
 
-        return false
-      }
-    })
-  })
+    $.ajax({url: url, type: 'POST', data: entity_info, success: function (){ update_favourite_entities() }})
 
-  update_favourite_entities_star();
-}
+    return false
+    case "entity_list":
+    var entity_list      = page_entity_list(path);
+    var entity_type      = page_entity_type(path);
 
-function get_favourite_entities(){
-  return JSON.parse($.ajax({url: '/favourite_entities', async: false, cache: false}).responseText)
-}
+    if (link.hasClass('active')){
+      method = "/remove_favourite_entity_list/";
+    }else{
+      method = "/add_favourite_entity_list/";
+    }
+    var url = method + clean_element(entity_type) + "/" + clean_element(entity_list);
 
-function get_favourite_entity_lists(){
-  return JSON.parse($.ajax({url: '/favourite_entity_lists', async: false, cache: false}).responseText)
+    $.ajax({url: url, type: 'POST', success: function (){ update_favourite_entity_lists() }})
+
+    return false
+    case "entity_map":
+    var entity_map      = page_entity_map(path);
+    var entity_type     = page_entity_type(path);
+    var entity_column   = page_entity_map_column(path);
+
+    if (link.hasClass('active')){
+      method = "/remove_favourite_entity_map/";
+    }else{
+      method = "/add_favourite_entity_map/";
+    }
+    var url = method + clean_element(entity_type) + "/" + clean_element(entity_column) + "/" + clean_element(entity_map);
+
+    $.ajax({url: url, type: 'POST', success: function (){ update_favourite_entity_maps() }})
+  }
 }
 
-function update_favourite_entities_star(favourites){
+// TOGGLE START
+
+$('body').on('click', 'a#toggle_favourite, .reveal-modal a.toggle_favourite',function(link){
+  var link = $(this)
+  toggle_favourite(link)
+  update_favourite_entities_star(undefined, link);
+  return false
+})
+
 
-  var type = page_type();
+function update_favourite_entities_star(favourites, link){
+  if (undefined === link){link = $('a#toggle_favourite')}
+
+  var path
+  if (link.parents('.reveal-modal').length == 0){
+    path = undefined;
+  }else{
+    path = link.closest('.reveal-modal').find('.embedded').first().attr('target-href');
+  }
+
+  var type = page_type(path);
   switch(type){
     case "entity":
+    if (undefined === favourites){ favourites = get_favourite_entities(path); }
 
-    if (undefined === favourites){ favourites = get_favourite_entities(); }
-
-    var entity = page_entity();
-    var type = page_entity_base_type();
+    var entity = page_entity(path);
+    var type = page_entity_base_type(path);
 
     if ((favourites[type] != undefined) && (favourites[type][entity] != undefined)){
-      $('a#toggle_favourite').addClass('active').removeClass('inactive');
+      link.addClass('active').removeClass('inactive');
     }else{
-      $('a#toggle_favourite').removeClass('active').addClass('inactive');
+      link.removeClass('active').addClass('inactive');
     }
-
     break
-    case "entity_list":
 
-    if (undefined === favourites){ favourites = get_favourite_entity_lists(); }
+    case "entity_list":
+    if (undefined === favourites){ favourites = get_favourite_entity_lists(path); }
 
-    var entity_list = page_entity_list();
-    var type = page_entity_base_type();
+    var entity_list = page_entity_list(path);
+    var type = page_entity_base_type(path);
 
     if ((favourites[type] != undefined) && ($.inArray(entity_list, favourites[type]) != -1 )){
-      $('a#toggle_favourite').addClass('active').removeClass('inactive');
+      link.addClass('active').removeClass('inactive');
     }else{
-      $('a#toggle_favourite').removeClass('active').addClass('inactive');
+      link.removeClass('active').addClass('inactive');
     }
+    break
 
+    case "entity_map":
+    if (undefined === favourites){ favourites = get_favourite_entity_maps(path); }
+
+    var entity_list = page_entity_map(path);
+    var type = page_entity_base_type(path);
+    var column = page_entity_map_column(path);
+
+    if ((favourites[type] != undefined) && (favourites[type][column] != undefined) && ($.inArray(entity_list, favourites[type][column]) != -1 )){
+      link.addClass('active').removeClass('inactive');
+    }else{
+      link.removeClass('active').addClass('inactive');
+    }
 
     break
   }
 }
 
+//{{{{ FAVOURITE MENUS
+
 function favourite_type_ul(entities){
   var type_ul = $('<ul>')
   for (var entity in entities){
@@ -110,6 +163,18 @@ function favourite_list_type_ul(type, lists){
   return type_ul
 }
 
+function favourite_map_type_ul(type, column, maps){
+  var type_ul = $('<ul>')
+  for (var map in maps){
+    var map = maps[map];
+    var link = map_link(type, column, map)
+    var entity_li = $('<li>');
+    entity_li.html(link);
+    type_ul.append(entity_li);
+  }
+  return type_ul
+}
+
 function update_favourite_entities(favourites){
   if (undefined === favourites){ favourites = get_favourite_entities(); }
 
@@ -119,15 +184,15 @@ function update_favourite_entities(favourites){
 
   for (var type in favourites){
 
-      var title_li = $('<li class="title back js-generated rbbt-generated"><h5><a href="#">' + type + '</a></h5></li>');
-      var entities = favourites[type];
-      var type_ul = favourite_type_ul(entities);
-      type_ul.addClass("dropdown").prepend(title_li);
+    var title_li = $('<li class="title back js-generated rbbt-generated"><h5><a href="#">' + type + '</a></h5></li>');
+    var entities = favourites[type];
+    var type_ul = favourite_type_ul(entities);
+    type_ul.addClass("dropdown").prepend(title_li);
 
-      var type_li = $('<li class="has-dropdown">')
-      type_li.append($('<a href="#">' + type + '</a>')).append(type_ul);
+    var type_li = $('<li class="has-dropdown">')
+    type_li.append($('<a href="#">' + type + '</a>')).append(type_ul);
 
-      favourites_ul.append(type_li);
+    favourites_ul.append(type_li);
   }
 
   var current_favourites = $('li#top-favourites ul.favourite_entities')
@@ -143,28 +208,56 @@ function update_favourite_entity_lists(favourites){
   favourites_ul.append(title_li);
 
   for (var type in favourites){
+    var title_li = $('<li class="title back js-generated rbbt-generated"><h5><a href="#">' + type + '</a></h5></li>');
+    var lists = favourites[type];
+    var type_ul = favourite_list_type_ul(type, lists);
+
+    type_ul.addClass("dropdown").prepend(title_li);
+
+    var type_li = $('<li class="has-dropdown">')
+    type_li.append($('<a href="#">' + type + '</a>')).append(type_ul);
+
+    favourites_ul.append(type_li);
+  }
+
+  var current_favourites = $('li#top-favourite_lists ul.favourite_entity_lists')
+  current_favourites.replaceWith(favourites_ul);
+  update_favourite_entities_star(favourites);
+  update_list_selects(favourites);
+}
 
-      var title_li = $('<li class="title back js-generated rbbt-generated"><h5><a href="#">' + type + '</a></h5></li>');
-      var lists = favourites[type];
-      var type_ul = favourite_list_type_ul(type, lists);
+function update_favourite_entity_maps(favourites){
+  if (undefined === favourites){ favourites = get_favourite_entity_maps(); }
+
+  var favourites_ul = $('<ul class="dropdown favourite_entity_maps" >');
+  var title_li = $('<li class="title back js-generated rbbt-generated"><h5><a href="#">Favourite Entities Lists</a></h5></li>');
+  favourites_ul.append(title_li);
+
+  for (var type in favourites){
+    for (var column in favourites[type]){
+      var title_li = $('<li class="title back js-generated rbbt-generated"><h5><a href="#">' + type + ' - ' + column + '</a></h5></li>');
+      var lists = favourites[type][column];
+      var type_ul = favourite_map_type_ul(type, column, lists);
 
       type_ul.addClass("dropdown").prepend(title_li);
 
       var type_li = $('<li class="has-dropdown">')
-      type_li.append($('<a href="#">' + type + '</a>')).append(type_ul);
+      type_li.append($('<a href="#">' + type + ' - ' + column + '</a>')).append(type_ul);
 
       favourites_ul.append(type_li);
+    }
+
   }
 
-  var current_favourites = $('li#top-favourite_lists ul.favourite_entity_lists')
+  var current_favourites = $('li#top-favourite_maps ul.favourite_entity_maps')
   current_favourites.replaceWith(favourites_ul);
   update_favourite_entities_star(favourites);
-  update_selects(favourites);
+  update_map_selects(favourites);
 }
 
-function update_select(select, lists){
-  select.find('option[class*=automatic_load]').remove();
+//{{{{ LIST SELECTS
 
+function update_list_select(select, type, lists){
   if (select.attr('attr-allow-empty') == 'true'){
     var option = $('<option value="none" class="loaded">none</option>')
     select.append(option);
@@ -180,31 +273,169 @@ function update_select(select, lists){
     var option = null;
     var name = elems
     if (selected == null || name != selected){
-      option = $('<option class="automatic_load" value="' + name + '">' + name + '</option>');
+      option = $('<option attr-entity_type="' + type + '" class="automatic_load" value="' + name + '">' + name + '</option>');
     }else{
-      option = $('<option class="automatic_load" selected=selected value="' + name + '">' + name + '</option>');
+      option = $('<option attr-entity_type="' + type + '" class="automatic_load" selected=selected value="' + name + '">' + name + '</option>');
     }
     select.append(option);
     return true
   })
-
 }
 
-function update_selects(favourites){
+function update_list_selects(favourites){
   if (undefined === favourites){ favourites = get_favourite_entity_lists(); }
 
+  $('select.favourite_lists').find('option.automatic_load').remove()
+
   $.each(favourites, function(type, lists){
     $('select.favourite_lists[type=' + type + ']').each(function(){
       var select = $(this);
-      update_select(select, lists);
+      update_list_select(select, type, lists);
+    })
+    $('select.favourite_lists[type=All]').each(function(){
+      var select = $(this);
+      select.append($('<option class="automatic_load" disabled>'+ type +'</option>'));
+      update_list_select(select, type, lists);
     })
   });
+
 }
 
 register_dom_update('select.favourite_lists', function(select){
+ $.each(select, function(){
+  var select = $(this);
   var type = select.attr('type');
-  var lists = get_favourite_entity_lists()[type];
-  if (undefined !== lists){
-    update_select(select, lists);
+  console.log(type)
+  if (type == 'All'){
+   update_list_selects();
+  }else{
+   var lists = get_favourite_entity_lists()[type];
+   if (undefined !== lists){
+    update_list_select(select, type, lists);
+   }
+  }
+ })
+})
+
+//{{{{ MAP SELECTS
+
+function update_map_select(select, type, map_lists){
+  if (select.attr('attr-allow-empty') == 'true'){
+    var option = $('<option value="none" class="loaded">none</option>')
+    select.append(option);
+  }
+
+  var selected = null;
+
+  if (select.attr('attr-selected') != undefined ){
+    selected = select.attr('attr-selected');
+  }
+
+  for (column in map_lists){
+    var maps = map_lists[column]
+    if (undefined === select.attr('column') || select.attr('column') == column){
+      $.each(maps, function(name, elems){
+        var option = null;
+        var name = elems
+        if (selected == null || name != selected){
+          option = $('<option class="automatic_load" attr-entity_type="' + type + '" attr-column="'+ column + '" value="' + name + '">' + name + '</option>');
+        }else{
+          option = $('<option class="automatic_load" attr-entity_type="' + type + '" attr-column="'+ column + '" selected=selected value="' + name + '">' + name + '</option>');
+        }
+        select.append(option);
+        return true
+      })
+    }
+  }
+}
+
+function update_map_selects(favourites){
+  if (undefined === favourites){ favourites = get_favourite_entity_maps(); }
+
+  $('select.favourite_maps').find('option.automatic_load').remove()
+
+  $.each(favourites, function(type, maps){
+    $('select.favourite_maps[type=' + type + ']').each(function(){
+      var select = $(this);
+      update_map_select(select, type, maps);
+    })
+    $('select.favourite_maps[type=All]').each(function(){
+      var select = $(this);
+      select.append($('<option class="automatic_load" disabled>'+ type +'</option>'));
+      update_map_select(select, type, maps);
+    })
+
+  });
+}
+
+register_dom_update('select.favourite_maps', function(select){
+  var type = select.attr('type');
+  if (type == "All"){
+    update_map_selects();
+  }else{
+    var map_lists = get_favourite_entity_maps()[type];
+    if (undefined !== map_lists){
+      update_map_select(select, type, map_lists);
+    }
+  }
+})
+
+// HIGHLIGHT
+
+if (undefined === localStorage["highlights"]){
+  localStorage["highlights"] = '{}'
+}
+
+register_dom_update('ul.favourite_entity_lists > li > ul.dropdown > li > a:not(.highlight)', function(list_link){
+  list_link.before($('<a class="highlight"><i class="foundicon-flag"/></a>'))
+})
+
+function add_highlight(type, list){
+  highlights = JSON.parse(localStorage["highlights"])
+  if (undefined === highlights[type]){ 
+    highlights[type] = [];
+  }
+  highlights[type].push(list)
+  highlights[type] = $.unique(highlights[type]);
+  localStorage["highlights"] = JSON.stringify(highlights)
+}
+
+function remove_highlight(type, list){
+  highlights = JSON.parse(localStorage["highlights"])
+  if (undefined === highlights[type]){ return }
+  highlights[type] = remove_from_array(highlights[type], list)
+  $('ul.favourite_entity_lists li[entity_type=' + type + '] ul li a[href*="' + list + '"]').parent().find('a.highlight').removeClass('active')
+  localStorage["highlights"] = JSON.stringify(highlights)
+}
+
+function apply_highlights(){
+  $('a.entity').removeClass('highlighted')
+  highlights = JSON.parse(localStorage["highlights"])
+  var entities = []
+  for (type in highlights){
+    for (i in highlights[type]){
+      var list = highlights[type][i]
+      var entities = list_entities(type, list)
+      $('ul.favourite_entity_lists li[entity_type=' + type + '] ul li a[href*="' + list + '"]').parent().find('a.highlight').addClass('active')
+      var type_entities = $('a.entity.' + type)
+      for (j in entities){
+        var entity_id = entities[j];
+        type_entities.filter('[attr-entity_id=' + entity_id + ']').addClass('highlighted')
+      }
+    }
+  }
+}
+
+$('body').on('click', 'ul.favourite_entity_lists a.highlight', function(){
+  var link = $(this)
+  var list_link = link.parent().children().last()
+  var list = list_link.attr('href').split("/")[3]
+  var type = link.closest('li.type').find('a').html()
+  highlights = JSON.parse(localStorage["highlights"])
+  if (undefined === highlights[type] || ! $.inArray(highlights[type], list)){
+    add_highlight(type, list)
+  }else{
+    remove_highlight(type, list)
   }
+  apply_highlights()
 })