From ba303a2c1dc61d30917e075e927d676ae2b09814 Mon Sep 17 00:00:00 2001
From: Bart Van Der Meerssche <bart.vandermeerssche@flukso.net>
Date: Thu, 1 Oct 2009 10:00:27 +0000
Subject: [PATCH] web: modified some theme css settings to properly display
 pages

---
 web/drupal/themes/flukso/style.css    | 9 +++++++--
 web/drupal/themes/flukso/template.php | 7 +++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/web/drupal/themes/flukso/style.css b/web/drupal/themes/flukso/style.css
index 2448165..0d0c0e7 100644
--- a/web/drupal/themes/flukso/style.css
+++ b/web/drupal/themes/flukso/style.css
@@ -31,7 +31,7 @@ body {
 
 p {
 	margin: 1em 0;
-	padding: 0em 2.6em;
+	padding: 1.5em 2.6em;
 }
 
 h1, h2, h3, h4, h5, h6 {
@@ -267,7 +267,7 @@ h3.searchresult a:hover {
 }
 
 .node .content p {
-        margin: 2em 0;
+        margin: 0 0;
 	letter-spacing: 1px;
 }
 
@@ -367,6 +367,11 @@ br.clear {
 	text-align: center;
 }
 
+#footer p {
+	margin: 1em 0;
+	padding: 0em 2.6em;
+}
+
 /* icons */
 a.read-more,
 .icon-print,
diff --git a/web/drupal/themes/flukso/template.php b/web/drupal/themes/flukso/template.php
index 866a833..a42893e 100644
--- a/web/drupal/themes/flukso/template.php
+++ b/web/drupal/themes/flukso/template.php
@@ -145,6 +145,7 @@ function phptemplate_image_body($node, $size) {
       'editable' => user_access('administer image annotations') || user_access('create image annotations'),
     ));
    
+    module_load_include('module', 'jquery_ui');
     // Load all the JS and CSS magic
     drupal_add_js(array('imageAnnotate' => $settings), 'setting');
     jquery_ui_add(array('ui.resizable', 'ui.draggable'));
@@ -204,7 +205,8 @@ function phptemplate_img_assist_inline($node, $size, $attributes) {
         'top' => $note->position_top,
         'left' => $note->position_left,
         'text' => $text,
-        'editable' => $editable,
+        // notes should be added when residing on the image page
+        'editable' => FALSE,
       );
     }
    
@@ -215,7 +217,8 @@ function phptemplate_img_assist_inline($node, $size, $attributes) {
       'notes' => $notes,
       'editable' => user_access('administer image annotations') || user_access('create image annotations'),
     ));
-   
+
+    module_load_include('module', 'jquery_ui');
     // Load all the JS and CSS magic
     drupal_add_js(array('imageAnnotate' => $settings), 'setting');
     jquery_ui_add(array('ui.resizable', 'ui.draggable'));