projects / euphorik.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 5d99923 a43e9c0)
Merge branch 'master' of gburri.org:euphorik
authorUmmon <greg.burri@gmail.com>
Thu, 23 Apr 2020 16:43:19 +0000 (18:43 +0200)
committerUmmon <greg.burri@gmail.com>
Thu, 23 Apr 2020 16:43:19 +0000 (18:43 +0200)
1  2 
.gitignore patch | diff1 | diff2 | blob | history
index.yaws patch | diff1 | diff2 | blob | history
js/euphorik.js patch | diff1 | diff2 | blob | history
modules/erl/euphorik_bd_admin.erl patch | diff1 | diff2 | blob | history
modules/erl/euphorik_common.erl patch | diff1 | diff2 | blob | history

diff --combined .gitignore
index 5b3f348,5b3f348..7c8641d
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -1,3 -1,3 +1,5 @@@
  *.iws
  *.beam
--var/
++var/
++/BD
++/data
diff --combined index.yaws
index a32b301,99ce454..9b80ee1
--- 1/index.yaws
--- 2/index.yaws
+++ b/index.yaws
@@@ -46,7 -46,7 +46,7 @@@
     <script type="text/javascript" src="js/communication.js" prod="delete"></script>\r
     <script type="text/javascript" src="js/conf.js" prod="delete"></script>\r
     <script type="text/javascript" src="js/util.js" prod="delete"></script>\r
 -   <script type="text/javascript" src="js/formater.js" prod="delete"></script>\r
 +   <script type="text/javascript" src="js/formatter.js" prod="delete"></script>\r
     <script type="text/javascript" src="js/pages.js" prod="delete"></script>\r
     <script type="text/javascript" src="js/client.js" prod="delete"></script>\r
  \r
@@@ -67,10 -67,10 +67,10 @@@
     <body>\r
        <div id="container">\r
           <erl>\r
-             % permet de prédéfinir la "class" du logo pour un ekMaster...\r
+             % To redefine the logo class for the ekMasters.\r
              out(A) ->\r
-                Est_ek_master = euphorik_bd:is_ek_master_from_cookie(yaws_api:find_cookie_val("cookie", A)),\r
-                {ehtml, {'div', [{id, "logo"}] ++ if Est_ek_master -> [{class, "ekMaster"}]; true -> [] end}}.\r
+                Is_ek_master = euphorik_bd:is_ek_master_from_cookie(yaws_api:find_cookie_val("cookie", A)),\r
+                {ehtml, {'div', [{id, "logo"}] ++ if Is_ek_master -> [{class, "ekMaster"}]; true -> [] end}}.\r
           </erl>\r
           <div id="info" style="display:none" ><div id="icone"></div><div class="close" ></div><div class="message" ></div><div class="buttons"></div></div>\r
           <div id="waitbar" style="display:none" ><div class="image"></div></div>\r
@@@ -83,12 -83,12 +83,12 @@@
                    <erl>\r
                       % parse les styles disponible\r
                       out(A) ->\r
-                         Stlyes_dir = A#arg.docroot ++ "/styles",\r
-                         {ok, Liste_dir} = file:list_dir(Stlyes_dir),\r
+                         Styles_dir = A#arg.docroot ++ "/styles",\r
+                         {ok, Liste_dir} = file:list_dir(Styles_dir),\r
                          {ehtml,\r
                             lists:foldr(\r
                                fun(Dir, Acc) ->\r
-                                  case file:consult(Stlyes_dir ++ "/" ++ Dir ++ "/infos.txt") of\r
+                                  case file:consult(Styles_dir ++ "/" ++ Dir ++ "/infos.txt") of\r
                                      {ok, [{nom, Nom}]} ->\r
                                         [{option, [{value, Dir}], Nom} | Acc];\r
                                      _ ->\r
diff --combined js/euphorik.js
index cac44c8,3f45e2d..893a32a
--- 1/js/euphorik.js
--- 2/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(); },
@@@ -34,16 -34,14 +34,14 @@@
        );
        var client = new euphorik.Client(util, communication);
        var pages = new euphorik.Pages(fragment, communication);
-            
+ 
        // Client authentification with the cookie information (if  it exists).
        client.connectionCookie();
-       
+ 
        $("#menuCss").change(function() { client.setCss("styles/" + $("option:selected", this).attr("value") + "/euphorik.css"); });
  
-       // FIXME : doesn't work under Opera
-       // see : http://dev.jquery.com/ticket/2892#preview
        $(window).unload(function() { client.flush(); });
-       
+ 
        $("#menu .minichat").click(function() { pages.displayPage("minichat"); });
        $("#menu .admin").click(function() { pages.displayPage("admin"); });
        $("#menu .profile").click(function() { pages.displayPage("profile"); });
@@@ -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
     }
  );
diff --cc modules/erl/euphorik_bd_admin.erl
Simple merge
diff --cc modules/erl/euphorik_common.erl
Simple merge
Website http://www.euphorik.ch