Changeset 981

Timestamp:

01/24/10 12:36:30 (3 years ago)

Author:

nick_ramsay

Message:

[Branch] Fix for moving widgets into other widget blocks and switched RSS icon from left to right of RSS Show widget header.

Location:

branches/1.0

Files:

• content/plugins/gravatar/gravatar.php (modified) (1 diff)
• content/plugins/rss_show/rss_show.php (modified) (1 diff)
• content/plugins/whos_online/whos_online.php (modified) (2 diffs)
• content/plugins/widgets/templates/widget_ordering.php (modified) (2 diffs)
• content/plugins/widgets/widgets.php (modified) (2 diffs)
• content/themes/bars/css/search.css (modified) (1 diff)
• content/themes/bars/css/style.css (modified) (1 diff)
• content/themes/bars/index.php (modified) (1 diff)
• libs/Avatar.php (modified) (1 diff)

branches/1.0/content/plugins/gravatar/gravatar.php

@@ -98 +98 @@
             "&r=" . $rating;
             
-        $img_url = "<img class='avatar' src='" . $grav_url . "' " . $resized  ." alt='' />\n";
+        $img_url = "<img class='avatar' src='" . $grav_url . "' " . $resized  ." alt='' />";
         
         return $img_url;

branches/1.0/content/plugins/rss_show/rss_show.php

@@ -73 +73 @@
                 if ($settings['title']) { 
                     $output .= "<h2 class='widget_head rss_show_feed_title'>\n";
+                    if ($feed->get_link()) { $link = $feed->get_link(); } else { $link = $feed->subscribe_url(); }
+                    $output .= "<a href='" . $link . "' title='" . $h->lang["rss_show_title_anchor_title"] . "'>" . $settings['title'] . "</a>";
                     $output .= "<a href='" . $feed->subscribe_url() . "' title='" . $h->lang["rss_show_icon_anchor_title"] . "'>\n";
-                    $output .= "<img src='" . BASEURL . "content/themes/" . THEME . "images/rss_16.png'></a>&nbsp;\n"; // RSS icon
-                    if ($feed->get_link()) { $link = $feed->get_link(); } else { $link = $feed->subscribe_url(); }
-                    $output .= "<a href='" . $link . "' title='" . $h->lang["rss_show_title_anchor_title"] . "'>" . $settings['title'] . "</a></h2>\n"; 
+                    $output .= "<img src='" . BASEURL . "content/themes/" . THEME . "images/rss_16.png'></a>\n"; // RSS icon
+                    $output .= "</h2>\n"; 
                 }
                     

branches/1.0/content/plugins/whos_online/whos_online.php

@@ -138 +138 @@
                 
                 if ($avatars) {
-                    $h->setAvatar($userid, $avatar_size);  
-                    $output .= $h->linkAvatar() . " \n";
+                    $h->setAvatar($userid, $avatar_size);
+                    $output .= $h->linkAvatar();
                 }
                 
@@ -158 +158 @@
         echo $output;
         
-        echo "</div>";
+        echo "</div>\n";
     }
     

branches/1.0/content/plugins/widgets/templates/widget_ordering.php

@@ -48 +48 @@
         if ($widgets) {
             foreach ($widgets as $widget => $details) {
-            
                 if ($details['block'] == $i) {
                     // For the enabled button...
@@ -78 +77 @@
                         echo "<td class='plugins_active widgets_active'>" . $enabled_output . "</td>\n";
                         echo "<td class='table_text'>" . make_name($widget) . " </td>\n";
-                        echo "<td class='plugins_order widgets_order'>" . $order_output . "</td>\n";
+                        echo "<td class='plugins_order widgets_order'>" . $order_output . " " . $details['order'] . " " . $details['block'] . "</td>\n";
                     echo "</tr>\n";
                 }

branches/1.0/content/plugins/widgets/widgets.php

@@ -138 +138 @@
                                 break;
                             } else {
-                                // In different blocks so don't change the order, just the block value
-                                $widgets_settings['widgets'][$this_widget_function]['block']--;
+                                // In different blocks so don't change the order, just the block value (but only if greater than 1)
+                                if ($widgets_settings['widgets'][$this_widget_function]['block'] > 1) {
+                                    $widgets_settings['widgets'][$this_widget_function]['block']--;
+                                }
                             }
                         }
@@ -158 +160 @@
                     foreach ($widgets as $widget => $details) {
                         if ($details['order'] == ($this_widget_order + 1)) {
-                            $widgets_settings['widgets'][$widget]['order'] = $details['order'] - 1;
-                            $widgets_settings['widgets'][$this_widget_function]['order'] = $this_widget_order + 1;
+                            // just increase the block?
+                            if ($widgets_settings['widgets'][$widget]['block'] > $this_widget_block) {
+                                $widgets_settings['widgets'][$this_widget_function]['block']++;
+                            // or increase the order?
+                            } else {
+                                $widgets_settings['widgets'][$widget]['order'] = $details['order'] - 1;
+                                $widgets_settings['widgets'][$this_widget_function]['order'] = $this_widget_order + 1;
+                            }
                             $h->messages[$h->lang['widgets_order_updated']] = 'green';
                             break;

branches/1.0/content/themes/bars/css/search.css

@@ -6 +6 @@
 
 #search_form { padding: 0; text-align: center;}
-#search_form input#search_input { padding: 2px; width: 200px; }
+#search_form input#search_input { padding: 2px; width: 160px; }

branches/1.0/content/themes/bars/css/style.css

@@ -152 +152 @@
 
 /* FOOTER */
-#bottom_background { background: #cc0000; }
+#bottom_background { background: #cc0000; margin-top: 16px; }
 #footer p { margin-top: 16px; }
 

branches/1.0/content/themes/bars/index.php

@@ -39 +39 @@
 // set widths and widget block numbers
 if ($bars['left'] && $bars['right']) { 
-    $bar_width = 6; $content_width = 12;            // BOTH BARS: total 24 (6x2 + 12)
+    $bar_width = 6; $content_width = 11;            // BOTH BARS: total 24 (6x2 + 12)
     $left = 1; $right = 2;
 } elseif (!$bars['left'] && !$bars['right']) {

branches/1.0/libs/Avatar.php

@@ -121 +121 @@
                 $avatar = $value;
             }
-            $output .=  $avatar; // uses the last avatar sent to this hook
+            $output .= $avatar; // uses the last avatar sent to this hook
         }
         $output .= "</a>\n";