Merge branch 'develop' into release-0.16

[pithos-web-client] / src / gr / grnet / pithos / web / public / index.html
diff --git a/src/gr/grnet/pithos/web/public/index.html b/src/gr/grnet/pithos/web/public/index.html

index 905f9f2..180317a 100644 (file)
--- a/src/gr/grnet/pithos/web/public/index.html
+++ b/src/gr/grnet/pithos/web/public/index.html
@@ -1,5 +1,6 @@
+<!DOCTYPE html>
  <!--
-  ~ Copyright 2011-2012 GRNET S.A. All rights reserved.
+  ~ Copyright 2011-2013 GRNET S.A. All rights reserved.
    ~
    ~ Redistribution and use in source and binary forms, with or
    ~ without modification, are permitted provided that the following
@@ -32,7 +33,6 @@
    ~ interpreted as representing official policies, either expressed
    ~ or implied, of GRNET S.A.
    -->
-
  <html>
         <head>
                 <title>Pithos+</title>
@@ -53,16 +53,17 @@
                 <script type="text/javascript" src="browserplus-min.js"></script>
                 <!-- Load plupload and all it's runtimes and finally the jQuery queue widget -->
                 <script type="text/javascript" src="plupload/js/plupload.full.js"></script>
-               <script type="text/javascript" src="plupload/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
-               <script>
-                   var CLOUDBAR_ACTIVE_SERVICE = 'pithos';
-                   var CLOUDBAR_LOCATION = "/static/im/cloudbar/";
-                   var CLOUDBAR_SERVICES = "/im/get_services";
-            var CLOUDBAR_MENU = "/im/get_menu";
-            
-                   $(document).ready(function(){
-                     $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
-                   })
+        <script type="text/javascript" src="plupload/js/jquery.plupload.queue/jquery.plupload.queue.js"></script>
+
+        {% include "pithos_webclient/cloudbar.html" %}
+        <script>
+                       var otherProperties = {
+                               loginUrl: "/im/login?next=",
+                               feedbackUrl: "/feedback",
+                               authCookie: "_pithos2_a",
+                               version: ""
+            };
+            {% include "pithos_webclient/other_properties.html" %}
                 </script>
      </head>
         <body>