From: Ummon <greg.burri@gmail.com>
Date: Thu, 23 Apr 2020 16:43:19 +0000 (+0200)
Subject: Merge branch 'master' of gburri.org:euphorik
X-Git-Url: http://git.euphorik.ch/?p=euphorik.git;a=commitdiff_plain;h=808fb60f6c10dfcaccee94c6a49f768de84dc2ef

Merge branch 'master' of gburri.org:euphorik
---

808fb60f6c10dfcaccee94c6a49f768de84dc2ef
diff --cc .gitignore
index 5b3f348,5b3f348..7c8641d
--- a/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,5 @@@
  *.iws
  *.beam
--var/
++var/
++/BD
++/data
diff --cc js/euphorik.js
index cac44c8,3f45e2d..893a32a
--- a/js/euphorik.js
+++ b/js/euphorik.js
@@@ -23,10 -23,10 +23,10 @@@ var euphorik = {}
  
  // le main
  $(document).ready(
-    function() { 
+    function() {
        var fragment = new Fragment();
 -      var formater = new euphorik.Formater();
 -      var util = new euphorik.Util(formater);
 +      var formatter = new euphorik.Formatter();
 +      var util = new euphorik.Util(formatter);
        var communication = new euphorik.Communication(
           function(data) { util.messageDialog(data.error_message); },
           function() { util.showWaitBar(); },
@@@ -60,19 -58,19 +58,19 @@@
        });
        $("#menu .register").click(function(){ pages.displayPage("register"); });
        $("#menu .about").click(function(){ pages.displayPage("about"); });
-       
+ 
 -      // TODO: simplification : such link[1] should be created and automatically open the right page without
 +      // TODO : simplification : such link[1] should be created and automatically open the right page without
        //  explicitly add a page.
        // [1] : <a class="pageLink" href="termes_of_use">Terms of use</a>
        $("#footer .termsOfUse").click(function(){ pages.displayPage("terms_of_use"); });
-       
+ 
 -      pages.addPage(new euphorik.PageMinichat(client, formater, util, communication), true);
 -      pages.addPage(new euphorik.PageAdmin(client, formater, util, communication));
 -      pages.addPage(new euphorik.PageProfile(client, formater, util));
 -      pages.addPage(new euphorik.PageRegister(client, formater, util));
 -      pages.addPage(new euphorik.PageAbout(client, formater, util, communication));
 +      pages.addPage(new euphorik.PageMinichat(client, formatter, util, communication), true);
 +      pages.addPage(new euphorik.PageAdmin(client, formatter, util, communication));
 +      pages.addPage(new euphorik.PageProfile(client, formatter, util));
 +      pages.addPage(new euphorik.PageRegister(client, formatter, util));
 +      pages.addPage(new euphorik.PageAbout(client, formatter, util, communication));
        pages.addPage("terms_of_use");
-       
+ 
        pages.displayPage(); // display the default page
     }
  );
Reading git-diff-tree failed