Merge branch 'master' of https://git.erp5.org/repos/ung

UNGProject/js/jquery/plugin/svg-editor/svg-editor.html

@@ -12,7 +12,7 @@
 
 <!-- Release version of script tags: -->
 
-<script type="text/javascript" src="jquery.js"></script>
+<script type="text/javascript" src="js/jquery/jquery.js"></script>
 <script type="text/javascript" src="hotkeys/jquery.hotkeys.min.js"></script>
 <script type="text/javascript" src="jgraduate/jquery.jgraduate.min.js"></script>
 <script type="text/javascript" src="svgicons/jquery.svgicons.min.js"></script>
@@ -23,7 +23,7 @@
 <script type="text/javascript" src="locale/locale.min.js"></script>
 
 <!-- always minified scripts -->
-<script type="text/javascript" src="jquery-ui.js"></script>
+<script type="text/javascript" src="js/jquery/jquery-ui.js"></script>
 <script type="text/javascript" src="jgraduate/jpicker-1.0.12.min.js"></script>
 
 <!-- feeds -->
@@ -617,4 +617,4 @@
 	</div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

UNGProject/mobile/login-mobile.html

@@ -13,10 +13,10 @@
 
         <title>ERP5 | ERP5</title>
 
-        <link type="text/css" rel="stylesheet" href="css/jquery-ui.css" />
+        <link type="text/css" rel="stylesheet" href="../css/jquery-ui.css" />
         <link type="text/css" rel="stylesheet" href="css/ung-mobile.css" />
-        <script type="text/javascript" src="js/jquery/jquery.js"></script>
-        <script type="text/javascript" src="js/tools.js"></script>
+        <script type="text/javascript" src="../js/jquery/jquery.js"></script>
+        <script type="text/javascript" src="../js/tools.js"></script>
         <script type="text/javascript" src="js/theme-mobile.js"></script>
         <script type="text/javascript" src="js/ung-mobile.js"></script>
         <script type="text/javascript" src="js/login-mobile.js"></script>
@@ -89,7 +89,7 @@
                                                 <div id="advertisement">
                                                     <b>Sign in to edit documents, spreadsheets and drawing and share this document with other users</b>
                                                     <br/>
-                                                    <img src="images/ung/ung-logo.png" alt=""/>
+                                                    <img src="../images/ung/ung-logo.png" alt=""/>
                                                 </div>
                                             </td>
                                             <td>

UNGProject/mobile/ung-mobile.html

@@ -7,8 +7,8 @@
     <link type="text/css" rel="stylesheet" href="css/ung-mobile.css" />
     <link type="text/css" rel="stylesheet" href="css/jquery-ui.css" />
     <link type="text/css" rel="stylesheet" href="css/gadget.css" />
-    <script type="text/javascript" src="js/jquery/jquery.js"></script>
-    <script type="text/javascript" src="js/jquery/jquery-ui.js"></script>
+    <script type="text/javascript" src="../js/jquery/jquery.js"></script>
+    <script type="text/javascript" src="../js/jquery/jquery-ui.js"></script>
     <script type="text/javascript" src="js/tools-mobile.js"></script>
     <script type="text/javascript" src="js/theme-mobile.js"></script>
     <script type="text/javascript" src="js/ung-mobile.js"></script>

UNGProject/table.html

@@ -33,7 +33,7 @@
 
 
     <script type="text/javascript"
-    src="js/jquery/ui/js/jquery-ui.js"></script>
+    src="js/jquery/jquery-ui.js"></script>
 
 
     <script type="text/javascript"

UNGProject/ung.html

@@ -11,7 +11,7 @@
     <meta http-equiv="Content-Script-Type" content="text/javascript" />
     <meta http-equiv="Content-Style-Type" content="text/css" />
 
-    <title>ERP5 | ERP5</title>
+    <title>UNG | UNG Docs</title>
 
     <link type="text/css" rel="stylesheet" href="css/ung.css" />
     <link type="text/css" rel="stylesheet" href="css/jquery-ui.css" />
@@ -632,4 +632,4 @@
             </div>
     </div></div>
 </body>
-</html>
\ No newline at end of file
+</html>

UNGProject/unhosted/jio.js

@@ -9,7 +9,7 @@
      */
     var dependenceLoaded = includeJS([//files to load
         "unhosted/sjcl.js",
-        "unhosted/jquery.js",
+        "js/jquery/jquery.js",
         "unhosted/base64.js"
     ],function() {// return true only if dependencies are loaded
         return (window.$ && window.sjcl && window.Base64) // check jQuery, sjcl & Base64
@@ -968,7 +968,7 @@
      * @param ready : (optional) array of elements allowing to know if dependencies are ready
      * @param instruction : (optional) instruction to execute when dependencies are loaded
      * @return the ready function
-     * @example : includeJS("jquery.js",[$]);
+     * @example : includeJS("js/jquery/jquery.js",[$]);
      */
     function includeJS(url,ready, instruction) {
         //path = findURL("jio.js");

UNGProject/unhosted/login.html

@@ -3,7 +3,7 @@
   <head>
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <script type="text/javascript" src="jquery.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.js"></script>
 
     <script type="text/javascript">
         function getParameters() {

UNGProject/unhosted/register.html

@@ -3,7 +3,7 @@
   <head>
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <script type="text/javascript" src="jquery.js"></script>
+    <script type="text/javascript" src="js/jquery/jquery.js"></script>
     <script type="text/javascript">
         function register() {
             //remember the user
@@ -58,4 +58,4 @@
           </div>
       </form>
   </body>
-</html>
\ No newline at end of file
+</html>