Integrate with Astakos toolbar.
authorroot <root@pithos.dev.grnet.gr>
Tue, 14 Feb 2012 13:17:18 +0000 (15:17 +0200)
committerroot <root@pithos.dev.grnet.gr>
Tue, 14 Feb 2012 13:17:18 +0000 (15:17 +0200)
htdocs/index.html
htdocs/okeanos.html
pithos/settings.py

index e75273f..4362495 100644 (file)
   <script src="site_media/js/libs/modernizr-1.7.min.js"></script>
   <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
   <script>
-    var CLOUDBAR_USER_DATA = {'user': 'kpap@grnet.gr', 'logged_in': true};
     var CLOUDBAR_ACTIVE_SERVICE = 'pithos';
-    var CLOUDBAR_LOC = "http://docs.dev.grnet.gr/cloudbar/";
+    var CLOUDBAR_LOCATION = "https://pithos.dev.grnet.gr/im/static/im/cloudbar/";
 
     $(document).ready(function(){
-      $.getScript(CLOUDBAR_LOC + 'servicesbar.js');
+      $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
     })
   </script>
 </head>
index abb0285..d057365 100644 (file)
   
   <link rel="stylesheet" href="site_media/css/site.css">
   <script src="site_media/js/libs/modernizr-1.7.min.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+  <script>
+    var CLOUDBAR_ACTIVE_SERVICE = 'okeanos';
+    var CLOUDBAR_LOCATION = "https://pithos.dev.grnet.gr/im/static/im/cloudbar/";
+
+    $(document).ready(function(){
+      $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
+    })
+  </script>
 </head>
 <body id="index" style="background-position: 0px -200px">
     <div class="container">
index 7d64262..07e94e1 100644 (file)
@@ -104,6 +104,10 @@ LOGGING_SETUP = {
             'class': 'logging.StreamHandler',
             'formatter': 'verbose'
         },
+        'file': {
+            'class': 'logging.FileHandler',
+            'formatter': 'verbose'
+        },
     },
     'loggers': {
         'pithos': {