Permalink
Browse files

Merge branch 'master' into galleries-refactor

  • Loading branch information...
2 parents 75fb7bf + 21d60cc commit 96161458801b84e86bf28beeeef9cef49caf421a @adahmash adahmash committed Feb 27, 2012
Showing with 66 additions and 6 deletions.
  1. +1 −1 app/views/admin/content_dashboard/news_topics.html.haml
  2. +65 −5 db/seeds.rb
@@ -19,7 +19,7 @@
});
%h1 Populate Newswires With News Topics
-= form_tag news_topics_admin_content_dashboard_path, :method => :post do
+= form_tag news_topics_admin_content_dashboard_index_path, :method => :post do
%p
= check_box_tag "topic_form[use_default_selections]", true, true
= label_tag 'topic_form[use_default_selections]', 'Use our default selections'
View
@@ -573,11 +573,26 @@
:template => "shared/templates/double_col_feature_triple_item"
},
{
- :name => "old_twitter_standard_list",
- :pretty_name => "Old Twitter Standard List",
+ :name => "twitter_standard_list",
+ :pretty_name => "Twitter Standard List",
:template => "shared/sidebar/twitter_standard_list"
},
{
+ :name => "twitter_standard_favorites",
+ :pretty_name => "Twitter Standard Favorites",
+ :template => "shared/sidebar/twitter_standard_favorites"
+ },
+ {
+ :name => "twitter_standard_profile",
+ :pretty_name => "Twitter Standard Profile",
+ :template => "shared/sidebar/twitter_standard_profile"
+ },
+ {
+ :name => "twitter_standard_search",
+ :pretty_name => "Twitter Standard Search",
+ :template => "shared/sidebar/twitter_standard_search"
+ },
+ {
:name => "v2_ad_template",
:pretty_name => "Version 2 Ad Template",
:template => "shared/templates/ad_template"
@@ -1147,8 +1162,8 @@
}
},
{
- :name => "Old Twitter Standard List",
- :template_name => "old_twitter_standard_list",
+ :name => "Twitter Standard List",
+ :template_name => "twitter_standard_list",
:settings => {
:klass_name => "Content",
:locale_title => nil,
@@ -1160,7 +1175,52 @@
:kommands => [
]
}
- },
+ },
+ {
+ :name => "Twitter Standard Favorites",
+ :template_name => "twitter_standard_favorites",
+ :settings => {
+ :klass_name => "Content",
+ :locale_title => nil,
+ :locale_subtitle => nil,
+ :use_post_button => false,
+ :cache_disabled => true,
+ :version => 2,
+ :old_widget => true,
+ :kommands => [
+ ]
+ }
+ },
+ {
+ :name => "Twitter Standard Profile",
+ :template_name => "twitter_standard_profile",
+ :settings => {
+ :klass_name => "Content",
+ :locale_title => nil,
+ :locale_subtitle => nil,
+ :use_post_button => false,
+ :cache_disabled => true,
+ :version => 2,
+ :old_widget => true,
+ :kommands => [
+ ]
+ }
+ },
+ {
+ :name => "Twitter Standard Search",
+ :template_name => "twitter_standard_search",
+ :settings => {
+ :klass_name => "Content",
+ :locale_title => nil,
+ :locale_subtitle => nil,
+ :use_post_button => false,
+ :cache_disabled => true,
+ :version => 2,
+ :old_widget => true,
+ :kommands => [
+ ]
+ }
+ },
{
:name => "Default Ad Small Square",
:template_name => "v2_ad_template",

0 comments on commit 9616145

Please sign in to comment.