Merge branch 'master' of github.com:web2py/web2py

applications/admin/controllers/default.py

@@ -1770,4 +1770,3 @@ def git_push():
             session.flash = T("Push failed, there are unmerged entries in the cache. Resolve merge issues manually and try again.")
             redirect(URL('site'))
     return dict(app=app, form=form)
-

applications/admin/languages/it.py

@@ -8,6 +8,7 @@
 '%Y-%m-%d': '%d/%m/%Y',
 '%Y-%m-%d %H:%M:%S': '%d/%m/%Y %H:%M:%S',
 '(requires internet access)': '(requires internet access)',
+'(requires internet access, experimental)': '(requires internet access, experimental)',
 '(something like "it-it")': '(qualcosa simile a "it-it")',
 '@markmin\x01(file **gluon/contrib/plural_rules/%s.py** is not found)': '(file **gluon/contrib/plural_rules/%s.py** is not found)',
 '@markmin\x01Searching: **%s** %%{file}': 'Searching: **%s** files',
@@ -43,6 +44,7 @@
 'ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.': "ATTENZIONE: L'accesso richiede una connessione sicura (HTTPS) o l'esecuzione di web2py in locale (connessione su localhost)",
 'ATTENTION: TESTING IS NOT THREAD SAFE SO DO NOT PERFORM MULTIPLE TESTS CONCURRENTLY.': 'ATTENTZIONE: NON ESEGUIRE PIÙ TEST IN PARALLELO (I TEST NON SONO "THREAD SAFE")',
 'ATTENTION: you cannot edit the running application!': "ATTENZIONE: non puoi modificare l'applicazione correntemente in uso ",
+'Autocomplete Python Code': 'Autocomplete Python Code',
 'Available databases and tables': 'Database e tabelle disponibili',
 'back': 'indietro',
 'cache': 'cache',
@@ -113,10 +115,12 @@
 'Edit': 'modifica',
 'Edit application': 'Modifica applicazione',
 'edit controller': 'modifica controller',
+'edit controller:': 'edit controller:',
 'Edit current record': 'Modifica record corrente',
 'edit profile': 'modifica profilo',
 'Edit This App': 'Modifica questa applicazione',
 'edit views:': 'modifica viste (view):',
+'Editing bigul': 'Editing bigul',
 'Editing file "%s"': 'Modifica del file "%s"',
 'Editing Language file': 'Modifica file linguaggio',
 'Enterprise Web Framework': 'Enterprise Web Framework',
@@ -140,6 +144,8 @@
 'file saved on %(time)s': "file salvato nell'istante %(time)s",
 'file saved on %s': 'file salvato: %s',
 'filter': 'filter',
+'Find Next': 'Find Next',
+'Find Previous': 'Find Previous',
 'Frames': 'Frames',
 'Functions with no doctests will result in [passed] tests.': 'I test delle funzioni senza "doctests" risulteranno sempre [passed].',
 'Get from URL:': 'Get from URL:',
@@ -177,15 +183,16 @@
 'License for': 'Licenza relativa a',
 'loading...': 'caricamento...',
 'locals': 'locals',
-'login': 'accesso',
 'Login': 'Accesso',
+'login': 'accesso',
 'Login to the Administrative Interface': "Accesso all'interfaccia amministrativa",
 'Logout': 'uscita',
 'Main Menu': 'Menu principale',
+'Manage': 'Manage',
 'Menu Model': 'Menu Modelli',
 'merge': 'unisci',
-'models': 'modelli',
 'Models': 'Modelli',
+'models': 'modelli',
 'Modules': 'Moduli',
 'modules': 'moduli',
 'new application "%s" created': 'creata la nuova applicazione "%s"',
@@ -198,6 +205,7 @@
 'NO': 'NO',
 'No databases in this application': 'Nessun database presente in questa applicazione',
 'no match': 'nessuna corrispondenza',
+'online designer': 'online designer',
 'or alternatively': 'or alternatively',
 'Or Get from URL:': 'Or Get from URL:',
 'or import from csv file': 'oppure importa da file CSV',
@@ -206,6 +214,7 @@
 'Overwrite installed app': 'sovrascrivi applicazione installata',
 'Pack all': 'crea pacchetto',
 'Pack compiled': 'crea pacchetto del codice compilato',
+'Pack custom': 'Pack custom',
 'pack plugin': 'crea pacchetto del plugin',
 'PAM authenticated user, cannot change password here': 'utente autenticato tramite PAM, impossibile modificare password qui',
 'password changed': 'password modificata',
@@ -217,15 +226,19 @@
 'Plural-Forms:': 'Plural-Forms:',
 'Powered by': 'Powered by',
 'previous 100 rows': '100 righe precedenti',
-'private files': 'private files',
 'Private files': 'Private files',
+'private files': 'private files',
 'Query:': 'Richiesta (query):',
+'Rapid Search': 'Rapid Search',
 'record': 'record',
 'record does not exist': 'il record non esiste',
 'record id': 'ID del record',
 'register': 'registrazione',
 'reload': 'reload',
+'Reload routes': 'Reload routes',
 'Remove compiled': 'rimozione codice compilato',
+'Replace': 'Replace',
+'Replace All': 'Replace All',
 'request': 'request',
 'Resolve Conflict file': 'File di risoluzione conflitto',
 'response': 'response',
@@ -237,6 +250,8 @@
 "Run tests in this file (to run all files, you may also use the button labelled 'test')": "Run tests in this file (to run all files, you may also use the button labelled 'test')",
 'Running on %s': 'Running on %s',
 'Save': 'Save',
+'Save file:': 'Save file:',
+'Save file: %s': 'Save file: %s',
 'Save via Ajax': 'Save via Ajax',
 'Saved file hash:': 'Hash del file salvato:',
 'selected': 'selezionato',
@@ -245,23 +260,24 @@
 'shell': 'shell',
 'Site': 'sito',
 'some files could not be removed': 'non è stato possibile rimuovere alcuni files',
+'Start searching': 'Start searching',
 'Start wizard': 'start wizard',
 'state': 'stato',
 'static': 'statico',
 'Static': 'Static',
 'Static files': 'Files statici',
 'Stylesheet': 'Foglio di stile (stylesheet)',
-'submit': 'invia',
 'Submit': 'Submit',
+'submit': 'invia',
 'Sure you want to delete this object?': 'Vuoi veramente cancellare questo oggetto?',
 'table': 'tabella',
 'test': 'test',
 'Testing application': 'Test applicazione in corsg',
 'The "query" is a condition like "db.table1.field1==\'value\'". Something like "db.table1.field1==db.table2.field2" results in a SQL JOIN.': 'La richiesta (query) è una condizione come ad esempio  "db.tabella1.campo1==\'valore\'". Una condizione come "db.tabella1.campo1==db.tabella2.campo2" produce un "JOIN" SQL.',
-'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the application logic, each URL path is mapped in one exposed function in the controller': 'logica dell\'applicazione, ogni percorso "URL" corrisponde ad una funzione esposta da un controller',
-'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
+'The application logic, each URL path is mapped in one exposed function in the controller': 'The application logic, each URL path is mapped in one exposed function in the controller',
 'the data representation, define database tables and sets': 'rappresentazione dei dati, definizione di tabelle di database e di "set" ',
+'The data representation, define database tables and sets': 'The data representation, define database tables and sets',
 'The presentations layer, views are also known as templates': 'The presentations layer, views are also known as templates',
 'the presentations layer, views are also known as templates': 'Presentazione dell\'applicazione, viste (views, chiamate anche "templates")',
 'There are no controllers': 'Non ci sono controller',
@@ -273,8 +289,8 @@
 'There are no translators, only default language is supported': 'Non ci sono traduzioni, viene solo supportato il linguaggio di base',
 'There are no views': 'Non ci sono viste ("view")',
 'These files are not served, they are only available from within your app': 'These files are not served, they are only available from within your app',
-'these files are served without processing, your images go here': 'questi files vengono serviti così come sono, le immagini vanno qui',
 'These files are served without processing, your images go here': 'These files are served without processing, your images go here',
+'these files are served without processing, your images go here': 'questi files vengono serviti così come sono, le immagini vanno qui',
 'This is the %(filename)s template': 'Questo è il template %(filename)s',
 'Ticket': 'Ticket',
 'Ticket ID': 'Ticket ID',
@@ -322,8 +338,8 @@
 'Version %s.%s.%s (%s) %s': 'Version %s.%s.%s (%s) %s',
 'versioning': 'sistema di versioni',
 'Versioning': 'Versioning',
-'view': 'vista',
 'View': 'Vista',
+'view': 'vista',
 'Views': 'viste',
 'views': 'viste',
 'Web Framework': 'Web Framework',

applications/admin/static/js/ajax_editor.js

@@ -28,8 +28,10 @@ function on_error() {
 
 function doHighlight(highlight) {
   // Put the cursor at the offending line:
-    editor.setCursor({line:highlight.lineno-1,
+  editor.setCursor({
-                                 ch:highlight.offset+1});
+    line: highlight.lineno - 1,
+    ch: highlight.offset + 1
+  });
 }
 
 
@@ -53,8 +55,7 @@ function doClickSave() {
   currentUrl = jQuery(currentTabID + ' form').attr('action');
   jQuery.ajax({
     type: "POST",
-	  contentType: 'multipart/form-data;boundary="'
+    contentType: 'multipart/form-data;boundary="' + dataForPost[1] + '"',
-		    + dataForPost[1] + '"',
     url: currentUrl,
     dataType: "json",
     data: dataForPost[0],
@@ -94,9 +95,13 @@ function doClickSave() {
             jQuery(currentTabID + " .exposed").html(output.substring(0, output.length - 1));
           }
         }
-	    } catch(e) { on_error();}
+      } catch(e) {
+        on_error();
+      }
     },
-		    error: function(json) { on_error(); }
+    error: function (json) {
+      on_error();
+    }
   });
   return false;
 }
@@ -139,7 +144,8 @@ function doToggleBreakpoint(filename, url, sel) {
       xhr.setRequestHeader('web2py-component-location',
         document.location);
       xhr.setRequestHeader('web2py-component-element',
-			       'doSetBreakpoint');},
+        'doSetBreakpoint');
+    },
     success: function (json, text, xhr) {
       // show flash message (if any)
       var flash = xhr.getResponseHeader('web2py-component-flash');
@@ -147,8 +153,7 @@ function doToggleBreakpoint(filename, url, sel) {
         jQuery('.flash').html(decodeURIComponent(flash))
           .append('<a href="#" class="close">&times;</a>')
           .slideDown();
-		}
+      } else jQuery('.flash').hide();
-	     else jQuery('.flash').hide();
       try {
         if(json.error) {
           window.location.href = json.redirect;
@@ -161,14 +166,19 @@ function doToggleBreakpoint(filename, url, sel) {
             editor.setGutterMarker(json.lineno - 1, "breakpoints", null);
           }
         }
-	     } catch(e) { on_error(); }
+      } catch(e) {
+        on_error();
+      }
     },
-		    error: function(json) { on_error(); }
+    error: function (json) {
+      on_error();
+    }
   });
   return false;
 }
 
 // on load, update all breakpoints markers:
+
 function doListBreakpoints(filename, url, editor) {
   var dataForPost = prepareMultiPartPOST(new Array(
     prepareDataForSave('filename', filename)
@@ -184,7 +194,8 @@ function doListBreakpoints(filename, url, editor) {
       xhr.setRequestHeader('web2py-component-location',
         document.location);
       xhr.setRequestHeader('web2py-component-element',
-			       'doListBreakpoints');},
+        'doListBreakpoints');
+    },
     success: function (json, text, xhr) {
       try {
         if(json.error) {
@@ -197,9 +208,13 @@ function doListBreakpoints(filename, url, editor) {
             editor.setGutterMarker(lineno - 1, "breakpoints", makeMarker());
           }
         }
-	     } catch(e) { on_error(); }
+      } catch(e) {
+        on_error();
+      }
     },
-      error: function(json) { on_error(); }
+    error: function (json) {
+      on_error();
+    }
   });
   return false;
 }
@@ -219,7 +234,10 @@ function keepalive(url) {
     url: url,
     timeout: 1000,
     success: function () {},
-	  error: function(x) { on_error(); } });
+    error: function (x) {
+      on_error();
+    }
+  });
 }
 
 function load_file(url) {
@@ -244,7 +262,9 @@ function load_file (url) {
         jQuery("a[href='#" + json['id'] + "']").click();
       }
     },
-		error: function(x) { on_error(); }
+    error: function (x) {
+      on_error();
+    }
   });
 }
 
@@ -259,4 +279,3 @@ function set_font(editor, incr) {
 }
 
 var template_js = '<p class="repo-name">{{{a_tag}}}</p><small>{{address}}</small>';
-

applications/admin/views/default/edit.html

@@ -38,10 +38,10 @@
 <link rel="stylesheet" href="{{=cm}}/addon/dialog/dialog.css">
 <script src="{{=cm}}/addon/selection/active-line.js"></script>
 <script src="{{=cm}}/emmet.min.js"></script>
-<script language="Javascript" type="text/javascript" src="{{=URL('static','js/ajax_editor.js')}}"></script>
+<script src="{{=URL('static','js/ajax_editor.js')}}"></script>
 <link rel="stylesheet" href="{{=URL('static/css','typeahead.js-bootstrap.css')}}">
 <link rel="stylesheet" href="{{=URL('static/css','web2py-codemirror.css')}}">
-<script language="Javascript" type="text/javascript">
+<script type="text/javascript">
 var current_theme = "web2py";  //Default theme
 var current_font_incr = 0; // Default font-size, 0 means don't set
 jQuery(document).on('shown click', 'a[data-toggle="tab"]', function (e) {

applications/admin/views/default/site.html

@@ -151,4 +151,3 @@
   </div> <!-- /sidebar -->
 </div> <!-- /row-fluid
 <!-- end "site" block -->
-