rbbt-rest 1.3.32 → 1.4.0

data/share/views/compass/rbbt/reveal.sass

@@ -4,19 +4,18 @@
 =modal
   +rbbt_panel(#fff, #000)
   position: fixed
-  left: 0
+  top: 0
   z-index: 20
 
   @media #{$not-large}
-    top: $size_menu_item
-    border: 10px solid rgba(0,0,0,0.3)
+    border: 5px solid rgba(0,0,0,0.3)
   @media #{$only-large}
-    top: $size_menu_item
-    border: 50px solid rgba(0,0,0,0.3)
-  // or not...
-  height: 100%
+    border: 5px solid rgba(0,0,0,0.3)
+
+  min-width: 70%
+  max-height: 90%
+  margin: 50px
   overflow: auto
-  width: 100%
   & > .header
     font-size: 1.5em
     .controls
@@ -27,7 +26,7 @@
       float: left
 
     width: 100%
-    +clearfix
+    +clear_fix
     border-bottom: 1px solid grey
     margin-bottom: $vindent
 

data/share/views/compass/style.sass

@@ -1,3 +1,45 @@
-.menu_item
-  +_rbbt_menu_item
+@import "compass/reset"
+@import "compass/utilities"
+@import "compass/typography/vertical_rhythm"
+@import "compass/css3"
 
+@import "fonts"
+
+ul
+  margin: 0px
+  padding-left: 0 
+
+a
+  text-decoration: none
+  &[href]
+    &:not([href^=\/])
+      &:not([href^='#'])
+        &:after
+          content: '\2192'
+
+body
+  +establish-baseline
+  +typeSize("base")
+  width: 99%
+
+p
+  padding: 0.5em 0
+h5, h6
+  +typeSize("large")
+
+h3, h4
+  +typeSize("large")
+
+h1, h2
+  +typeSize("xlarge")
+  
+h2, h3
+  +typeWeight("strong")
+
+h1
+  +typeWeight("ultrastrong")
+
+code
+  font-family: console
+  +typeWeight("strong")
+  

data/share/views/compass/theme.sass

@@ -14,15 +14,20 @@ $color_panel_bg: $color_main
 $color_menu_border: #494949
 $color_menu_text: #020202
 
+=dark()
+  +rebase($base3,$base2,$base1,$base0,$base00,$base01,$base02,$base03)
+
+=light()
+  +rebase($base03,$base02,$base01,$base00,$base0,$base1,$base2,$base3)
 
 .dark
-  +rebase($base3,$base2,$base1,$base0,$base00,$base01,$base02,$base03)
+  +dark()
 
 .light
-  +rebase($base03,$base02,$base01,$base00,$base0,$base1,$base2,$base3)
+  +light()
 
 body
-  background-color: $base3
+  background-color: $color3
 
 html
   *
@@ -34,19 +39,19 @@ html
 
 //{{{ RBBT MENUS
 
-$color_top_menu: $base02
+$color_top_menu: $color2
 
-$color_menu_bg: $base03
+$color_menu_bg: $color1
 $color_menu_text: $base0
-$color_menu_item_bg: $base03
+$color_menu_item_bg: $color1
 $color_menu_item_text: $base0
-$color_menu_content_bg: $base3
+$color_menu_content_bg: $color3
 $color_menu_content_text: $base0
 
-$color_list_management_bg: $base02
+$color_list_management_bg: $color2
 //{{{ RBBT PANEL
 
-$color_panel_bg: $base02
+$color_panel_bg: $color2
 $color_panel_border: $base1
 $color_panel_text: $base0
 

data/share/views/compass/top_menu.sass

@@ -8,10 +8,8 @@ $padding_top_menu: 5px
   @media print
     display: none
 
-  @media #{$not-large}
-    position: fixed
-  @media #{$only-large}
-    position: fixed
+  position: fixed
+
   top: 0
   width: 100%
   z-index: 30
@@ -25,7 +23,8 @@ $padding_top_menu: 5px
   & > ul
     +grid_row()
     +clean_list
-    +clearfix
+    +clear_fix
+    overflow: show
 
     @media #{$only-large}
       & > li

data/share/views/compass/workflow.sass

@@ -1,5 +1,7 @@
-ul.tasks > li
-  display: block !important
+ul.tasks 
+  margin-top: 2em
+  li
+    display: block !important
 
 .workflow_task
   +card
@@ -9,7 +11,7 @@ ul.tasks > li
   
   .description
     +grid_row
-    +clearfix
+    +clear_fix
     .task_description
       
 
@@ -38,10 +40,10 @@ ul.tasks > li
         +rbbt_menu_item($color_bg: $base3, $color_menu_border: $base3)
 
 dd.job_control, dd.job_files
-  +clearfix
+  +clear_fix
   ul
     +rbbt_button_list($color_bg: $color_menu_bg)
-    +clearfix
+    +clear_fix
     background-color: $color_top_menu
     width: auto
     float: left

data/share/views/layout.haml

@@ -31,7 +31,7 @@
 
   = serve_js
 
-  - %w(jquery-2.0.0 jquery.cookie jquery.form).each do |jquery_file|
+  - %w(jquery-2.1.1 jquery.cookie jquery.form).each do |jquery_file|
     - record_js File.join('/plugins/jquery/js/', jquery_file)
 
   - record_js '/plugins/jquery-ui/js/jquery-ui-1.8.14.custom.min.js'
@@ -46,7 +46,7 @@
   - %w(helpers _md5 _ajax_replace _ellipsis).each do |file|
     - record_js "/js-find/#{ file }"
 
-  - %w(dom_update workflow menu fragment favourites page_type modal reveal actions table list map hide).each do |file|
+  - %w(dom_update workflow fragment menu favourites page_type modal reveal actions table list map hide).each do |file|
     - record_js "/js-find/rbbt/#{ file }"
 
   - record_js "/js-find/app"

data/share/views/public/js/_ajax_replace.js

@@ -63,8 +63,11 @@ function get_ajax(options, complete){
 
   if (undefined === complete){
     options.async = false
+  }else{
+    options.async = true
   }
 
+
   response = $.ajax(options)
 
   if (undefined !== response.responseJSON){

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

@@ -1,106 +1,117 @@
 //{{{ URL PARAMETER CONTROL
 
 function add_parameters(url, parameters){
-  var string;
-
-  if ( typeof(parameters) == 'string' || typeof(parameters) == 'String'){
-    string = parameters;
-  }else{
-    var pairs = [];
-    for (parameter in parameters){
-        pairs.push(parameter + "=" + parameters[parameter]);
-    }
-    string = pairs.join("&");
+ var string;
+
+ if ( typeof(parameters) == 'string' || typeof(parameters) == 'String'){
+  string = parameters;
+ }else{
+  var pairs = [];
+  for (parameter in parameters){
+   pairs.push(parameter + "=" + parameters[parameter]);
   }
+  string = pairs.join("&");
+ }
 
-  if (string.length == 0){return(url)}
+ if (string.length == 0){return(url)}
 
-  if (url.indexOf('?') == -1){
-    return url + '?' + string;
-  }else{
-    return url + '&' + string;
-  }
+ if (url.indexOf('?') == -1){
+  return url + '?' + string;
+ }else{
+  return url + '&' + string;
+ }
 }
 
 function add_parameter(url, parameter, value){
-  var url = remove_parameter(url, parameter)
-  url = add_parameters(url, parameter + "=" + value)
-  return url;
+ var url = remove_parameter(url, parameter)
+ url = add_parameters(url, parameter + "=" + value)
+ return url;
 }
 
 function remove_parameter(url, parameter){
-  if (url.match("&" + parameter + "=")){
-    return url.replace("&" + parameter + "=", '&REMOVE=').replace(/REMOVE=[^&]+/, '').replace(/\?&/, '?').replace(/&&/, '&').replace(/[?&]$/, '');
-  }else{
-    return url.replace("?" + parameter + "=", '?REMOVE=').replace(/REMOVE=[^&]+/, '').replace(/\?&/, '?').replace(/&&/, '&').replace(/[?&]$/, '');
-  }
+ if (url.match("&" + parameter + "=")){
+  return url.replace("&" + parameter + "=", '&REMOVE=').replace(/REMOVE=[^&]+/, '').replace(/\?&/, '?').replace(/&&/, '&').replace(/[?&]$/, '');
+ }else{
+  return url.replace("?" + parameter + "=", '?REMOVE=').replace(/REMOVE=[^&]+/, '').replace(/\?&/, '?').replace(/&&/, '&').replace(/[?&]$/, '');
+ }
 }
 
 function clean_element(elem){
-  return elem.replace(/\//g, '--').replace(/%/g,'o-o')
+ return elem.replace(/\//g, '--').replace(/%/g,'o-o')
 }
 
 function restore_element(elem){
-  return unescape(elem.replace(/--/g, '/').replace(/o-o/g,'%'));
+ return unescape(elem.replace(/--/g, '/').replace(/o-o/g,'%'));
 }
 
 function parse_parameters(params){
-  var ret = {},
-  seg = params.replace(/^\?/,'').split('&'),
-  len = seg.length, i = 0, s;
-  for (;i<len;i++) {
-    if (!seg[i]) { continue; }
-    s = seg[i].split('=');
-    ret[s[0]] = restore_element(s[1]);
-  }
-  return ret
+ var ret = {},
+ seg = params.replace(/^\?/,'').split('&'),
+ len = seg.length, i = 0, s;
+ for (;i<len;i++) {
+  if (!seg[i]) { continue; }
+  s = seg[i].split('=');
+  ret[s[0]] = restore_element(s[1]);
+ }
+ return ret
 }
 
 function require_js(url, success){
-  var async = false;
+ if (typeof url == 'object'){
+   if (url.length > 1){
+    var u = url.shift()
+    require_js(u, function(){
+     require_js(url, success);
+    })
+    return true
+   }else{
+    return require_js(url.shift(), success);
+   }
+ }else{
+  var async = true;
   var cache = production;
+
   if (undefined === success){
-    async = false;
+   async = false;
   }else{
-    async = true;
+   async = true;
   }
 
   url = url.replace('/js/', '/js-find/')
-  $.ajax({url: url, cache:cache, dataType:'script', async: async, success: success} ).fail(function(jqxhr, settings, exception){
-  })
+  $.ajax({url: url, cache:cache, dataType:'script', async: async, success: success} ).fail(function(jqxhr, settings, exception){ })
+ }
 }
 
 function remove_from_array(array, elem){
-  return jQuery.grep(array, function(value) {
-    return value != elem;
-  });
+ return jQuery.grep(array, function(value) {
+  return value != elem;
+ });
 }
 
 function array_values(hash){
-  var tmp_arr = [], key = '';
-  for (key in hash) {
-    tmp_arr[tmp_arr.length] = hash[key];
-  }
+ var tmp_arr = [], key = '';
+ for (key in hash) {
+  tmp_arr[tmp_arr.length] = hash[key];
+ }
 
-  return tmp_arr;
+ return tmp_arr;
 }
 
 function clean_attr(text){
- //return escape(text).replace(/\%/g, '\\%').replace(/\//g, '\\/').replace(/\./g, '\\.')
- return encodeURIComponent(text)//.replace(/[^\w-_]/g, function(s){return '\\' + s})
+ return encodeURIComponent(text)
 }
 
 function uniq(ary) {
-  var seen = {};
-  return ary.filter(function(elem) {
-    var k = elem;
-    return (seen[k] === 1) ? 0 : seen[k] = 1;
-  })
+ var seen = {};
+ return ary.filter(function(elem) {
+  var k = elem;
+  return (seen[k] === 1) ? 0 : seen[k] = 1;
+ })
 }
 function uniqBy(ary, key) {
-  var seen = {};
-  return ary.filter(function(elem) {
-    var k = key(elem);
-    return (seen[k] === 1) ? 0 : seen[k] = 1;
-  })
+ var seen = {};
+ return ary.filter(function(elem) {
+  var k = key(elem);
+  return (seen[k] === 1) ? 0 : seen[k] = 1;
+ })
 }

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

@@ -1,424 +1,424 @@
 
 function get_favourite_entities(complete){
- return get_ajax({url: '/favourite_entities', async: false, cache: false}, complete)
+    return get_ajax({url: '/favourite_entities', async: true, cache: false}, complete)
 }
 
 function get_favourite_entity_lists(complete){
- return get_ajax({url: '/favourite_entity_lists', async: false, cache: false}, complete)
+    return get_ajax({url: '/favourite_entity_lists', async: true, cache: false}, complete)
 }
 
 function get_favourite_entity_maps(complete){
- return get_ajax({url: '/favourite_entity_maps', async: false, cache: false}, complete)
+    return get_ajax({url: '/favourite_entity_maps', async: true, cache: false}, complete)
 }
 
 //{{{{ FAVOURITE MENUS
 
 function favourite_type_ul(entities){
-  var type_ul = $('<ul>').addClass('entities')
-  for (var entity in entities){
-    var entity_hash = entities[entity];
-    var link   = entity_hash["link"];
-    var entity_li = $('<li>');
-    entity_li.append(link);
-    type_ul.append(entity_li);
-  }
-  return type_ul
+    var type_ul = $('<ul>').addClass('entities')
+    for (var entity in entities){
+        var entity_hash = entities[entity];
+        var link   = entity_hash["link"];
+        var entity_li = $('<li>');
+        entity_li.append(link);
+        type_ul.append(entity_li);
+    }
+    return type_ul
 }
 
 function favourite_list_type_ul(type, lists){
-  var type_ul = $('<ul>').addClass('lists')
-  for (var list in lists){
-    var list = lists[list];
-    var link = list_link(type, list)
-    var entity_li = $('<li>');
-    entity_li.html(link);
-    type_ul.append(entity_li);
-  }
-  return type_ul
+    var type_ul = $('<ul>').addClass('lists')
+    for (var list in lists){
+        var list = lists[list];
+        var link = list_link(type, list)
+        var entity_li = $('<li>');
+        entity_li.html(link);
+        type_ul.append(entity_li);
+    }
+    return type_ul
 }
 
 function favourite_map_type_ul(type, column, maps){
-  var type_ul = $('<ul>').addClass('maps')
-  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
+    var type_ul = $('<ul>').addClass('maps')
+    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
 }
 
 $.widget("rbbt.favourites", {
- options: {
-  entities: {},
-  lists: {},
-  maps: {}
- },
-
- _create: function() {
-  this.update();
-  var tool = this;
-  this.element.on('click', 'dt.star', function(){
-   tool.toggle()
-   return false
-  })
-  this.element.on('click', 'a.remove_element', function(){
-   tool._remove_element($(this).siblings('a.entity, a.entity_list, a.entity_map'))
-  })
- },
-
- _menu: function(){
-  return(this.element)
- },
-
- _sync: function(){
-   var tool = this
-
-   get_favourite_entities(function(entities){
-     tool.options.entities = entities;
-     tool._update_entities()
-     tool._update_star()
-   })
-
-   get_favourite_entity_lists(function(lists){
-     tool.options.lists = lists;
-     tool._update_lists()
-     tool._update_star()
-   })
-
-
-   get_favourite_entity_maps(function(maps){
-     tool.options.maps = maps;
-     tool._update_maps()
-     tool._update_star()
-   })
- },
-
- //{{{ REMOVE ELEMENT
- //----------
-
- _remove_element: function(link){
-  var item = link.parent('li');
-  var ul = item.parent('ul');
-  var type = ul.attr('class');
-  var dt = ul.parent('dd').prev('dt');
-  var element     = link.attr('title');
-  var entity_type = dt.attr('entity_type');
-  var entity_column = dt.attr('entity_column');
-  var url;
-  var tool = this;
-
-  switch(type){
-   case "entities":
-   method = "/remove_favourite_entity/";
-   element = link.attr('attr-entity_id')
-   url = method + clean_element(entity_type) + "/" + element;
-   break;
-
-   case "lists":
-   method = "/remove_favourite_entity_list/";
-   url = method + clean_element(entity_type) + "/" + clean_element(element);
-   break;
-
-   case "maps":
-   method = "/remove_favourite_entity_map/";
-   url = method + clean_element(entity_type) + "/" + clean_element(entity_column) + "/" + clean_element(element);
-   break;
-  };
-
-  $.ajax({url: url, type: 'POST', success: function (){ tool.update()}})
- },
-
- _add_destructors: function(list){
-  var icon = $('<i class="general fi-minus">')
-  var remove = $('<a class=remove_element></a>').append(icon)
-  list.find('li').prepend(remove)
- },
-
-
- //{{{ TOGGLE PAGE STAR
- //----------
-
- _update_star: function(){
-  if (this.is_favourite() == true){
-   this.element.find('dt.star').addClass('active');
-  }else{
-   this.element.find('dt.star').removeClass('active');
-  }
- },
- _toggle_page: function(){
-  this.toggle_page(undefined)
- },
-
- toggle: function(){
-  this._toggle_page();
- },
-
- //{{{ UPDATE
- //----------
-
- _update_entities: function(){
-  var menu = this._menu()
-  menu.find('ul.entities').addClass('remove');
-
-  var entities = menu.find('dt.entities').next('dd').find('> dl')
-  for(type in this.options.entities){
-   var ul = favourite_type_ul(this.options.entities[type]);
-   this._add_destructors(ul)
-   var dt = entities.find('dt[entity_type=' + clean_attr(type) + ']')
-
-   if (dt.length == 0){
-    var dt = $('<dt>').html(type).addClass('next').addClass('type').attr('entity_type', type);
-    var dd = $('<dd>').append(ul);
-    entities.append(dt).append(dd);
-    update_rbbt();
-   }else{
-    if (dt.next('dd').find('ul.entities').length == 0){
-     dt.next('dd').append(ul);
-    }else{
-     dt.next('dd').find('ul.entities').replaceWith(ul);
-    }
-   }
-
-   menu.find('dt[entity_type=' + clean_attr(type) + ']').next('dd').find('ul.entities').replaceWith(ul);
-  }
-  menu.find('ul.entities.remove').remove()
- },
-
- _update_lists: function(){
-  var menu = this._menu()
-  menu.find('ul.lists').addClass('remove');
-
-  var lists = menu.find('dt.lists').next('dd').find('> dl')
-  for(type in this.options.lists){
-   var ul = favourite_list_type_ul(type, this.options.lists[type])
-   this._add_destructors(ul)
-   var dt = lists.find('dt[entity_type=' + clean_attr(type) + ']');
-
-   if (dt.length == 0){
-    var dt = $('<dt>').html(type).addClass('next').addClass('type').attr('entity_type', type);
-    var dd = $('<dd>').append(ul);
-    lists.append(dt).append(dd);
-    update_rbbt();
-   }else{
-    if (dt.next('dd').find('ul.lists').length == 0){
-     dt.next('dd').append(ul);
-    }else{
-     dt.next('dd').find('ul.lists').replaceWith(ul);
-    }
-   }
-  }
-  menu.find('ul.lists.remove').remove();
- },
-
- _update_maps: function(){
-  var menu = this._menu()
-  menu.find('ul.maps').addClass('remove')
-
-  var maps = menu.find('dt.maps').next('dd').find('> dl')
-  for(type in this.options.maps){
-   for(column in this.options.maps[type]){
-    var ul = favourite_map_type_ul(type, column, this.options.maps[type][column]);
-    this._add_destructors(ul)
-    var dt = maps.find('dt[entity_type=\'' + clean_attr(type) + '\'][entity_column=\'' + clean_attr(column) + '\']');
-
-    if (dt.length == 0){
-     var dt = $('<dt>').html(type + ' - ' + column).addClass('next').addClass('type').attr('entity_type', clean_attr(type)).attr('entity_column', clean_attr(column));
-     var dd = $('<dd>').append(ul);
-     maps.append(dt).append(dd);
-     update_rbbt();
-    }else{
-     if (dt.next('dd').find('ul.maps').length == 0){
-      dt.next('dd').append(ul);
-     }else{
-      dt.next('dd').find('ul.maps').replaceWith(ul);
-     }
-    }
-   }
-  }
-  menu.find('ul.maps.remove').remove()
- },
-
-
- //{{{ SELECTS
- //
- _update_list_select: function(select, type, 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');
-  }
-
-  $.each(lists, function(name, elems){
-    var option = null;
-    var name = elems
-    if (selected == null || name != selected){
-      option = $('<option attr-entity_type="' + type + '" class="automatic_load" value="' + name + '">' + name + '</option>');
-    }else{
-      option = $('<option attr-entity_type="' + type + '" class="automatic_load" selected=selected value="' + name + '">' + name + '</option>');
+    options: {
+        entities: {},
+        lists: {},
+        maps: {}
+    },
+
+    _create: function() {
+        this.update();
+        var tool = this;
+        this.element.on('click', 'dt.star', function(){
+            tool.toggle()
+            return false
+        })
+        this.element.on('click', 'a.remove_element', function(){
+            tool._remove_element($(this).siblings('a.entity, a.entity_list, a.entity_map'))
+        })
+    },
+
+    _menu: function(){
+        return(this.element)
+    },
+
+    _sync: function(){
+        var tool = this
+
+        get_favourite_entities(function(entities){
+            tool.options.entities = entities;
+            tool._update_entities()
+            tool._update_star()
+        })
+
+        get_favourite_entity_lists(function(lists){
+            tool.options.lists = lists;
+            tool._update_lists()
+            tool._update_star()
+        })
+
+
+        get_favourite_entity_maps(function(maps){
+            tool.options.maps = maps;
+            tool._update_maps()
+            tool._update_star()
+        })
+    },
+
+    //{{{ REMOVE ELEMENT
+    //----------
+
+    _remove_element: function(link){
+        var item = link.parent('li');
+        var ul = item.parent('ul');
+        var type = ul.attr('class');
+        var dt = ul.parent('dd').prev('dt');
+        var element     = link.attr('title');
+        var entity_type = dt.attr('entity_type');
+        var entity_column = dt.attr('entity_column');
+        var url;
+        var tool = this;
+
+        switch(type){
+            case "entities":
+                method = "/remove_favourite_entity/";
+            element = link.attr('attr-entity_id')
+            url = method + clean_element(entity_type) + "/" + element;
+            break;
+
+            case "lists":
+                method = "/remove_favourite_entity_list/";
+            url = method + clean_element(entity_type) + "/" + clean_element(element);
+            break;
+
+            case "maps":
+                method = "/remove_favourite_entity_map/";
+            url = method + clean_element(entity_type) + "/" + clean_element(entity_column) + "/" + clean_element(element);
+            break;
+        };
+
+        $.ajax({url: url, type: 'POST', success: function (){ tool.update()}})
+    },
+
+    _add_destructors: function(list){
+        var icon = $('<i class="general fi-minus">')
+        var remove = $('<a class=remove_element></a>').append(icon)
+        list.find('li').prepend(remove)
+    },
+
+
+    //{{{ TOGGLE PAGE STAR
+    //----------
+
+    _update_star: function(){
+        if (this.is_favourite() == true){
+            this.element.find('dt.star').addClass('active');
+        }else{
+            this.element.find('dt.star').removeClass('active');
+        }
+    },
+    _toggle_page: function(){
+        this.toggle_page(undefined)
+    },
+
+    toggle: function(){
+        this._toggle_page();
+    },
+
+    //{{{ UPDATE
+    //----------
+
+    _update_entities: function(){
+        var menu = this._menu()
+        menu.find('ul.entities').addClass('remove');
+
+        var entities = menu.find('dt.entities').next('dd').find('> dl')
+        for(type in this.options.entities){
+            var ul = favourite_type_ul(this.options.entities[type]);
+            this._add_destructors(ul)
+            var dt = entities.find('dt[entity_type=' + clean_attr(type) + ']')
+
+            if (dt.length == 0){
+                var dt = $('<dt>').html(type).addClass('next').addClass('type').attr('entity_type', type);
+                var dd = $('<dd>').append(ul);
+                entities.append(dt).append(dd);
+                update_rbbt();
+            }else{
+                if (dt.next('dd').find('ul.entities').length == 0){
+                    dt.next('dd').append(ul);
+                }else{
+                    dt.next('dd').find('ul.entities').replaceWith(ul);
+                }
+            }
+
+            menu.find('dt[entity_type=' + clean_attr(type) + ']').next('dd').find('ul.entities').replaceWith(ul);
+        }
+        menu.find('ul.entities.remove').remove()
+    },
+
+    _update_lists: function(){
+        var menu = this._menu()
+        menu.find('ul.lists').addClass('remove');
+
+        var lists = menu.find('dt.lists').next('dd').find('> dl')
+        for(type in this.options.lists){
+            var ul = favourite_list_type_ul(type, this.options.lists[type])
+            this._add_destructors(ul)
+            var dt = lists.find('dt[entity_type=' + clean_attr(type) + ']');
+
+            if (dt.length == 0){
+                var dt = $('<dt>').html(type).addClass('next').addClass('type').attr('entity_type', type);
+                var dd = $('<dd>').append(ul);
+                lists.append(dt).append(dd);
+                update_rbbt();
+            }else{
+                if (dt.next('dd').find('ul.lists').length == 0){
+                    dt.next('dd').append(ul);
+                }else{
+                    dt.next('dd').find('ul.lists').replaceWith(ul);
+                }
+            }
+        }
+        menu.find('ul.lists.remove').remove();
+    },
+
+    _update_maps: function(){
+        var menu = this._menu()
+        menu.find('ul.maps').addClass('remove')
+
+        var maps = menu.find('dt.maps').next('dd').find('> dl')
+        for(type in this.options.maps){
+            for(column in this.options.maps[type]){
+                var ul = favourite_map_type_ul(type, column, this.options.maps[type][column]);
+                this._add_destructors(ul)
+                var dt = maps.find('dt[entity_type=\'' + clean_attr(type) + '\'][entity_column=\'' + clean_attr(column) + '\']');
+
+                if (dt.length == 0){
+                    var dt = $('<dt>').html(type + ' - ' + column).addClass('next').addClass('type').attr('entity_type', clean_attr(type)).attr('entity_column', clean_attr(column));
+                    var dd = $('<dd>').append(ul);
+                    maps.append(dt).append(dd);
+                    update_rbbt();
+                }else{
+                    if (dt.next('dd').find('ul.maps').length == 0){
+                        dt.next('dd').append(ul);
+                    }else{
+                        dt.next('dd').find('ul.maps').replaceWith(ul);
+                    }
+                }
+            }
+        }
+        menu.find('ul.maps.remove').remove()
+    },
+
+
+    //{{{ SELECTS
+    //
+    _update_list_select: function(select, type, 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');
+        }
+
+        $.each(lists, function(name, elems){
+            var option = null;
+            var name = elems
+            if (selected == null || name != selected){
+                option = $('<option attr-entity_type="' + type + '" class="automatic_load" value="' + name + '">' + name + '</option>');
+            }else{
+                option = $('<option attr-entity_type="' + type + '" class="automatic_load" selected=selected value="' + name + '">' + name + '</option>');
+            }
+            select.append(option);
+            return true
+        })
+    },
+
+    _update_map_select: function(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="' + clean_attr(type) + '" attr-column="'+ clean_attr(column) + '" value="' + name + '">' + name + '</option>');
+                    }else{
+                        option = $('<option class="automatic_load" attr-entity_type="' + clean_attr(type) + '" attr-column="'+ clean_attr(column) + '" selected=selected value="' + name + '">' + name + '</option>');
+                    }
+                    select.append(option);
+                    return true
+                })
+            }
+        }
+    },
+
+    //{{{ UPDATES
+    //
+    update_list_selects: function(){
+        var tool = this;
+        $('select.favourite_lists').find('option.automatic_load').remove()
+
+        $.each(this.options.lists, function(type, lists){
+            $('select.favourite_lists[type=' + type + ']').each(function(){
+                var select = $(this);
+                tool._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>'));
+                tool._update_list_select(select, type, lists);
+            })
+        });
+    },
+
+    update_map_selects: function(){
+        var tool = this;
+        $('select.favourite_maps').find('option.automatic_load').remove()
+
+        $.each(this.options.maps, function(type, maps){
+            $('select.favourite_maps[type=' + type + ']').each(function(){
+                var select = $(this);
+                tool._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>'));
+                tool._update_map_select(select, type, maps);
+            })
+        });
+    },
+
+    close: function(){
+        this.element.find('.show').removeClass('show')
+    },
+
+    is_favourite: function(path){
+        var type = page_type(path);
+
+        switch(type){
+
+            case "entity":
+                var entity      = page_entity(path);
+            var entity_type = page_entity_base_type(path);
+            return this.options.entities[entity_type] !== undefined && this.options.entities[entity_type][entity] !== undefined
+
+            case "entity_list":
+                var list = page_entity_list(path);
+            var entity_type = page_entity_base_type(path);
+            return this.options.lists[entity_type] !== undefined && _.indexOf(this.options.lists[entity_type], list) !== -1
+
+            case "entity_map":
+                var map      = page_entity_map(path);
+            var entity_type = page_entity_base_type(path);
+            var entity_column = page_entity_map_column(path);
+            return this.options.maps[entity_type] !== undefined && this.options.maps[entity_type][entity_column] !== undefined && _.indexOf(this.options.maps[entity_type][entity_column], map) !== -1
+        }
+
+        return false
+    },
+
+    toggle_page: function(path){
+        var type = page_type(path);
+        var tool = this
+        switch(type){
+
+            case "entity":
+                var entity      = page_entity(path);
+            var entity_type = page_entity_type(path);
+            var entity_info = page_entity_info(path);
+
+            if (this.is_favourite(path)){
+                method = "/remove_favourite_entity/";
+            }else{
+                method = "/add_favourite_entity/";
+            }
+            var url = method + clean_element(entity_type) + "/" + entity;
+            $.ajax({url: url, type: 'POST', data: entity_info, success: function (){ tool.update()}})
+            break;
+
+            case "entity_list":
+                var list = page_entity_list(path);
+            var entity_type = page_entity_type(path);
+            if (this.is_favourite(path)){
+                method = "/remove_favourite_entity_list/";
+            }else{
+                method = "/add_favourite_entity_list/";
+            }
+            var url = method + clean_element(entity_type) + "/" + clean_element(list);
+            $.ajax({url: url, type: 'POST', success: function (){ tool.update() }})
+            break;
+
+            case "entity_map":
+                var map      = page_entity_map(path);
+            var entity_type = page_entity_type(path);
+            var entity_column = page_entity_map_column(path);
+            if (this.is_favourite(path)){
+                method = "/remove_favourite_entity_map/";
+            }else{
+                method = "/add_favourite_entity_map/";
+            }
+            var url = method + clean_element(entity_type) + "/" + clean_element(entity_column) + "/" + clean_element(map);
+            $.ajax({url: url, type: 'POST', success: function (){ tool.update()}})
+            break;
+        }
+    },
+
+
+    update: function(){
+        this._sync()
+        //this._update_entities()
+        //this._update_lists()
+        //this._update_maps()
+        //this._update_star()
+        //this._add_destructors()
+        $('#modal.url.entity').modal('update_star')
     }
-    select.append(option);
-    return true
-  })
- },
-
- _update_map_select: function(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="' + clean_attr(type) + '" attr-column="'+ clean_attr(column) + '" value="' + name + '">' + name + '</option>');
-     }else{
-      option = $('<option class="automatic_load" attr-entity_type="' + clean_attr(type) + '" attr-column="'+ clean_attr(column) + '" selected=selected value="' + name + '">' + name + '</option>');
-     }
-     select.append(option);
-     return true
-    })
-   }
-  }
- },
-
- //{{{ UPDATES
- //
- update_list_selects: function(){
-  var tool = this;
-  $('select.favourite_lists').find('option.automatic_load').remove()
-
-  $.each(this.options.lists, function(type, lists){
-   $('select.favourite_lists[type=' + type + ']').each(function(){
-    var select = $(this);
-    tool._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>'));
-    tool._update_list_select(select, type, lists);
-   })
-  });
- },
-
- update_map_selects: function(){
-  var tool = this;
-  $('select.favourite_maps').find('option.automatic_load').remove()
-
-  $.each(this.options.maps, function(type, maps){
-    $('select.favourite_maps[type=' + type + ']').each(function(){
-      var select = $(this);
-      tool._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>'));
-      tool._update_map_select(select, type, maps);
-    })
-  });
- },
-
- close: function(){
-  this.element.find('.show').removeClass('show')
- },
-
- is_favourite: function(path){
-  var type = page_type(path);
-
-  switch(type){
-
-   case "entity":
-   var entity      = page_entity(path);
-   var entity_type = page_entity_base_type(path);
-   return this.options.entities[entity_type] !== undefined && this.options.entities[entity_type][entity] !== undefined
-
-   case "entity_list":
-   var list = page_entity_list(path);
-   var entity_type = page_entity_base_type(path);
-   return this.options.lists[entity_type] !== undefined && _.indexOf(this.options.lists[entity_type], list) !== -1
-
-   case "entity_map":
-   var map      = page_entity_map(path);
-   var entity_type = page_entity_base_type(path);
-   var entity_column = page_entity_map_column(path);
-   return this.options.maps[entity_type] !== undefined && this.options.maps[entity_type][entity_column] !== undefined && _.indexOf(this.options.maps[entity_type][entity_column], map) !== -1
-  }
-
-  return false
- },
-
- toggle_page: function(path){
-  var type = page_type(path);
-  var tool = this
-  switch(type){
-
-   case "entity":
-   var entity      = page_entity(path);
-   var entity_type = page_entity_type(path);
-   var entity_info = page_entity_info(path);
-
-   if (this.is_favourite(path)){
-    method = "/remove_favourite_entity/";
-   }else{
-    method = "/add_favourite_entity/";
-   }
-   var url = method + clean_element(entity_type) + "/" + entity;
-   $.ajax({url: url, type: 'POST', data: entity_info, success: function (){ tool.update()}})
-   break;
-
-   case "entity_list":
-   var list = page_entity_list(path);
-   var entity_type = page_entity_type(path);
-   if (this.is_favourite(path)){
-    method = "/remove_favourite_entity_list/";
-   }else{
-    method = "/add_favourite_entity_list/";
-   }
-   var url = method + clean_element(entity_type) + "/" + clean_element(list);
-   $.ajax({url: url, type: 'POST', success: function (){ tool.update() }})
-   break;
-
-   case "entity_map":
-   var map      = page_entity_map(path);
-   var entity_type = page_entity_type(path);
-   var entity_column = page_entity_map_column(path);
-   if (this.is_favourite(path)){
-    method = "/remove_favourite_entity_map/";
-   }else{
-    method = "/add_favourite_entity_map/";
-   }
-   var url = method + clean_element(entity_type) + "/" + clean_element(entity_column) + "/" + clean_element(map);
-   $.ajax({url: url, type: 'POST', success: function (){ tool.update()}})
-   break;
-  }
- },
-
-
- update: function(){
-  this._sync()
-  //this._update_entities()
-  //this._update_lists()
-  //this._update_maps()
-  //this._update_star()
-  //this._add_destructors()
-  $('#modal.url.entity').modal('update_star')
- }
 
 })