Changeset 5898

Timestamp:

08/04/08 13:17:39 (4 months ago)

Author:

uta

Message:

2008/08/04 sync

Files:

• rubricks_core/trunk/themes/asteriksorange/images/icons/icon_message_new.gif (added)
• rubricks_core/trunk/themes/asteriksorange/images/icons/icon_message_new_inactive.gif (added)
• rubricks_core/trunk/themes/asteriksorange/images/icons/icon_new_inactive.gif (added)
• rubricks_core/trunk/themes/asteriksorange/images/icons/icon_simple_arrow_inactive.gif (added)
• rubricks_core/trunk/themes/asteriksorange/stylesheets/icons.css (modified) (1 diff)
• rubricks_core/trunk/themes/rubrickswhite/images/icons/icon_message_new.gif (added)
• rubricks_core/trunk/themes/rubrickswhite/images/icons/icon_message_new_inactive.gif (added)
• rubricks_core/trunk/themes/rubrickswhite/images/icons/icon_new_inactive.gif (added)
• rubricks_core/trunk/themes/rubrickswhite/images/icons/icon_simple_arrow_inactive.gif (added)
• rubricks_core/trunk/themes/rubrickswhite/images/layout/cb_bar.gif (modified) (previous)
• rubricks_core/trunk/themes/rubrickswhite/stylesheets/icons.css (modified) (1 diff)
• rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_block_helper.rb (modified) (1 diff)

rubricks_core/trunk/themes/asteriksorange/stylesheets/icons.css

@@ -793 +793 @@
-  background:                   url(../../../images/themes/asteriksorange/icons/darkicon_week.gif) no-repeat center left;
-}
+
+/*--[Settings for Portal Icons]---------*/
+.portal_icon_arrow_active {
+  background:                   url(../../../images/themes/asteriksorange/icons/icon_simple_arrow.gif) no-repeat center left;
+}
+.portal_icon_arrow_inactive {
+  background:                   url(../../../images/themes/asteriksorange/icons/icon_simple_arrow_inactive.gif) no-repeat center left;
+}
+.portal_icon_message_active {
+  background:                   url(../../../images/themes/asteriksorange/icons/icon_message_new.gif) no-repeat center left;
+}
+.portal_icon_message_inactive {
+  background:                   url(../../../images/themes/asteriksorange/icons/icon_message_new_inactive.gif) no-repeat center left;
+}
+.portal_icon_new_active {
+  background:                   url(../../../images/themes/asteriksorange/icons/icon_new.gif) no-repeat center left;
+}
+.portal_icon_new_inactive {
+  background:                   url(../../../images/themes/asteriksorange/icons/icon_new_inactive.gif) no-repeat center left;
+}

rubricks_core/trunk/themes/rubrickswhite/stylesheets/icons.css

@@ -793 +793 @@
-  background:                   url(../../../images/themes/rubrickswhite/icons/darkicon_week.gif) no-repeat center left;
-}
+
+/*--[Settings for Portal Icons]---------*/
+.portal_icon_arrow_active {
+  background:                   url(../../../images/themes/rubrickswhite/icons/icon_simple_arrow.gif) no-repeat center left;
+}
+.portal_icon_arrow_inactive {
+  background:                   url(../../../images/themes/rubrickswhite/icons/icon_simple_arrow_inactive.gif) no-repeat center left;
+}
+.portal_icon_message_active {
+  background:                   url(../../../images/themes/rubrickswhite/icons/icon_message_new.gif) no-repeat center left;
+}
+.portal_icon_message_inactive {
+  background:                   url(../../../images/themes/rubrickswhite/icons/icon_message_new_inactive.gif) no-repeat center left;
+}
+.portal_icon_new_active {
+  background:                   url(../../../images/themes/rubrickswhite/icons/icon_new.gif) no-repeat center left;
+}
+.portal_icon_new_inactive {
+  background:                   url(../../../images/themes/rubrickswhite/icons/icon_new_inactive.gif) no-repeat center left;
+}

rubricks_core/trunk/vendor/plugins/rubricks/lib/action_view_rubricks_block_helper.rb

@@ -12 +12 @@
-
-      def render_block_bar(&block)
-        content = capture(&block)
-        concat(render_block_bar_begin,  block.binding)
-ntent,         
+mpress(&block),
-        concat(render_block_bar_end,    block.binding)
-      end
-
+      def render_block_bar_button(*args)
+        options = args.flex :type, :title, :onclick
+        options = {
+          :id           => '',
+          :title        => '',
+          :type         => 'arrow',
+          :onclick      => '',
+        }.merge(options)
+        return %Q|<span #{(options[:id].blank?) ? '' : %Q|id="options[:id]"|} class="rubricks_icon portal_icon_#{options[:type].to_s}_inactive swap" title="#{hl(options[:title])}" #{rollover_attributes} onclick="#{(options[:onclick].is_a?(Hash)) ? %Q|rubricks.common.MenuHandler.update_main_contents('#{url_for(options[:onclick])}');| : options[:onclick]}">&nbsp;</span>|
+      end
+
-      private
+      def compress(&block)
+        html    = []
+        content = capture(&block)
+        content.scan(%r|<span[^>]*>&nbsp;</span>|) do
+          html << $~[0]
+        end
+        return "#{html.join('')}&nbsp;"
+      end
+
-      def render_block_bar_begin
-        '<div class="rubricks_cb_bar">'