RELEASE 5.1.0

diplomatiegouvfr · Jan 10, 2018 · 07728ae · 07728ae
1 parent b446444
commit 07728ae
Show file tree

Hide file tree

Showing 154 changed files with 584 additions and 52,343 deletions.
diff --git a/index.html b/index.html
@@ -73,9 +73,6 @@
                 // Tout est correctement chargé, on peut y aller
                 console.log('Chargement de la configuration terminée, chargement de la page');
 
-                // On insère le contenu du tableau
-//                config.dispatcher.stores.NavigationBaseStore.menuItems = menuItems.menu;
-
                 // On insère la conf de l'application
                 root.App = {
                     "plugins": {
@@ -97,12 +94,9 @@
                     "hornet.menuConfig": menuItems.menu
                 };
 
-               root.AppSharedProps = {"appName":"applitutoriel-online","appVersion":"5.1.0","appDescription":"Application tutoriel utilisant le Framework hornet","appAuthor":"MEAE - Ministère de l'Europe et des Affaires étrangères", "welcomePageUrl":"\u002Faccueil"};
-
-
+                root.AppSharedProps = {"appName":"applitutoriel-online","appVersion":"5.1.0","appDescription":"Application tutoriel utilisant le Framework hornet","appAuthor":"MEAE - Ministère de l'Europe et des Affaires étrangères", "welcomePageUrl":"\u002Faccueil"};
                 var themeUrl = config.themeUrl;
-
-                loadFileInDom("/applitutoriel-online/static/img/logoHornet.png", "icon");
+                loadFileInDom("/applitutoriel-online/static/img/logo.png", "icon");
                 loadFileInDom("/applitutoriel-online/static/css/theme.css", "css");
                 loadFileInDom("/applitutoriel-online/static/hornet-themes/css/theme.css", "css");
                 loadFileInDom("/applitutoriel-online/static/js/client.js", "js", "body");

diff --git a/static/html/404.html → static/404.html b/static/html/404.html → static/404.html
@@ -6,8 +6,8 @@
     <link rel="icon" type="image/png" href="img/logoHornet.png"/>
     <title>Erreur 404</title>
     <link rel="stylesheet" type="text/css"
-          href="static-5.1.0-pub/hornet-themes/css/theme.css"/>
-    <link rel="stylesheet" type="text/css" href="static-5.1.0-pub/css/theme.css"/>
+          href="hornet-themes/css/theme.css"/>
+    <link rel="stylesheet" type="text/css" href="css/theme.css"/>
 </head>
 <body>
 <div id="app">
@@ -31,7 +31,7 @@
                                                    href="/applitutoriel/accueil"
                                                    title="Hornet - Retour vers la page d&#x27;accueil "
                                                    id="img-logo"><img
-                                src="static-5.1.0-pub/img/logoHornet.png"
+                                src="img/logoHornet.png"
                                 alt="Application TUTORIEL"/></a></div>
                         <div class="fl mls"><a class="sub-header-link" href="/applitutoriel/accueil"
                                                title="Hornet - Retour vers la page d&#x27;accueil ">
@@ -63,7 +63,7 @@ <h2 class="nfe-title">Oops! Nous ne trouvons pas ce que vous cherchez!</h2><a
                         </li>
                     </ul>
                 </div>
-                <div class="fr mrl"><p>Application TUTORIEL - 5.1.0-pub</p></div>
+                <div class="fr mrl"><p>Application TUTORIEL - v5.1.0</p></div>
             </div>
         </footer>
     </div>

diff --git a/static/config-spa.json b/static/config-spa.json
@@ -1,30 +1,29 @@
 {
-  "contextPath": "applitutoriel-online",
-  "welcomePage": "/accueil",
-  "fullSpa": {
-    "enabled": true,
-    "host": "http://localhost/",
-    "name": "applitutoriel-service",
-    "staticPath": "/static"
-  },
-  "mock": {
-    "enabled": true,
-    "servicePage": {
-        "enabled": true
+  "dispatcher": {
+    "stores": {
+      "PageInformationStore": {
+        "currentUser": {
+          "name": "admin",
+          "roles": [
+            {
+              "id": 1,
+              "name": "AppliTuto_ADMIN"
+            },
+            {
+              "id": 2,
+              "name": "AppliTuto_USER"
+            }
+          ]
+        }
+      },
+      "NavigationBaseStore": {
+        "menuItems": []
+      }
     }
   },
-  "services": {
-    "host": "http://localhost/",
-    "name": "applitutoriel-service"
-  },
-  "themeName": "hornet-themes",
-  "localeI18n": {
-    "locale": "fr-FR",
-    "lang": "fr"
-  },
   "logClient": {
     "remote": false,
-    "level": "DEBUG",
+    "level": "INFO",
     "appenders": [
       {
         "type": "BrowserConsole",
@@ -43,5 +42,30 @@
       }
     ]
   },
-  "themeUrl": "/applitutoriel-online/static/hornet-themes"
+  "mock": {
+    "enabled": true,
+    "servicePage" : {
+      "enabled": true
+    },
+    "serviceData" : {
+      "enabled": true
+    }
+  },
+  "contextPath": "applitutoriel-online",
+  "fullSpa": {
+    "enabled": true,
+    "host": "http://localhost/",
+    "name": "applitutoriel-service",
+    "staticPath": "/static"
+  },
+  "services": {
+    "host": "http://localhost/",
+    "name": "applitutoriel-service"
+  },
+  "themeName": "hornet-themes",
+  "localeI18n": {
+    "locale": "fr-FR",
+    "lang": "fr"
+  },
+  "themeUrl": "/applitutoriel-spa/static/hornet-themes"
 }