RubyGems - lipsiadmin - Versions diffs - 4.1.8 → 5.0.0 - Mend

lipsiadmin 4.1.8 → 5.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (201) hide show

data/lipsiadmin_generators/backend/templates/stylesheets/login.css CHANGED Viewed

@@ -18,5 +18,6 @@ h2   { color:#525151; font-size:18px; margin:0px 0px 15px 0px; padding:0; }
 #content_intro { text-align:center; margin:210px 0px 0px 0px; color: #525151;}
 #content_intro a { color: #525151;}
 #copyright { position:absolute; top:100%; left:20px; margin-top:-30px; color:#FFF; }
+/* Classes */
 .field { padding-bottom:5px; }
 .bottom { color:#0BB1E1; margin-top:20px; }

data/lipsiadmin_generators/backend/templates/views/backend/accounts/index.rjs CHANGED Viewed

@@ -8,6 +8,7 @@ page.grid do |grid|
   grid.store do |store|
     store.url "/backend/accounts.json"
     store.fields @column_store.store_fields
+    store.sortInfo  :field => "accounts.created_at", :direction => "DESC"
   end
   grid.columns do |columns|
     columns.fields @column_store.column_fields

data/lipsiadmin_generators/backend/templates/views/backend/base/index.html.haml CHANGED Viewed

@@ -1,17 +1,20 @@
 %html
   %head
     %title="#{AppConfig.project} v.#{Lipsiadmin::VERSION::STRING}"
-    =stylesheet_link_tag :backend#_slate
+    =stylesheet_link_tag :backend
   %body
     #loading-mask
     #loading
       .loading-indicator
         =image_tag("backend/logo-loader.png") + "Loading..."
-    // include everything after the loading indicator
+    / include everything after the loading indicator
     =javascript_include_tag :defaults, :backend
     -unless params[:small]
       #header
         #logo=link_to AppConfig.project, backend_path
         #logout=link_to "Logout #{current_account.email}", backend_session_path(1), :method => :delete
-    %iframe{ :id => "ajax-iframe", :name => "ajax-iframe" }
+    %iframe{ :id => "ajax-iframe", :name => "ajax-iframe" }
+    %form{ :id => "history-form", :class => "x-hidden" }
+      =hidden_field_tag "x-history-field"
+      %iframe{ :id => "x-history-frame" }

data/lipsiadmin_generators/backend/templates/views/javascripts/backend.js.erb CHANGED Viewed

@@ -4,26 +4,65 @@
 //
 Ext.BLANK_IMAGE_URL = '/images/ext/default/s.gif';
 Ext.namespace('Backend');
+Ext.namespace('Backend.util.Format');
-Ext.Updater.defaults.loadScripts = true;
+Ext.Updater.defaults.loadScripts = false;
 Ext.Updater.defaults.showLoadIndicator = false;
+Ext.Updater.defaults.disableCaching = true;
+// How it works?
+//
+// Basically we can load (async) contents in 3 ways:
+//
+//  * Loading a file .js (javascript)
+//  * Loading a file .html (without extension are considered html)
+//  * Updating directly the html of the page
+//
+// If we load a directly a js we put them a <script src="youfile.js" type="text/javascript" /> in the <head>
+// Consider that the head contains ONLY dynamic javascripts because the system one wose loaded after the loader mask in the <body>.
+// We turn of Ext.Updater.defaults.loadScripts because we need to clean the cache (when required).
+//
+// So when we load a content we need to do two thing:
+//
+//  * Clean the old html (loaded in the past ajax request)
+//  * Clean the old <script> tags (loaded in the past ajax request)
+//
+// For do that we use this functions: clean, cleanScripts.
+//
+// If we load direclty an html page we use an handler: this.contentDynamic.getUpdater().on('beforeupdate', function(){ this.cleanScripts(); this.clean(); }, this);
+// If we update directly the html (ex a render :action => :some): update : function(html){ this.cleanScripts(); this.clean(); ... }
+// If we load direclty a js file (ex a grid): load : function(url, cache){ ... if (clean) { this.cleanScripts(); this.clean(); } ... }
+//
 Backend.app = function(){
+  // Our pretty simple cache
+  var cache = {};
+  var oldUrl = undefined;
   return {
+    // Init our app
     init : function(){
       Ext.state.Manager.setProvider(
         new Ext.state.CookieProvider({
-          expires: new Date(new Date().getTime()+(1000*60*60*24*365)) //365 days
+          expires: new Date(new Date().getTime()+(1000*60*60*24*365))
         })
       );
       // We want save cookies only for grids
       Ext.override(Ext.Component,      { stateful:false });
       Ext.override(Ext.grid.GridPanel, { stateful:true  });
       Ext.QuickTips.init();
-      Backend.cache.clear();
       // Used for direclty load some specific page
-      var loadUrl = window.location.search ? Ext.urlDecode(window.location.search.substring(1)).load  : undefined;
+      if (window.location.search){
+        var loadUrl = Ext.urlDecode(window.location.search.substring(1)).load;
+      } else if (window.location.href.split('#')[1]) {
+        var loadUrl = window.location.href.split('#')[1];
+      }
+      // Used for history the browsing
+      Ext.History.init();
+      Ext.History.on('change', function(token){ if(token != Backend.app.oldUrl) { Backend.app.load(token) } });
+      this.cache = {};
       if (!this.smallView()){
         var header = new Ext.Panel({
@@ -31,7 +70,7 @@ Backend.app = function(){
           region:'north',
           border: false,
           height: 65,
-          bbar: new Ext.Toolbar({ cls:'x-toolbar-menu', items: [<%= backend_menu %>] })
+          bbar: <%= backend_menu %>
         });
       }
@@ -40,7 +79,7 @@ Backend.app = function(){
         region:'center',
         border:false,
         bodyStyle: 'background: #FFF url(/images/backend/bg-content.png) repeat-x top;',
-        title:'&nbsp;',
+        title: this.title() ? '&nbsp;' : '',
         layout:'fit'
       });
@@ -49,7 +88,7 @@ Backend.app = function(){
         items: header ? [header, this.contentDynamic] : [this.contentDynamic]
       });
-      this.contentDynamic.getUpdater().on('beforeupdate', function(){ this.clean(); }, this);
+      this.contentDynamic.getUpdater().on('beforeupdate', function(){ this.cleanScripts(); this.clean(); }, this);
       this.contentDynamic.getUpdater().on('update', this.inspectContent, this);
       this.load(loadUrl ? loadUrl : '/backend/base/welcome');
       setTimeout(function(){
@@ -60,60 +99,67 @@ Backend.app = function(){
     smallView : function(){
       return window.location.search ? Ext.urlDecode(window.location.search.substring(1)).small : false;
-    }, // small
+    }, // smalloallProductsGroupingStore
     toolbar: function(){
-      return window.location.search ? Ext.urlDecode(window.location.search.substring(1)).toolbar : false;
+      return window.location.search ? Ext.urlDecode(window.location.search.substring(1)).toolbar!="0" : true;
     }, // hideToolbar
-    load : function(url, cache){
-      var ext = (/[.]/.exec(url)) ? /[^.]+$/.exec(url) : 'html';
-      var cache = (cache && cache == true) || false;
-      if (!cache){ Backend.cache.clear(); }
+    title: function(){
+      return window.location.search ? Ext.urlDecode(window.location.search.substring(1)).title!="0" : true;
+    }, // hideTite
+    load : function(url){
+      var ext  = (/[.]/.exec(url)) ? /[^.]+$/.exec(url) : 'html';
+      // Now we need to store the url in the history
+      if (!this.smallView()){
+        Ext.History.add(url, true);
+        this.oldUrl = url;
+      }
+      // Now give a reply based on request
       if (ext.length == 1 && ext[0].toLowerCase() == 'js') {
-        // Clean the cache
+        // Clean the html and scripts if requested
+        this.cleanScripts();
         this.clean();
-        // Store the js
-        this.backTo = url;
-        // Need to use this, because is not possible to disable evalJs through Ext.Ajax.request!
-        new Ajax.Request(url, {
-          method: 'GET',
-          evalJS: false, // Need to disable for debug it
-          onComplete: function(response){
-            try { window.eval(response.responseText); } catch(e) { Backend.app.error(e); }
-          }
-        });
+        // We append the js into the head so we can easy inspect errors
+        var hd = document.getElementsByTagName("head")[0];
+        var s  = document.createElement("script");
+        s.src  = url;
+        s.type = 'text/javascript';
+        // Now we can append the child.
+        hd.appendChild(s);
       } else if (ext == 'html'){
-        this.contentDynamic.getUpdater().update({ url: url, scripts: false, headers: { 'Accept': 'text/html, text/javascript, application/xml, text/xml, */*' } });
+        this.contentDynamic.getUpdater().update({ url: url, headers: { 'Accept': 'text/html, text/javascript, application/xml, text/xml, */*' } });
       } else {
         Ext.Msg.alert(Backend.locale.messages.alert.title, Backend.locale.messages.alert.message);
       }
-      this.contentDynamic.addEvents('inspection');
     }, // load
     back: function(){
-      if (Backend.app.backTo){
-        Backend.app.load(Backend.app.backTo);
+      if (Backend.app.smallView()){
+        window.location.reload(true);
       } else {
-        Ext.Msg.alert(Backend.locale.messages.alert.title, Backend.locale.messages.alert.notConfigured);
+        Ext.History.back();
       }
     },// back
-    backTo: undefined, // lastJs
     update : function(html){
+      this.cleanScripts();
       this.clean();
       var el = this.contentDynamic.body.update(html, true);
       this.inspectContent(el);
     }, // update
+    cleanScripts: function(){
+      Ext.select('head > script').each(function(el){ el.remove(); });
+    }, // cleanScripts
     clean : function(){
       this.mask();
-      this.contentDynamic.body.update('');
       this.contentDynamic.items.each(function(i){ i.destroy(); });
       this.contentDynamic.removeAll(true);
+      this.contentDynamic.body.update(''); // Another check ;)
       this.contentDynamic.doLayout();
     }, // clean
@@ -125,13 +171,9 @@ Backend.app = function(){
     submitForm : function(){
       Backend.app.mask(Backend.locale.messages.wait.message);
       Backend.app.contentDynamic.findByType('tabpanel').each(function(tabpanel){
-        Backend.cache.set('active-tab', tabpanel.activeTab.id);
-      });
-      Ext.select('form').each(function(form){
-        if (form.id != 'ajax-iframe'){
-          form.dom.submit();
-        }
+        cache.activeTab = tabpanel.activeTab.id;
       });
+      Ext.select('form[target=ajax-iframe]').each(function(form){ form.dom.submit(); });
     }, // submitForms
     setTitle: function(title){
@@ -139,96 +181,106 @@ Backend.app = function(){
     }, // SetTitle
     inspectContent: function(el, oResponseObject){
-      // Search for forms (except ajax-frame) in the page, usually only one.
-      el.select('form').each(function(form){
-        if (form.id != 'ajax-iframe'){
-          form.dom.target = 'ajax-iframe';
-        }
-      });
+      try {
+        // Search for forms (except ajax-frame) in the page, usually only one.
+        el.select('form').each(function(form){
+          if (form.id != 'ajax-iframe'){
+            form.dom.target = 'ajax-iframe';
+          }
+        });
-      // Search for tabs in the page
-      var tabs = el.select('div[tabbed=true]');
+        // Search for tabs in the page
+        var tabs = el.select('div[tabbed=true]');
-      if (tabs.elements.length > 0){
-        // Build Tabs
-        var items = tabs.elements.collect(function(tab){
-          var editable = tab.getAttribute('htmleditor');
-          if (editable) {
-            return { id: tab.id, autoScroll:false, title: tab.title, items: { xtype: 'htmleditor', id: editable, enableFont: false, value: tab.getAttribute('value') } };
-          } else {
+        if (tabs.elements.length > 0){
+          // Build Tabs
+          var items = tabs.elements.collect(function(tab){
             return { id: tab.id, contentEl: tab.id, title: tab.title };
+          });
+          // Get ActiveTab
+          var activeTab = (cache.activeTab || 0);
+          var form = el.select('form[target=ajax-iframe]').first();
+          this.tabPanel = new Ext.TabPanel({
+            applyTo: form,
+            xtype:'tabpanel',
+            activeTab: activeTab,
+            border:false,
+            items: items,
+            deferredRender: true,
+            layoutOnTabChange: true,
+            enableTabScroll: true,
+            defaults: { autoScroll:true, layout:'fit' }
+          });
+          // We need to add an extra container for maximize compatibility with
+          // lastest safari builds.
+          var panelConfig = {
+            border:false,
+            layout:'fit',
+            items: this.tabPanel
+          };
+          if (this.toolbar()){
+            Ext.apply(panelConfig, {
+              bbar: [{
+                text: Backend.locale.buttons.back,
+                cls: 'x-btn-text-icon back',
+                handler: Backend.app.back
+              }, '->',{
+                text: Backend.locale.buttons.save,
+                cls: 'x-btn-text-icon save',
+                handler: Backend.app.submitForm
+              }]
+            });
           }
-        });
-        // Get ActiveTab
-        var activeTab = (Backend.cache.get('active-tab') || 0);
-        // Get The container, this code is redundant, but is a trick for ie.
-        var container = Ext.get(tabs.elements[0].id).parent().id;
-        var tabConfig = {
-          applyTo: container,
-          layoutOnTabChange:true,
-          activeTab: activeTab,
-          border:false,
-          region:'center',
-          items: items,
-          defaults: { autoScroll:true, layout:'fit' }
+          // Build the Container
+          var panel = new Ext.Panel(panelConfig);
+          this.addItem(panel);
+          // Need to use this because some times we add tabs from inline scripts
+          this.tabPanel.on('add', function(container, tab){ if (tab.id == activeTab) { Backend.app.tabPanel.setActiveTab(activeTab); } });
         }
-        if (this.toolbar()!="1"){
-          Ext.apply(tabConfig, {
-            bbar: [{
-              text: Backend.locale.buttons.back,
-              cls: 'x-btn-text-icon back',
-              handler: Backend.app.back
-            }, '->',{
-              text: Backend.locale.buttons.save,
-              cls: 'x-btn-text-icon save',
-              handler: Backend.app.submitForm
-            }]
-          });
-        }
+        // Now we can load scripts an eval scripts
+        var html = el.dom.innerHTML;
+        var dom  = this.contentDynamic.body.dom;
-        // Build TabPanel
-        var tabPanel = new Ext.TabPanel(tabConfig);
-        this.addItem(tabPanel);
-        // Need to use this because some times we add tabs from inline scripts
-        tabPanel.on('add', function(){ tabPanel.setActiveTab(activeTab) });
-      }
-      // Now we can load scripts
-      var html = el.dom.innerHTML;
-      var id = Ext.id();
-      var dom = this.contentDynamic.body.dom;
-      var hd = document.getElementsByTagName("head")[0];
-      var re = /(?:<script([^>]*)?>)((\n|\r|.)*?)(?:<\/script>)/ig;
-      var srcRe = /\ssrc=([\'\"])(.*?)\1/i;
-      var typeRe = /\stype=([\'\"])(.*?)\1/i;
+        var re = /(?:<script([^>]*)?>)((\n|\r|.)*?)(?:<\/script>)/ig;
+        var srcRe = /\ssrc=([\'\"])(.*?)\1/i;
+        var typeRe = /\stype=([\'\"])(.*?)\1/i;
-      var match;
-      while(match = re.exec(html)){
-        var attrs = match[1];
-        var srcMatch = attrs ? attrs.match(srcRe) : false;
-        if(srcMatch && srcMatch[2]){
-          var s = document.createElement("script");
-          s.src = srcMatch[2];
-          var typeMatch = attrs.match(typeRe);
-          if(typeMatch && typeMatch[2]){
-            s.type = typeMatch[2];
-          }
-          hd.appendChild(s);
-        }else if(match[2] && match[2].length > 0){
-          if(window.execScript) {
-            window.execScript(match[2]);
-          } else {
-            window.eval(match[2]);
+        var match;
+        while(match = re.exec(html)){
+          var attrs = match[1];
+          var srcMatch = attrs ? attrs.match(srcRe) : false;
+          if(srcMatch && srcMatch[2]){
+            // We append the js into the head so we can easy inspect errors
+            var hd = document.getElementsByTagName("head")[0];
+            var s  = document.createElement("script");
+            s.src  = srcMatch[2];
+            s.type = 'text/javascript';
+            // Now we can append the child.
+            hd.appendChild(s);
+          }else if(match[2] && match[2].length > 0){
+            if(window.execScript) {
+              window.execScript(match[2]);
+            } else {
+              window.eval(match[2]);
+            }
           }
         }
+        this.unmask();
+        // Empty our cache
+        cache = {};
+      } catch(e){
+        throw this.error(e)
       }
-      this.unmask();
     },//inspectContent
     error: function(e){
@@ -244,12 +296,12 @@ Backend.app = function(){
         baseCls: 'x-plain',
         labelAlign: 'top',
         items: [{
-            xtype:'textarea',
-            anchor: '100% 100%',
-            allowBlank: false,
-            fieldLabel: Backend.locale.help.description,
-            name: 'message'
-          }]
+          xtype:'textarea',
+          anchor: '100% 100%',
+          allowBlank: false,
+          fieldLabel: Backend.locale.help.description,
+          name: 'message'
+        }]
       });
       var formDialog = new Ext.Window({
@@ -348,7 +400,7 @@ Backend.window = Ext.extend(Ext.Window, {
         handler: this.saveForm.createDelegate(this, [])}
       );
     }
-    this.html = '<iframe id="'+this.iframeId+'" src="/backend/base/?small=1&toolbar='+(this.form?1:0)+'&load='+this.url+'" frameBorder="0" width="100%" height="100%" />';
+    this.html = '<iframe id="'+this.iframeId+'" class="windowed" src="/backend/base/?small=1&toolbar='+(this.form?0:1)+'&load='+this.url+'" frameBorder="0" width="100%" height="100%" />';
   }, // initComponent
   afterShow : function(afterShow){
@@ -375,23 +427,31 @@ Backend.window = Ext.extend(Ext.Window, {
   } // saveForm
 });
-Backend.cache = function(){
-  return {
-    get: function(key){
-      return Ext.state.Manager.get('backend-cache') ? Ext.state.Manager.get('backend-cache')[key] : undefined;
-    },// get
-    set: function(key, value){
-      config = {};
-      config[key] = value;
-      Ext.state.Manager.set('backend-cache', config);
-      return config;
-    }, // set
-    clear: function(){
-      Ext.state.Manager.clear('backend-cache');
-    } // clear
-  }// return
-}();
+Backend.comboBox = Ext.extend(Ext.form.ComboBox, {
+  displayField:'title',
+  typeAhead: false,
+  loadingText: 'Searching...',
+  pageSize: 10,
+  autoWidth:true,
+  hideTrigger:true,
+  itemSelector: 'div.search-item',
+  initComponent : function(){
+    Backend.comboBox.superclass.initComponent.call(this);
+    if (this.autoWidth){
+      Backend.app.contentDynamic.on('resize', this.fitContent, this);
+      this.on('render', this.fitContent, this);
+    }
+  }, // initComponent
+  fitContent : function() {
+    this.el.setStyle({display:'none'});
+    var size = this.el.parent().parent().getSize();
+    this.onResize(size.width, size.height);
+    this.el.setStyle({display:'inline'});
+  }
+});
+Backend.showAlert = function(){
+  Ext.Msg.alert(Backend.locale.messages.alert.title, Backend.locale.messages.alert.message);
+}
 Ext.onReady(Backend.app.init, Backend.app, true);