diff --git a/.rvmrc b/.rvmrc index c9b4fc50..cf0bc52d 100644 --- a/.rvmrc +++ b/.rvmrc @@ -1 +1 @@ -rvm ruby-1.9.2-p180@rails31rc4 +rvm ruby-1.9.2-p290@rails31rc4 diff --git a/app/assets/images/75.png b/app/assets/images/75.png new file mode 100644 index 00000000..ff8aef6e Binary files /dev/null and b/app/assets/images/75.png differ diff --git a/app/assets/images/Thumbs.db b/app/assets/images/Thumbs.db index a91692c5..964d8da8 100644 Binary files a/app/assets/images/Thumbs.db and b/app/assets/images/Thumbs.db differ diff --git a/app/assets/images/hr_cover.png b/app/assets/images/hr_cover.png new file mode 100644 index 00000000..74ebf486 Binary files /dev/null and b/app/assets/images/hr_cover.png differ diff --git a/app/assets/images/icon.png b/app/assets/images/icon.png index fc8a40ce..597e8dbe 100644 Binary files a/app/assets/images/icon.png and b/app/assets/images/icon.png differ diff --git a/app/assets/images/orbitbar1.png b/app/assets/images/orbitbar1.png new file mode 100644 index 00000000..4f27a0a2 Binary files /dev/null and b/app/assets/images/orbitbar1.png differ diff --git a/app/assets/images/person.png b/app/assets/images/person.png new file mode 100644 index 00000000..653cfaeb Binary files /dev/null and b/app/assets/images/person.png differ diff --git a/app/assets/images/upload_but.png b/app/assets/images/upload_but.png new file mode 100644 index 00000000..300fb2ca Binary files /dev/null and b/app/assets/images/upload_but.png differ diff --git a/app/assets/stylesheets/admin.css.erb b/app/assets/stylesheets/admin.css.erb index 9e318b68..bbd6c92d 100644 --- a/app/assets/stylesheets/admin.css.erb +++ b/app/assets/stylesheets/admin.css.erb @@ -16,7 +16,7 @@ body{ } #panel_banner_link{ - background: url(<%= asset_path "orbitbar.png" %>) repeat-x scroll 0 0; + background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0; height: 52px; left: 0; position: absolute; diff --git a/app/assets/stylesheets/content.css.erb b/app/assets/stylesheets/content.css.erb index 0ec8bd21..2d3cd2d0 100644 --- a/app/assets/stylesheets/content.css.erb +++ b/app/assets/stylesheets/content.css.erb @@ -16,7 +16,7 @@ body{ } #panel_banner_link{ - background: url(<%= asset_path "orbitbar.png" %>) repeat-x scroll 0 0; + background: url(<%= asset_path "orbitbar1.png" %>) repeat-x scroll 0 0; height: 52px; left: 0; position: absolute; diff --git a/app/assets/stylesheets/member.css.erb b/app/assets/stylesheets/member.css.erb index 669e571f..d55f31ea 100644 --- a/app/assets/stylesheets/member.css.erb +++ b/app/assets/stylesheets/member.css.erb @@ -13,6 +13,7 @@ html,body { height:100%; margin:0; font-family: Helvetica, '微軟正黑體'; + overflow-x:hidden } ul { list-style:none; @@ -20,6 +21,17 @@ ul { margin:0; padding:0; } +input{ + border:none; + padding:5px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; +} +input:focus, select:focus, textarea:focus { + outline:none; + -moz-outline-radius: 0; +} .clear:after { content:"."; clear:both; @@ -37,7 +49,7 @@ ul { height: 100%; width:220px; /*background-color:rgba(245,245,245,1);*/ - background-color:rgba(0,0,0,0.75); + background:url(<%= asset_path '75.png' %>) repeat left top; -moz-box-shadow: 3px 0px 4px #472a12; /* Firefox */ -webkit-box-shadow: 3px 0px 4px #472a12;/* Safari 和 Chrome */ box-shadow: 3px 0px 4px #472a12; /* Opera 10.5 + */ @@ -51,9 +63,10 @@ ul { #search input { background:url(<%= asset_path 'search_bg.png' %>) no-repeat left top; border:none; - width:174px; + width:154px; height:20px; - padding-left:20px; + padding: 0 20px; + font-family:Helvetica; } h1 { background:url(<%= asset_path 'h1_bg.png' %>) repeat-x left top; @@ -127,7 +140,7 @@ h1 { padding-top:70px; } .main_list li { - background-color:rgba(0,0,0,0.75); + background:url(<%= asset_path '75.png' %>) repeat left top; margin-bottom:20px; } .main_list li span { @@ -140,7 +153,7 @@ h1 { width:18%; } .main_list li.list_head { - background-color:inherit; + background:none; margin-bottom:10px; } .main_list li.list_head span { @@ -175,7 +188,7 @@ h1 { float: right; width:10%; } -.main_list li .action a{ +#main .action a{ background-image:url(<%= asset_path 'icon.png' %>); text-indent:-9999px; display:inline-block; @@ -184,43 +197,56 @@ h1 { margin-top:8px; margin-right:10px; } -.main_list li .action a.show{ +#main .action a.show{ background-position:left top; } -.main_list li .action a.edit{ +#main .action a.edit{ background-position:-19px top; } -.main_list li .action a.delete{ +#main .action a.delete{ background-position:-38px top; } -.main_list li .action a.show:hover{ - background-position:left bottom; +#main .action a.show:hover{ + background-position:left -19px; } -.main_list li .action a.edit:hover{ - background-position:-19px bottom; +#main .action a.edit:hover{ + background-position:-19px -19px; } -.main_list li .action a.delete:hover{ - background-position:-38px bottom; +#main .action a.delete:hover{ + background-position:-38px -19px; } -.main_list li.list_item .roles { +#main .list_item .roles { background-image:url(<%= asset_path 'roles_type.jpg' %>); background-repeat:repeat-x; border-radius: 5px 0 0 5px; -moz-border-radius: 5px 0 0 5px; -webkit-border-radius: 5px 0 0 5px; } +#roles_list .roles_block .action a{ + margin-top:0; + margin-right:0; +} .student { background-position:0 -5px; } .teacher { background-position:0 -54px; } -#add_new { - margin-bottom: 20px; -} #add_new a { - background-image:url(<%= asset_path 'icon.png' %>); background-position:-54px -17px; +} +#add_new a:hover { + background-position: -54px 3px; +} +#confirm a{ + background-position:4px -70px; +} +#confirm a:hover{ + background-position: 4px -51px; +} +.buttom a { + margin-bottom: 20px; + background-image:url(<%= asset_path 'icon.png' %>); background-repeat:no-repeat; font-size:12px; color:#FFF; @@ -236,9 +262,185 @@ h1 { -webkit-box-shadow: 3px 0px 4px #180902;/* Safari 和 Chrome */ box-shadow: 3px 0px 4px #180902; /* Opera 10.5 + */ } -#add_new a:hover { - background-position: -54px 3px; +.buttom a:hover { color:#000; font-weight:bold; background-color: rgba(255, 255, 255, 1); +} +#porfile{ + padding-top:100px; +} +#porfile h2 { + color: #FFFFFF; + font-weight: normal; + margin: 0; + padding: 0; + text-shadow: 0 3px 2px #000000; + position:absolute; + top:-30px; +} +#porfile label { + display:block; + text-shadow: 0 1px 0 #FFFFFF; + background:url(<%= asset_path 'upload_but.png' %>) repeat-x left top; + height: 25px; + width:110px; + padding: 0 0 0 18px; + border:1px solid #d8d8d8; + margin-top:10px; + color:#666666; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; +} +#porfile label:hover{ + background-position:left bottom; + color:#000; + border:1px solid #a6a6a6; +} +#porfile label input { + border:none; + margin: 6px 15px 0 0; + float:left; +} +#porfile label span { + display:block; + float:left; + line-height:27px; + font-size:12px; +} +.roles_block { + min-width:710px; + margin-bottom:50px; + position:relative; + padding-bottom: 20px; + background:url(<%= asset_path '75.png' %>) repeat left top; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +#user_list .roles_block { + margin-left:180px; +} +#person { + left: 265px; + position: fixed; + top: 75px; +} +#person img { + background-color:#FFF; + padding:5px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + -moz-box-shadow: 0px 0px 4px #180902; /* Firefox */ + -webkit-box-shadow: 0px 0px 4px #180902;/* Safari 和 Chrome */ + box-shadow: 0px 0px 4px #180902; /* Opera 10.5 + */ +} +#upload, #edit{ + display:block; + text-shadow: 0 1px 0 #FFFFFF; + background:url(<%= asset_path 'upload_but.png' %>) repeat-x left top; + height: 25px; + line-height:27px; + color:#666666; + width:128px; + text-align:center; + font-size:12px; + border:1px solid #d8d8d8; + margin-top:10px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; +} +#upload:hover{ + background-position:left bottom; + color:#000; + border:1px solid #a6a6a6; +} +#main hr{ + height:8px; + border:none; + margin:0; + border-radius: 5px 5px 0px 0px; + -moz-border-radius: 5px 5px 0px 0px; + -webkit-border-radius: 5px 5px 0px 0px; + border-bottom:1px solid #000; +} +#basic_block hr{ + background-color:#666666; +} +#teacher_block hr{ + background-color:#0071a9; +} +#student_block hr{ + background-color:#af0045; +} +.info_input { + padding:10px 20px; +} +.info_input table { + color:#fff; + width:100%; + font-size:14px; +} +.info_input table td { + padding:5px 10px 5px 0; + width: 10%; +} +.info_input .list_head { + background:url(<%= asset_path 'line.png' %>) left bottom repeat-x; +} +.info_input .list_head td { +} +.info_input .list_item { + color:#AEAEAE; +} +.info_input .add { + display:block; + padding-left:22px; + font-size:12px; + line-height:21px; + height:19px; + background:url(<%= asset_path 'icon.png' %>) no-repeat -59px 0; + margin-top: 10px; + color: #DDDDDD; +} +.info_input .add:hover { + color:#FFF; + background-position:-59px -19px; +} +.info_input li { + height:30px; + margin-bottom: 5px; +} +.info_input li span { + display:inline-block; + float:left; + color:#fff; + font-size:14px; + line-height:30px; + margin-right:10px; +} +#user_list .info_input li span { + width: 25%; +} +#roles_list .info_input li span { + width:15%; +} +.info_input li span:last-child { +} +#person select { + background:url(<%= asset_path 'upload_but.png' %>) repeat-x left top; + border:1px solid #d8d8d8; + margin-top: 10px; + width: 130px; + padding:3px 6px 3px 14px; + border-radius: 5px; + -moz-border-radius: 5px; + -webkit-border-radius: 5px; + border:none; } \ No newline at end of file diff --git a/app/assets/stylesheets/messy.css.erb b/app/assets/stylesheets/messy.css.erb index 6646b7ca..3cc491d8 100644 --- a/app/assets/stylesheets/messy.css.erb +++ b/app/assets/stylesheets/messy.css.erb @@ -8,7 +8,7 @@ body{ padding: 0; } #hmenu{ - background:url(<%= asset_path 'orbitbar.png' %>) repeat-x 0 0; + background:url(<%= asset_path 'orbitbar1.png' %>) repeat-x 0 0; height: 50px; position:fixed; top:0; diff --git a/app/models/user/attribute_model.rb b/app/models/user/attribute_model.rb index 0bd5b3ca..d2cb8a1a 100644 --- a/app/models/user/attribute_model.rb +++ b/app/models/user/attribute_model.rb @@ -29,7 +29,8 @@ class AttributeModel if self.i18n_variable_id self.i18n_variable.update_attributes(attr) else - var = I18nVariable.new(attr.merge({:key => self.key, :document_class => self.class, :parent_id => self.user_attribute_model.i18n_variable_id})) + # var = I18nVariable.new(attr.merge({:key => self.key, :document_class => self.class, :parent_id => self.user_attribute_model.i18n_variable_id})) + var = I18nVariable.new(attr.merge({:key => self.key, :document_class => self.class})) var.save self.i18n_variable_id = var.id end diff --git a/app/models/user/user.rb b/app/models/user/user.rb index 7eec8145..f582dc04 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -8,12 +8,11 @@ class User mount_uploader :avatar, AvatarUploader field :admin, :type => Boolean, :default => true - field :active_roles, :type => Array + field :active_role has_many :user_attributes has_many :user_roles has_many :user_infos - before_save :clean_active_roles # Update or create the user_role records def user_roles=(*attrs) @@ -49,21 +48,6 @@ class User self.user_roles.detect {|a| a.key.to_s == key.to_s } end - # Get the active user_role_models - def get_active_role_models - self.active_roles.map{ |role| get_role_model(role) } rescue [] - end - - # Get an user_role_model from key - def get_role_model(key) - UserRoleModel.first(:conditions => {:key => key}) - end - - # Get the active roles names or default to '-' - def get_roles - (self.active_roles.nil? || self.active_roles.empty?) ? '-' : self.active_roles.map{|role| I18nVariable.first(:conditions => {:key => role})[I18n.locale] rescue role}.join(' / ') - end - def name infos = self.user_infos.detect {|info| info.key.to_s.eql?('profile') } if infos @@ -75,11 +59,4 @@ class User end end - protected - - # Remove empty values - def clean_active_roles - self.active_roles.delete('') if self.active_roles - end - end diff --git a/app/models/user/user_role_model.rb b/app/models/user/user_role_model.rb index b35fce32..d5271edd 100644 --- a/app/models/user/user_role_model.rb +++ b/app/models/user/user_role_model.rb @@ -1,3 +1,8 @@ class UserRoleModel < UserAttributeModel + # Get an user_role_model from key + def self.get_role_model_from_key(key) + self.first(:conditions => {:key => key}) + end + end diff --git a/app/views/admin/user_attribute_models/_attribute_model.html.erb b/app/views/admin/user_attribute_models/_attribute_model.html.erb index e8ad4854..10dac715 100644 --- a/app/views/admin/user_attribute_models/_attribute_model.html.erb +++ b/app/views/admin/user_attribute_models/_attribute_model.html.erb @@ -1,26 +1,26 @@ <%= fields_for "user_#{@attribute}_model[attribute_models][]", attribute_model, :index => nil do |f| %> - - - <%= attribute_model.new_record? ? (f.text_field :key, {:style => "width:130px"}) : attribute_model.key %> - - <%= check_box_tag "locale[]", value = '', attribute_model.locale.nil? ? true : attribute_model.locale %> - <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][locale]", attribute_model.locale.nil? ? true : attribute_model.locale %> - - <% @site_valid_locales.each do |locale| %> - <%= text_field_tag "user_#{@attribute}_model[attribute_models][][i18n_variable][#{locale}]", (attribute_model.i18n_variable[locale] rescue nil), :style => "width:130px" %> - <% end %> - - <%= f.select :markup, LIST[:markups], {}, {:style => "width:90px"} %> -
> - <%= t('admin.options') %>: - <%= text_field_tag "user_#{@attribute}_model[attribute_models][][select_list_options]", attribute_model.select_list_options, :style => "width:130px" %> -
- - - <% if attribute_model.new_record? %> - (<%= t(:delete) %>) - <% else %> - + + <%= attribute_model.new_record? ? (f.text_field :key) : attribute_model.key %> + + <%= check_box_tag "locale[]", value = '', attribute_model.locale.nil? ? true : attribute_model.locale %> + <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][locale]", attribute_model.locale.nil? ? true : attribute_model.locale %> + + <% @site_valid_locales.each do |locale| %> + <%= text_field_tag "user_#{@attribute}_model[attribute_models][][i18n_variable][#{locale}]", (attribute_model.i18n_variable[locale] rescue nil), :style => "width:130px" %> + <% end %> + + <%= f.select :markup, LIST[:markups], {}, {:style => "width:90px"} %> +
> + <%= t('admin.options') %>: + <%= text_field_tag "user_#{@attribute}_model[attribute_models][][select_list_options]", attribute_model.select_list_options, :style => "width:130px" %> +
+ + + + <% if attribute_model.new_record? %> + <%= t(:delete) %> + <% else %> + <% if attribute_model.is_built_in? %> <%= t(:disable) %> @@ -28,13 +28,13 @@ <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][disabled]", attribute_model.is_disabled? , :class => 'built_in_state' %> <% else %> - (<%= t(:delete) %>) - <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][should_destroy]", nil , :class => 'should_destroy' %> + <%= t(:delete) %> + <%= hidden_field_tag "user_#{@attribute}_model[attribute_models][][should_destroy]", nil , :class => 'should_destroy' %> <% end %> - <%= f.hidden_field :id %> - <%= f.hidden_field :key %> - <% end %> - - - -<% end %> + <%= f.hidden_field :id %> + <%= f.hidden_field :key %> + <% end %> + + + +<% end %> \ No newline at end of file diff --git a/app/views/admin/user_attribute_models/_form.html.erb b/app/views/admin/user_attribute_models/_form.html.erb index 3b8a0b5f..f7325ec2 100644 --- a/app/views/admin/user_attribute_models/_form.html.erb +++ b/app/views/admin/user_attribute_models/_form.html.erb @@ -1,59 +1,73 @@ - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - -
<%= t('admin.key') %><%= locale %>
<%= is_new ? (f.text_field :key, {:style => "width:130px"}) : @user_attribute_model.key %> - <%= text_field_tag "user_#{@attribute}_model[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :style => "width:130px" %> -
- -
- - <%= t('admin.attributes')%> - - - - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - - - <%= render :partial => 'admin/user_attribute_models/attribute_model', :collection => @user_attribute_model.attribute_models %> -
<%= t('admin.key') %><%= t('admin.multilingual') %><%= locale %><%= t('admin.type')%>
- - (<%= t(:add) %>) -
+
+

User Role

+
+ + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + +
<%= t('admin.key') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
<%= is_new ? (f.text_field :key, {:style => "width:150px"}) : @user_attribute_model.key %> + <%= text_field_tag "user_#{@attribute}_model[i18n_variable][#{locale}]", (@i18n_variable[locale] if @i18n_variable), :style => "width:150px" %> +
+
+
+
+

Attributes

+
+ + + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + + + + + + + + + <%= render :partial => 'admin/user_attribute_models/attribute_model', :collection => @user_attribute_model.attribute_models %> + +
<%= t('admin.key') %><%= t('admin.multilingual') %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %><%= t('admin.type')%> 
<%= t(:add) %>
+
+
<% content_for :page_specific_javascript do %> <% end -%> diff --git a/app/views/admin/users/_show_user_attribute.html.erb b/app/views/admin/users/_show_user_attribute.html.erb index 2531f29a..a6468944 100644 --- a/app/views/admin/users/_show_user_attribute.html.erb +++ b/app/views/admin/users/_show_user_attribute.html.erb @@ -1,17 +1,27 @@ -
- <%= am.i18n_variable[I18n.locale] %> - - <% am.get_enabled_attribute_models.each do |attr| %> - - - - - <% end %> -
<%= attr.i18n_variable[I18n.locale] %> - <% if attr["locale"] && attr["markup"] == 'text_field' %> - <%= show_user_attribute(object, attr.key, I18n.locale) %> - <% else %> - <%= show_user_attribute(object, attr.key) %> - <% end %> -
-
+
+ + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + <% am.get_enabled_attribute_models.each do |attr| %> + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + <% end %> + +
<%= t("admin.key") %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
<%= attr.i18n_variable[I18n.locale] %> + <% if attr["locale"] && attr["markup"] == 'text_field' %> + <%= show_user_attribute(object, attr.key, locale) %> + <% else %> + <%= show_user_attribute(object, attr.key) %> + <% end %> +
+
\ No newline at end of file diff --git a/app/views/admin/users/_user_attribute.html.erb b/app/views/admin/users/_user_attribute.html.erb index f9e4fd76..1ee17890 100644 --- a/app/views/admin/users/_user_attribute.html.erb +++ b/app/views/admin/users/_user_attribute.html.erb @@ -1,42 +1,44 @@ <%= fields_for "user[user_#{type}s]", user_attribute, :index => nil do |f| %> - <%= ua.i18n_variable[I18n.locale] %> <%= f.hidden_field :key, :value => ua.key %> <%= f.hidden_field :id unless user_attribute.new_record? %> - - - - - <% @site_valid_locales.each do |locale| %> - - <% end %> - - - <% ua.get_enabled_attribute_models.each do |attr| %> - <% value = user_attribute.attribute_values.detect{|v| v.key == attr.key } %> - <%= hidden_field_tag "user[user_#{type}s][][attribute_values][][id]", value.id rescue nil %> - <%= hidden_field_tag "user[user_#{type}s][][attribute_values][][key]", attr.key %> - - - <% if attr["locale"] && attr["markup"] == 'text_field' %> - <%= hidden_field_tag "user[user_#{type}s][][attribute_values][][non_locale]", nil %> - <% @site_valid_locales.each do |locale| %> - - <% end -%> - <% else %> - - <% end -%> - - <% end %> - -
<%= t("admin.key") %><%= locale %>
<%= attr.i18n_variable[I18n.locale] %> - <%= text_field_tag "user[user_#{type}s][][attribute_values][][#{locale}]", (value[locale] rescue nil) %> - > - <% if attr["markup"] == "text_field" %> - <%= text_field_tag "user[user_#{type}s][][attribute_values][][non_locale]", (value['non_locale'] rescue nil) %> - <% elsif attr["markup"] == "select" %> - <%= select_tag "user[user_#{type}s][][attribute_values][][non_locale]", options_for_select(attr["options"], value['non_locale']) %> - <% end -%> -
+
+ + + + + <% @site_valid_locales.each do |locale| %> + + <% end %> + + + + <% ua.get_enabled_attribute_models.each do |attr| %> + <% value = user_attribute.attribute_values.detect{|v| v.key == attr.key } %> + <%= hidden_field_tag "user[user_#{type}s][][attribute_values][][id]", value.id rescue nil %> + <%= hidden_field_tag "user[user_#{type}s][][attribute_values][][key]", attr.key %> + + + <% if attr["locale"] && attr["markup"] == 'text_field' %> + <%= hidden_field_tag "user[user_#{type}s][][attribute_values][][non_locale]", nil %> + <% @site_valid_locales.each do |locale| %> + + <% end -%> + <% else %> + + <% end -%> + + <% end %> + +
<%= t("admin.key") %><%= I18nVariable.first(:conditions => {:key => locale})[I18n.locale] %>
<%= attr.i18n_variable[I18n.locale] %> + <%= text_field_tag "user[user_#{type}s][][attribute_values][][#{locale}]", (value[locale] rescue nil) %> + > + <% if attr["markup"] == "text_field" %> + <%= text_field_tag "user[user_#{type}s][][attribute_values][][non_locale]", (value['non_locale'] rescue nil) %> + <% elsif attr["markup"] == "select" %> + <%= select_tag "user[user_#{type}s][][attribute_values][][non_locale]", options_for_select(attr["options"], value['non_locale']) %> + <% end -%> +
+
<% end %> diff --git a/app/views/admin/users/edit.html.erb b/app/views/admin/users/edit.html.erb index 1e4f9134..43053c4f 100644 --- a/app/views/admin/users/edit.html.erb +++ b/app/views/admin/users/edit.html.erb @@ -1,19 +1,21 @@ +<% content_for :body_id do %>user_list<% end -%> + <% content_for :secondary do %> - +
+

Member Setup

+ +
<% end -%> -<%= flash_messages %> - -

<%= t('admin.user_panel') %>

- -<%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %> - <%= f.error_messages %> +
+ <%= form_for @user, :url => admin_user_path(@user), :html => { :multipart => true } do |f| %> + <%= f.error_messages %> <%= render :partial => 'form', :locals => { :f => f } %> - -

- <%= f.submit t(:update) %> <%= link_back %> -

- -<% end -%> +
+ <%= f.submit t('update') %> <%= link_back %> +
+ <% end -%> +
\ No newline at end of file diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index 86d8e209..72c8179d 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -1,42 +1,46 @@ +<% content_for :body_id do %>user_list<% end -%> + <% content_for :secondary do %> -
-
-

Member Setup

- -
+
+

Member Setup

+
<% end -%> -<%= flash_messages %> -
- <%= link_to t('admin.new_user'), new_admin_user_path %> -
- +
+ <%= link_to t('admin.new_user'), new_admin_user_path %> +
diff --git a/app/views/admin/users/new.html.erb b/app/views/admin/users/new.html.erb index 855493c4..9a3a866f 100644 --- a/app/views/admin/users/new.html.erb +++ b/app/views/admin/users/new.html.erb @@ -1,18 +1,26 @@ +<% content_for :body_id do %>user_list<% end -%> + <% content_for :secondary do %> - +
+

Member Setup

+ +
<% end -%> -

<%= t('admin.user_panel') %>

+
+ <%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %> + <%= f.error_messages %> + <%= render :partial => 'form', :locals => { :f => f } %> +
+ <%= f.submit t('create') %> <%= link_back %> +
+ <% end -%> +
+ + -<%= form_for @user, :url => admin_users_path, :html => { :multipart => true } do |f| %> - <%= f.error_messages %> - <%= render :partial => 'form', :locals => { :f => f } %> -

- <%= f.submit t(:create) %> <%= link_back %> -

- -<% end -%> diff --git a/app/views/admin/users/show.html.erb b/app/views/admin/users/show.html.erb index 7024387a..7e4b5ab6 100644 --- a/app/views/admin/users/show.html.erb +++ b/app/views/admin/users/show.html.erb @@ -1,29 +1,40 @@ +<% content_for :body_id do %>user_list<% end -%> + <% content_for :secondary do %> - +
+

Member Setup

+ +
<% end -%> -

<%= t('admin.user_panel') %>

+
+ +
+ <% if @user.avatar? %> + <%= image_tag(@user.avatar.thumb.url) %> + <% else %> + <%= image_tag "person.png" %> + <% end %> + <%= link_to t(:edit), edit_admin_user_path(@user), :id => 'edit' %> +
+ + <% @user_info_models.each do |am| %> +
+

<%= am.i18n_variable[I18n.locale] %>

+
+ <%= render :partial => 'show_user_attribute', :locals => {:am => am, :object => @user.get_info_from_model_key(am.key)} %> +
+ <% end -%> -<%= image_tag(@user.avatar.thumb.url) rescue nil %> +
+ <% active_role = UserRoleModel.get_role_model_from_key(@user.active_role) %> +

<%= active_role.i18n_variable[I18n.locale] %>

+
+ <%= render :partial => 'show_user_attribute', :locals => {:am => active_role, :object => @user.get_role_from_model_key(active_role.key)} %> +
+ +
-<%= @user.email %> - -<% if @user_info_models %> -
- <%= t('admin.info') %> - <% @user_info_models.each do |am| %> - <%= render :partial => 'show_user_attribute', :locals => {:am => am, :object => @user.get_info_from_model_key(am.key)} %> - <% end -%> -
-<% end %> - -<% if @user.active_roles.size > 0 %> -
- <%= t('admin.roles') %> - <% @user.get_active_role_models.each do |am| %> - <%= render :partial => 'show_user_attribute', :locals => {:am => am, :object => @user.get_role_from_model_key(am.key)} %> - <% end -%> -
-<% end %> diff --git a/app/views/layouts/member.html.erb b/app/views/layouts/member.html.erb index 6d8d9517..5cffe7b4 100644 --- a/app/views/layouts/member.html.erb +++ b/app/views/layouts/member.html.erb @@ -12,7 +12,7 @@ <%= csrf_meta_tag %> - +
@@ -35,8 +35,7 @@
-
- <%= yield %> + <%= yield %>
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 4603c2a2..975ed336 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -13,7 +13,7 @@ namespace :dev do Site.create( :school => 'The Best School', :department => 'Awesome', :valid_locales => [ 'en', 'zh_tw' ], :in_use_locales => [ 'zh_tw', 'en' ]) - user = User.new( :email => 'chris@rulingcom.com', :password => 'password', :password_confirmation => 'password', :admin => true, :active_roles => ['teacher']) + user = User.new( :email => 'chris@rulingcom.com', :password => 'password', :password_confirmation => 'password', :admin => true, :active_role => 'teacher') user.user_roles.build(:key => 'teacher', :discipline_en => 'Database', :discipline_zh_tw => '資料庫' ) user.save! diff --git a/vendor/plugins/NewBlog/.gitignore b/vendor/plugins/NewBlog/.gitignore new file mode 100644 index 00000000..1463de6d --- /dev/null +++ b/vendor/plugins/NewBlog/.gitignore @@ -0,0 +1,6 @@ +.bundle/ +log/*.log +pkg/ +test/dummy/db/*.sqlite3 +test/dummy/log/*.log +test/dummy/tmp/ \ No newline at end of file diff --git a/vendor/plugins/NewBlog/Gemfile b/vendor/plugins/NewBlog/Gemfile new file mode 100644 index 00000000..52a1640b --- /dev/null +++ b/vendor/plugins/NewBlog/Gemfile @@ -0,0 +1,16 @@ +source "http://rubygems.org" + +# Declare your gem's dependencies in NewBlog.gemspec. +# Bundler will treat runtime dependencies like base dependencies, and +# development dependencies will be added by default to the :development group. + +gem "mongoid" +gemspec + +# Declare any dependencies that are still in development here instead of in +# your gemspec. These might include edge Rails or gems from your path or +# Git. Remember to move these dependencies to your gemspec before releasing +# your gem to rubygems.org. + +# To use debugger +# gem 'ruby-debug19', :require => 'ruby-debug' diff --git a/vendor/plugins/NewBlog/Gemfile.lock b/vendor/plugins/NewBlog/Gemfile.lock new file mode 100644 index 00000000..e986f6fe --- /dev/null +++ b/vendor/plugins/NewBlog/Gemfile.lock @@ -0,0 +1,101 @@ +PATH + remote: . + specs: + NewBlog (0.0.1) + rails (~> 3.1.0.rc6) + +GEM + remote: http://rubygems.org/ + specs: + actionmailer (3.1.0) + actionpack (= 3.1.0) + mail (~> 2.3.0) + actionpack (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + builder (~> 3.0.0) + erubis (~> 2.7.0) + i18n (~> 0.6) + rack (~> 1.3.2) + rack-cache (~> 1.0.3) + rack-mount (~> 0.8.2) + rack-test (~> 0.6.1) + sprockets (~> 2.0.0) + activemodel (3.1.0) + activesupport (= 3.1.0) + bcrypt-ruby (~> 3.0.0) + builder (~> 3.0.0) + i18n (~> 0.6) + activerecord (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + arel (~> 2.2.1) + tzinfo (~> 0.3.29) + activeresource (3.1.0) + activemodel (= 3.1.0) + activesupport (= 3.1.0) + activesupport (3.1.0) + multi_json (~> 1.0) + arel (2.2.1) + bcrypt-ruby (3.0.0) + bson (1.3.1) + builder (3.0.0) + erubis (2.7.0) + hike (1.2.1) + i18n (0.6.0) + mail (2.3.0) + i18n (>= 0.4.0) + mime-types (~> 1.16) + treetop (~> 1.4.8) + mime-types (1.16) + mongo (1.3.1) + bson (>= 1.3.1) + mongoid (2.1.9) + activemodel (~> 3.0) + mongo (~> 1.3) + tzinfo (~> 0.3.22) + multi_json (1.0.3) + polyglot (0.3.2) + rack (1.3.2) + rack-cache (1.0.3) + rack (>= 0.4) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-ssl (1.3.2) + rack + rack-test (0.6.1) + rack (>= 1.0) + rails (3.1.0) + actionmailer (= 3.1.0) + actionpack (= 3.1.0) + activerecord (= 3.1.0) + activeresource (= 3.1.0) + activesupport (= 3.1.0) + bundler (~> 1.0) + railties (= 3.1.0) + railties (3.1.0) + actionpack (= 3.1.0) + activesupport (= 3.1.0) + rack-ssl (~> 1.3.2) + rake (>= 0.8.7) + rdoc (~> 3.4) + thor (~> 0.14.6) + rake (0.9.2) + rdoc (3.9.4) + sprockets (2.0.0) + hike (~> 1.2) + rack (~> 1.0) + tilt (!= 1.3.0, ~> 1.1) + thor (0.14.6) + tilt (1.3.3) + treetop (1.4.10) + polyglot + polyglot (>= 0.3.1) + tzinfo (0.3.29) + +PLATFORMS + ruby + +DEPENDENCIES + NewBlog! + mongoid diff --git a/vendor/plugins/NewBlog/MIT-LICENSE b/vendor/plugins/NewBlog/MIT-LICENSE new file mode 100644 index 00000000..80cf031a --- /dev/null +++ b/vendor/plugins/NewBlog/MIT-LICENSE @@ -0,0 +1,20 @@ +Copyright 2011 YOURNAME + +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/plugins/NewBlog/NewBlog.gemspec b/vendor/plugins/NewBlog/NewBlog.gemspec new file mode 100644 index 00000000..93e5b31d --- /dev/null +++ b/vendor/plugins/NewBlog/NewBlog.gemspec @@ -0,0 +1,23 @@ +$:.push File.expand_path("../lib", __FILE__) + +# Maintain your gem's version: +require "NewBlog/version" + +# Describe your gem and declare its dependencies: +Gem::Specification.new do |s| + s.name = "NewBlog" + s.version = NewBlog::VERSION + s.authors = ["TODO: Your name"] + s.email = ["TODO: Your email"] + s.homepage = "TODO" + s.summary = "TODO: Summary of NewBlog." + s.description = "TODO: Description of NewBlog." + + s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"] + s.test_files = Dir["test/**/*"] + + s.add_dependency "rails", "~> 3.1.0.rc6" + # s.add_dependency "jquery-rails" + + #s.add_development_dependency "sqlite3" +end diff --git a/vendor/plugins/NewBlog/NewBlog.json b/vendor/plugins/NewBlog/NewBlog.json new file mode 100644 index 00000000..0197b9d0 --- /dev/null +++ b/vendor/plugins/NewBlog/NewBlog.json @@ -0,0 +1,9 @@ +{ + "name_of_app": "NewBlog", + "version": "0.1", + "organization": "Rulingcom", + "author": "RD dep", + "intro": "A simple blog……", + "update_info": "Some info", + "create_date": "11-11-2011" +} \ No newline at end of file diff --git a/vendor/plugins/NewBlog/README.rdoc b/vendor/plugins/NewBlog/README.rdoc new file mode 100644 index 00000000..4845c91f --- /dev/null +++ b/vendor/plugins/NewBlog/README.rdoc @@ -0,0 +1,3 @@ += NewBlog + +This project rocks and uses MIT-LICENSE. \ No newline at end of file diff --git a/vendor/plugins/NewBlog/Rakefile b/vendor/plugins/NewBlog/Rakefile new file mode 100644 index 00000000..01e88eef --- /dev/null +++ b/vendor/plugins/NewBlog/Rakefile @@ -0,0 +1,39 @@ +#!/usr/bin/env rake +begin + require 'bundler/setup' +rescue LoadError + puts 'You must `gem install bundler` and `bundle install` to run rake tasks' +end +begin + require 'rdoc/task' +rescue LoadError + require 'rdoc/rdoc' + require 'rake/rdoctask' + RDoc::Task = Rake::RDocTask +end + +RDoc::Task.new(:rdoc) do |rdoc| + rdoc.rdoc_dir = 'rdoc' + rdoc.title = 'NewBlog' + rdoc.options << '--line-numbers' + rdoc.rdoc_files.include('README.rdoc') + rdoc.rdoc_files.include('lib/**/*.rb') +end + +APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__) +load 'rails/tasks/engine.rake' + + +Bundler::GemHelper.install_tasks + +require 'rake/testtask' + +Rake::TestTask.new(:test) do |t| + t.libs << 'lib' + t.libs << 'test' + t.pattern = 'test/**/*_test.rb' + t.verbose = false +end + + +task :default => :test diff --git a/vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep b/vendor/plugins/NewBlog/app/assets/images/NewBlog/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep b/vendor/plugins/NewBlog/app/assets/javascripts/NewBlog/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css new file mode 100644 index 00000000..69b4b126 --- /dev/null +++ b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/application.css @@ -0,0 +1,7 @@ +/* + *This is a manifest file that'll automatically include all the stylesheets available in this directory + *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + *the top of the compiled file, but it's generally better to create a new file per style scope. + *= require_self + *= require_tree . +*/ diff --git a/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css new file mode 100644 index 00000000..202a62a4 --- /dev/null +++ b/vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css @@ -0,0 +1,21 @@ +.preview h2 { + font-size: large; + background-color: red; + } + +.production h2 { + font-size: large; + background-color: green; + } + +.widget_index { + width: 200px; + height: 120px; + border: solid; +} + +.widget_latest_post{ + width: 200px; + height: 120px; + border: solid; +} \ No newline at end of file diff --git a/vendor/plugins/NewBlog/app/controllers/.gitkeep b/vendor/plugins/NewBlog/app/controllers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/controllers/application_controller.rb b/vendor/plugins/NewBlog/app/controllers/application_controller.rb new file mode 100644 index 00000000..307a4acd --- /dev/null +++ b/vendor/plugins/NewBlog/app/controllers/application_controller.rb @@ -0,0 +1,23 @@ +class ApplicationController < ActionController::Base + protect_from_forgery + before_filter :set_locale + + # Set I18n.locale + def set_locale + # update session if passed + session[:locale] = params[:locale] if params[:locale] + + # set locale based on session or default + begin + # check if locale is valid for non site pages + if !VALID_LOCALES.include?(session[:locale]) + I18n.locale = I18n.default_locale + else + I18n.locale = session[:locale] + end + rescue + I18n.locale = I18n.default_locale + end + end + +end diff --git a/vendor/plugins/NewBlog/app/controllers/panel/blog/comments_controller.rb b/vendor/plugins/NewBlog/app/controllers/panel/blog/comments_controller.rb new file mode 100644 index 00000000..971f58a6 --- /dev/null +++ b/vendor/plugins/NewBlog/app/controllers/panel/blog/comments_controller.rb @@ -0,0 +1,7 @@ +class Panel::Blog::CommentsController < ApplicationController + def create + @post = Post.find(params[:post_id]) + @comment = @post.comments.create!(params[:comment]) + redirect_to panel_blog_post_url(@post) + end +end \ No newline at end of file diff --git a/vendor/plugins/NewBlog/app/controllers/panel/blog/posts_controller.rb b/vendor/plugins/NewBlog/app/controllers/panel/blog/posts_controller.rb new file mode 100644 index 00000000..41468846 --- /dev/null +++ b/vendor/plugins/NewBlog/app/controllers/panel/blog/posts_controller.rb @@ -0,0 +1,111 @@ +class Panel::Blog::PostsController < ApplicationController + + layout 'admin' + + # GET /posts + # GET /posts.xml + def widget_index + @posts = Post.all + widget_default_layout + end + def widget_latest_post + @post = Post.all.last + widget_default_layout + end + def index + @posts = Post.all + + respond_to do |format| + format.html # index.html.erb + format.xml { render :xml => @posts } + end + end + + # GET /posts/1 + # GET /posts/1.xml + def show + @post = Post.find(params[:id]) + + respond_to do |format| + format.html # show.html.erb + format.xml { render :xml => @post } + end + end + + # GET /posts/new + # GET /posts/new.xml + def new + @post = Post.new + + respond_to do |format| + format.html # new.html.erb + format.xml { render :xml => @post } + end + end + + # GET /posts/1/edit + def edit + @post = Post.find(params[:id]) + end + + # POST /posts + # POST /posts.xml + def create + @post = Post.new(params[:post]) + + respond_to do |format| + if @post.save + format.html { redirect_to(panel_blog_post_url(@post), :notice => t('blog.create_post_success')) } + format.xml { render :xml => @post, :status => :created, :location => @post } + else + format.html { render :action => "new" } + format.xml { render :xml => @post.errors, :status => :unprocessable_entity } + end + end + end + + # PUT /posts/1 + # PUT /posts/1.xml + def update + @post = Post.find(params[:id]) + + respond_to do |format| + if @post.update_attributes(params[:post]) + format.html { redirect_to(panel_blog_post_url(@post), :notice => t('blog.update_post_success')) } + format.xml { head :ok } + else + format.html { render :action => "edit" } + format.xml { render :xml => @post.errors, :status => :unprocessable_entity } + end + end + end + + # DELETE /posts/1 + # DELETE /posts/1.xml + def destroy + @post = Post.find(params[:id]) + @post.destroy + + respond_to do |format| + format.html { redirect_to(panel_blog_posts_url) } + format.xml { head :ok } + end + end +end + + +def widget_default_layout + respond_to do |format| + format.html { + if params[:edit_view] + #in the case of editing,should be displayed in modal window and + #be restricted by the border developer sat. + render :layout => 'admin' + else + #in the case of fetching data for ajax display,should + render :layout => 'production' + end + } + format.xml { render :xml => @posts } + end +end diff --git a/vendor/plugins/NewBlog/app/helpers/.gitkeep b/vendor/plugins/NewBlog/app/helpers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/helpers/application_helper.rb b/vendor/plugins/NewBlog/app/helpers/application_helper.rb new file mode 100644 index 00000000..de6be794 --- /dev/null +++ b/vendor/plugins/NewBlog/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/vendor/plugins/NewBlog/app/mailers/.gitkeep b/vendor/plugins/NewBlog/app/mailers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/models/.gitkeep b/vendor/plugins/NewBlog/app/models/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/models/comment.rb b/vendor/plugins/NewBlog/app/models/comment.rb new file mode 100644 index 00000000..a85b7a43 --- /dev/null +++ b/vendor/plugins/NewBlog/app/models/comment.rb @@ -0,0 +1,7 @@ +class Comment + include Mongoid::Document + include Mongoid::Timestamps + field :name, :type => String + field :body, :type => String + embedded_in :post, :inverse_of => :comments +end \ No newline at end of file diff --git a/vendor/plugins/NewBlog/app/models/post.rb b/vendor/plugins/NewBlog/app/models/post.rb new file mode 100644 index 00000000..f60c1c19 --- /dev/null +++ b/vendor/plugins/NewBlog/app/models/post.rb @@ -0,0 +1,8 @@ +class Post + include Mongoid::Document + include Mongoid::Timestamps + field :title, :type => String + field :body, :type => String + embeds_many :comments + validates_presence_of :title, :body +end \ No newline at end of file diff --git a/vendor/plugins/NewBlog/app/views/.gitkeep b/vendor/plugins/NewBlog/app/views/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/app/views/layouts/application.html.erb b/vendor/plugins/NewBlog/app/views/layouts/application.html.erb new file mode 100644 index 00000000..e8c46989 --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + Blog + <%= stylesheet_link_tag :all %> + <%= javascript_include_tag :defaults %> + <%= csrf_meta_tag %> + + + +<%= yield %> + + + diff --git a/vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb b/vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb new file mode 100644 index 00000000..28bf833a --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/layouts/edit_view.html.erb @@ -0,0 +1,14 @@ + + + + Blog + <%= stylesheet_link_tag :all %> + <%= javascript_include_tag :defaults %> + <%= csrf_meta_tag %> + + +
+ <%= yield %> +
+ + diff --git a/vendor/plugins/NewBlog/app/views/layouts/production.html.erb b/vendor/plugins/NewBlog/app/views/layouts/production.html.erb new file mode 100644 index 00000000..d90a4112 --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/layouts/production.html.erb @@ -0,0 +1,3 @@ +
+ <%= yield %> +
diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/_form.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/_form.html.erb new file mode 100644 index 00000000..3c459566 --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/_form.html.erb @@ -0,0 +1,14 @@ + + <%= f.error_messages %> + +
+ <%= f.label :title %>
+ <%= f.text_field :title %> +
+
+ <%= f.label :body %>
+ <%= f.text_area :body %> +
+
+ <%= f.submit %> +
diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/edit.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/edit.html.erb new file mode 100644 index 00000000..8b2b1f1d --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/edit.html.erb @@ -0,0 +1,8 @@ +

<%= t('blog.editing_post') %>

+ +<%= form_for @post, :url => panel_blog_post_path(@post) do |f| %> + <%= render :partial => 'form', :locals => {:f => f} %> +<% end %> + +<%= link_to t('blog.show'), panel_blog_post_path(@post) %> | +<%= link_back %> diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb new file mode 100644 index 00000000..346cd133 --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/index.html.erb @@ -0,0 +1,25 @@ +

<%= t('blog.list_post') %>

+ + + + + + + + + + +<% @posts.each do |post| %> + + + + + + + +<% end %> +
<%= t('blog.title') %><%= t('blog.body') %>
<%= post.title %><%= post.body %><%= link_to t('blog.show'), panel_blog_post_path(post) %><%= link_to t('blog.edit'), edit_panel_blog_post_path(post) %><%= link_to t('blog.delete'), panel_blog_post_path(post), :confirm => t('blog.sure?'), :method => :delete %>
+ +
+ +<%= link_to t('blog.new_post'), new_panel_blog_post_path %> \ No newline at end of file diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb new file mode 100644 index 00000000..9eb6ebbb --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/latest_post.html.erb @@ -0,0 +1,5 @@ +<%=stylesheet_link_tag "NewBlog/application"%> +

<%=@post.title%>

+

+ <%= @post.body%> +

diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb new file mode 100644 index 00000000..5e6eee2f --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/new.html.erb @@ -0,0 +1,6 @@ +

<%= t('blog.new_post') %>

+<%= form_for @post, :url => panel_blog_posts_path do |f| %> + <%= render :partial => 'form', :locals => {:f => f} %> +<% end %> + +<%= link_back %> diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb new file mode 100644 index 00000000..7fce5fd1 --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/show.html.erb @@ -0,0 +1,38 @@ +

<%= flash_messages %>

+ +

+ <%= t('blog.body') %> + <%=h @post.body %> +

+ +

<%= t('blog.comments') %>

+ +<% @post.comments.each do |c| %> +

+ <%=h c.name %> said:
+ <%= time_ago_in_words(c.created_at) %> ago +

+ +

+ <%=h c.body %> +

+<% end %> + +<%= form_for Comment.new, :url => panel_blog_comments_path do |f| %> +

+ + <%= f.label :name, "Author" %>
+ <%= f.text_field :name %>
+ <%= f.label :body, "Comment Description" %>
+ <%= f.text_area :body %> + <%= hidden_field_tag :post_id, @post.id %> +

+ +

+ <%= f.submit "Add Comment" %> +

+<% end %> + + +<%= link_to t('blog.edit'), edit_panel_blog_post_path(@post) %> | +<%= link_back %> \ No newline at end of file diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb new file mode 100644 index 00000000..cd16cfc7 --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_index.html.erb @@ -0,0 +1,16 @@ +<%=stylesheet_link_tag "NewBlog/application"%> +
+ + + + + + + <% @posts.each do |post| %> + + + + + <% end %> +
<%= t('blog.title') %><%= t('blog.body') %>
<%= link_to post.title,panel_blog_post_path(post) %><%= post.body.truncate(14) %>
+
\ No newline at end of file diff --git a/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb b/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb new file mode 100644 index 00000000..2312fc74 --- /dev/null +++ b/vendor/plugins/NewBlog/app/views/panel/blog/posts/widget_latest_post.html.erb @@ -0,0 +1,7 @@ +<%=stylesheet_link_tag "NewBlog/application"%> +
+

<%= @post.title %>

+

+ <%= @post.body %> +

+
\ No newline at end of file diff --git a/vendor/plugins/NewBlog/config/routes.rb b/vendor/plugins/NewBlog/config/routes.rb new file mode 100644 index 00000000..b619df18 --- /dev/null +++ b/vendor/plugins/NewBlog/config/routes.rb @@ -0,0 +1,13 @@ +Rails.application.routes.draw do + + namespace :panel do + namespace :blog do + root :to => "posts#index" + resources :posts + resources :comments + match "widget_latest_post" => "posts#widget_latest_post" + match "widget_index" => "posts#widget_index" + end + end + +end diff --git a/vendor/plugins/NewBlog/lib/NewBlog.rb b/vendor/plugins/NewBlog/lib/NewBlog.rb new file mode 100644 index 00000000..09046450 --- /dev/null +++ b/vendor/plugins/NewBlog/lib/NewBlog.rb @@ -0,0 +1,5 @@ +require "NewBlog/engine" + + +module NewBlog +end diff --git a/vendor/plugins/NewBlog/lib/NewBlog/engine.rb b/vendor/plugins/NewBlog/lib/NewBlog/engine.rb new file mode 100644 index 00000000..90afca77 --- /dev/null +++ b/vendor/plugins/NewBlog/lib/NewBlog/engine.rb @@ -0,0 +1,6 @@ +module NewBlog + class Engine < Rails::Engine + isolate_namespace NewBlog + PrototypeR4::Application::Orbit_Apps << "NewBlog" + end +end diff --git a/vendor/plugins/NewBlog/lib/NewBlog/version.rb b/vendor/plugins/NewBlog/lib/NewBlog/version.rb new file mode 100644 index 00000000..9690b537 --- /dev/null +++ b/vendor/plugins/NewBlog/lib/NewBlog/version.rb @@ -0,0 +1,3 @@ +module NewBlog + VERSION = "0.0.1" +end diff --git a/vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake b/vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake new file mode 100644 index 00000000..0975b49b --- /dev/null +++ b/vendor/plugins/NewBlog/lib/tasks/NewBlog_tasks.rake @@ -0,0 +1,4 @@ +# desc "Explaining what the task does" +# task :NewBlog do +# # Task goes here +# end diff --git a/vendor/plugins/NewBlog/script/rails b/vendor/plugins/NewBlog/script/rails new file mode 100644 index 00000000..e323e44b --- /dev/null +++ b/vendor/plugins/NewBlog/script/rails @@ -0,0 +1,6 @@ +#!/usr/bin/env ruby +#!/usr/bin/env ruby +# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. + +ENGINE_PATH = File.expand_path('../..', __FILE__) +load File.expand_path('../../test/dummy/script/rails', __FILE__) diff --git a/vendor/plugins/NewBlog/test/NewBlog_test.rb b/vendor/plugins/NewBlog/test/NewBlog_test.rb new file mode 100644 index 00000000..2870704b --- /dev/null +++ b/vendor/plugins/NewBlog/test/NewBlog_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class NewBlogTest < ActiveSupport::TestCase + test "truth" do + assert_kind_of Module, NewBlog + end +end diff --git a/vendor/plugins/NewBlog/test/dummy/Rakefile b/vendor/plugins/NewBlog/test/dummy/Rakefile new file mode 100644 index 00000000..36458522 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/Rakefile @@ -0,0 +1,7 @@ +#!/usr/bin/env rake +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require File.expand_path('../config/application', __FILE__) + +Dummy::Application.load_tasks diff --git a/vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js b/vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js new file mode 100644 index 00000000..37c7bfcd --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/app/assets/javascripts/application.js @@ -0,0 +1,9 @@ +// This is a manifest file that'll be compiled into including all the files listed below. +// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically +// be included in the compiled file accessible from http://example.com/assets/application.js +// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the +// the compiled file. +// +//= require jquery +//= require jquery_ujs +//= require_tree . diff --git a/vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css b/vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css new file mode 100644 index 00000000..fc25b572 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/app/assets/stylesheets/application.css @@ -0,0 +1,7 @@ +/* + * This is a manifest file that'll automatically include all the stylesheets available in this directory + * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at + * the top of the compiled file, but it's generally better to create a new file per style scope. + *= require_self + *= require_tree . +*/ \ No newline at end of file diff --git a/vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb b/vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb new file mode 100644 index 00000000..e8065d95 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/app/controllers/application_controller.rb @@ -0,0 +1,3 @@ +class ApplicationController < ActionController::Base + protect_from_forgery +end diff --git a/vendor/plugins/NewBlog/test/dummy/app/helpers/application_helper.rb b/vendor/plugins/NewBlog/test/dummy/app/helpers/application_helper.rb new file mode 100644 index 00000000..de6be794 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/app/helpers/application_helper.rb @@ -0,0 +1,2 @@ +module ApplicationHelper +end diff --git a/vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep b/vendor/plugins/NewBlog/test/dummy/app/mailers/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep b/vendor/plugins/NewBlog/test/dummy/app/models/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb b/vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb new file mode 100644 index 00000000..9a8a761b --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/app/views/layouts/application.html.erb @@ -0,0 +1,14 @@ + + + + Dummy + <%= stylesheet_link_tag "application" %> + <%= javascript_include_tag "application" %> + <%= csrf_meta_tags %> + + + +<%= yield %> + + + diff --git a/vendor/plugins/NewBlog/test/dummy/config.ru b/vendor/plugins/NewBlog/test/dummy/config.ru new file mode 100644 index 00000000..1989ed8d --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config.ru @@ -0,0 +1,4 @@ +# This file is used by Rack-based servers to start the application. + +require ::File.expand_path('../config/environment', __FILE__) +run Dummy::Application diff --git a/vendor/plugins/NewBlog/test/dummy/config/application.rb b/vendor/plugins/NewBlog/test/dummy/config/application.rb new file mode 100644 index 00000000..5e17b68c --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/application.rb @@ -0,0 +1,46 @@ +require File.expand_path('../boot', __FILE__) + +require "action_controller/railtie" +require "action_mailer/railtie" +require "active_resource/railtie" +require "rails/test_unit/railtie" +require "sprockets/railtie" # Uncomment this line for Rails 3.1+ + +Bundler.require +require "NewBlog" + +module Dummy + class Application < Rails::Application + # Settings in config/environments/* take precedence over those specified here. + # Application configuration should go into files in config/initializers + # -- all .rb files in that directory are automatically loaded. + + # Custom directories with classes and modules you want to be autoloadable. + # config.autoload_paths += %W(#{config.root}/extras) + + # Only load the plugins named here, in the order given (default is alphabetical). + # :all can be used as a placeholder for all plugins not explicitly named. + # config.plugins = [ :exception_notification, :ssl_requirement, :all ] + + # Activate observers that should always be running. + # config.active_record.observers = :cacher, :garbage_collector, :forum_observer + + # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. + # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. + # config.time_zone = 'Central Time (US & Canada)' + + # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. + # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] + # config.i18n.default_locale = :de + + # Configure the default encoding used in templates for Ruby 1.9. + config.encoding = "utf-8" + + # Configure sensitive parameters which will be filtered from the log file. + config.filter_parameters += [:password] + + # Enable the asset pipeline + config.assets.enabled = true + end +end + diff --git a/vendor/plugins/NewBlog/test/dummy/config/boot.rb b/vendor/plugins/NewBlog/test/dummy/config/boot.rb new file mode 100644 index 00000000..eba06813 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/boot.rb @@ -0,0 +1,10 @@ +require 'rubygems' +gemfile = File.expand_path('../../../../Gemfile', __FILE__) + +if File.exist?(gemfile) + ENV['BUNDLE_GEMFILE'] = gemfile + require 'bundler' + Bundler.setup +end + +$:.unshift File.expand_path('../../../../lib', __FILE__) \ No newline at end of file diff --git a/vendor/plugins/NewBlog/test/dummy/config/database.yml b/vendor/plugins/NewBlog/test/dummy/config/database.yml new file mode 100644 index 00000000..51a4dd45 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/database.yml @@ -0,0 +1,25 @@ +# SQLite version 3.x +# gem install sqlite3 +# +# Ensure the SQLite 3 gem is defined in your Gemfile +# gem 'sqlite3' +development: + adapter: sqlite3 + database: db/development.sqlite3 + pool: 5 + timeout: 5000 + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + adapter: sqlite3 + database: db/test.sqlite3 + pool: 5 + timeout: 5000 + +production: + adapter: sqlite3 + database: db/production.sqlite3 + pool: 5 + timeout: 5000 diff --git a/vendor/plugins/NewBlog/test/dummy/config/environment.rb b/vendor/plugins/NewBlog/test/dummy/config/environment.rb new file mode 100644 index 00000000..3da5eb91 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/environment.rb @@ -0,0 +1,5 @@ +# Load the rails application +require File.expand_path('../application', __FILE__) + +# Initialize the rails application +Dummy::Application.initialize! diff --git a/vendor/plugins/NewBlog/test/dummy/config/environments/development.rb b/vendor/plugins/NewBlog/test/dummy/config/environments/development.rb new file mode 100644 index 00000000..1f1595dc --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/environments/development.rb @@ -0,0 +1,27 @@ +Dummy::Application.configure do + # Settings specified here will take precedence over those in config/application.rb + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Log error messages when you accidentally call methods on nil. + config.whiny_nils = true + + # Show full error reports and disable caching + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Don't care if the mailer can't send + config.action_mailer.raise_delivery_errors = false + + # Print deprecation notices to the Rails logger + config.active_support.deprecation = :log + + # Only use best-standards-support built into browsers + config.action_dispatch.best_standards_support = :builtin + + # Do not compress assets + config.assets.compress = false +end diff --git a/vendor/plugins/NewBlog/test/dummy/config/environments/production.rb b/vendor/plugins/NewBlog/test/dummy/config/environments/production.rb new file mode 100644 index 00000000..67a50850 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/environments/production.rb @@ -0,0 +1,51 @@ +Dummy::Application.configure do + # Settings specified here will take precedence over those in config/application.rb + + # Code is not reloaded between requests + config.cache_classes = true + + # Full error reports are disabled and caching is turned on + config.consider_all_requests_local = false + config.action_controller.perform_caching = true + + # Disable Rails's static asset server (Apache or nginx will already do this) + config.serve_static_assets = false + + # Compress JavaScripts and CSS + config.assets.compress = true + + # Specifies the header that your server uses for sending files + # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # See everything in the log (default is :info) + # config.log_level = :debug + + # Use a different logger for distributed setups + # config.logger = SyslogLogger.new + + # Use a different cache store in production + # config.cache_store = :mem_cache_store + + # Enable serving of images, stylesheets, and JavaScripts from an asset server + # config.action_controller.asset_host = "http://assets.example.com" + + # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) + # config.assets.precompile += %w( search.js ) + + # Disable delivery errors, bad email addresses will be ignored + # config.action_mailer.raise_delivery_errors = false + + # Enable threaded mode + # config.threadsafe! + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation can not be found) + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners + config.active_support.deprecation = :notify +end diff --git a/vendor/plugins/NewBlog/test/dummy/config/environments/test.rb b/vendor/plugins/NewBlog/test/dummy/config/environments/test.rb new file mode 100644 index 00000000..6810c914 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/environments/test.rb @@ -0,0 +1,39 @@ +Dummy::Application.configure do + # Settings specified here will take precedence over those in config/application.rb + + # The test environment is used exclusively to run your application's + # test suite. You never need to work with it otherwise. Remember that + # your test database is "scratch space" for the test suite and is wiped + # and recreated between test runs. Don't rely on the data there! + config.cache_classes = true + + # Configure static asset server for tests with Cache-Control for performance + config.serve_static_assets = true + config.static_cache_control = "public, max-age=3600" + + # Log error messages when you accidentally call methods on nil + config.whiny_nils = true + + # Show full error reports and disable caching + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + + # Raise exceptions instead of rendering exception templates + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment + config.action_controller.allow_forgery_protection = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Use SQL instead of Active Record's schema dumper when creating the test database. + # This is necessary if your schema can't be completely dumped by the schema dumper, + # like if you have constraints or database-specific column types + # config.active_record.schema_format = :sql + + # Print deprecation notices to the stderr + config.active_support.deprecation = :stderr +end diff --git a/vendor/plugins/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb b/vendor/plugins/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb new file mode 100644 index 00000000..59385cdf --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/vendor/plugins/NewBlog/test/dummy/config/initializers/inflections.rb b/vendor/plugins/NewBlog/test/dummy/config/initializers/inflections.rb new file mode 100644 index 00000000..9e8b0131 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/initializers/inflections.rb @@ -0,0 +1,10 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format +# (all these examples are active by default): +# ActiveSupport::Inflector.inflections do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end diff --git a/vendor/plugins/NewBlog/test/dummy/config/initializers/mime_types.rb b/vendor/plugins/NewBlog/test/dummy/config/initializers/mime_types.rb new file mode 100644 index 00000000..72aca7e4 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/initializers/mime_types.rb @@ -0,0 +1,5 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf +# Mime::Type.register_alias "text/html", :iphone diff --git a/vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb b/vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb new file mode 100644 index 00000000..500605a4 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/initializers/secret_token.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# Your secret key for verifying the integrity of signed cookies. +# If you change this key, all old signed cookies will become invalid! +# Make sure the secret is at least 30 characters and all random, +# no regular words or you'll be exposed to dictionary attacks. +Dummy::Application.config.secret_token = 'd50c02c22eac460faa82296161da6222762a7baff08669429b7b14b1e80b33f14cf1e1f8daf99486dda3b4d281c73b835169269a121027552299286a818c7d03' diff --git a/vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb b/vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb new file mode 100644 index 00000000..952473ff --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/initializers/session_store.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +Dummy::Application.config.session_store :cookie_store, key: '_dummy_session' + +# Use the database for sessions instead of the cookie-based default, +# which shouldn't be used to store highly confidential information +# (create the session table with "rails generate session_migration") +# Dummy::Application.config.session_store :active_record_store diff --git a/vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb b/vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb new file mode 100644 index 00000000..999df201 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. +# +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# Disable root element in JSON by default. +ActiveSupport.on_load(:active_record) do + self.include_root_in_json = false +end diff --git a/vendor/plugins/NewBlog/test/dummy/config/locales/en.yml b/vendor/plugins/NewBlog/test/dummy/config/locales/en.yml new file mode 100644 index 00000000..179c14ca --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/locales/en.yml @@ -0,0 +1,5 @@ +# Sample localization file for English. Add more files in this directory for other locales. +# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. + +en: + hello: "Hello world" diff --git a/vendor/plugins/NewBlog/test/dummy/config/mongoid.yml b/vendor/plugins/NewBlog/test/dummy/config/mongoid.yml new file mode 120000 index 00000000..75196a04 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/mongoid.yml @@ -0,0 +1 @@ +../../../../../../../orbit/config/mongoid.yml \ No newline at end of file diff --git a/vendor/plugins/NewBlog/test/dummy/config/routes.rb b/vendor/plugins/NewBlog/test/dummy/config/routes.rb new file mode 100644 index 00000000..bb509f27 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/config/routes.rb @@ -0,0 +1,58 @@ +Dummy::Application.routes.draw do + # The priority is based upon order of creation: + # first created -> highest priority. + + # Sample of regular route: + # match 'products/:id' => 'catalog#view' + # Keep in mind you can assign values other than :controller and :action + + # Sample of named route: + # match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase + # This route can be invoked with purchase_url(:id => product.id) + + # Sample resource route (maps HTTP verbs to controller actions automatically): + # resources :products + + # Sample resource route with options: + # resources :products do + # member do + # get 'short' + # post 'toggle' + # end + # + # collection do + # get 'sold' + # end + # end + + # Sample resource route with sub-resources: + # resources :products do + # resources :comments, :sales + # resource :seller + # end + + # Sample resource route with more complex sub-resources + # resources :products do + # resources :comments + # resources :sales do + # get 'recent', :on => :collection + # end + # end + + # Sample resource route within a namespace: + # namespace :admin do + # # Directs /admin/products/* to Admin::ProductsController + # # (app/controllers/admin/products_controller.rb) + # resources :products + # end + + # You can have the root of your site routed with "root" + # just remember to delete public/index.html. + # root :to => 'welcome#index' + + # See how all your routes lay out with "rake routes" + + # This is a legacy wild controller route that's not recommended for RESTful applications. + # Note: This route will make all actions in every controller accessible via GET requests. + # match ':controller(/:action(/:id(.:format)))' +end diff --git a/vendor/plugins/NewBlog/test/dummy/lib/assets/.gitkeep b/vendor/plugins/NewBlog/test/dummy/lib/assets/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/test/dummy/log/.gitkeep b/vendor/plugins/NewBlog/test/dummy/log/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/test/dummy/public/404.html b/vendor/plugins/NewBlog/test/dummy/public/404.html new file mode 100644 index 00000000..9a48320a --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/public/404.html @@ -0,0 +1,26 @@ + + + + The page you were looking for doesn't exist (404) + + + + + +
+

The page you were looking for doesn't exist.

+

You may have mistyped the address or the page may have moved.

+
+ + diff --git a/vendor/plugins/NewBlog/test/dummy/public/422.html b/vendor/plugins/NewBlog/test/dummy/public/422.html new file mode 100644 index 00000000..83660ab1 --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/public/422.html @@ -0,0 +1,26 @@ + + + + The change you wanted was rejected (422) + + + + + +
+

The change you wanted was rejected.

+

Maybe you tried to change something you didn't have access to.

+
+ + diff --git a/vendor/plugins/NewBlog/test/dummy/public/500.html b/vendor/plugins/NewBlog/test/dummy/public/500.html new file mode 100644 index 00000000..b80307fc --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/public/500.html @@ -0,0 +1,26 @@ + + + + We're sorry, but something went wrong (500) + + + + + +
+

We're sorry, but something went wrong.

+

We've been notified about this issue and we'll take a look at it shortly.

+
+ + diff --git a/vendor/plugins/NewBlog/test/dummy/public/favicon.ico b/vendor/plugins/NewBlog/test/dummy/public/favicon.ico new file mode 100644 index 00000000..e69de29b diff --git a/vendor/plugins/NewBlog/test/dummy/script/rails b/vendor/plugins/NewBlog/test/dummy/script/rails new file mode 100644 index 00000000..f8da2cff --- /dev/null +++ b/vendor/plugins/NewBlog/test/dummy/script/rails @@ -0,0 +1,6 @@ +#!/usr/bin/env ruby +# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application. + +APP_PATH = File.expand_path('../../config/application', __FILE__) +require File.expand_path('../../config/boot', __FILE__) +require 'rails/commands' diff --git a/vendor/plugins/NewBlog/test/integration/navigation_test.rb b/vendor/plugins/NewBlog/test/integration/navigation_test.rb new file mode 100644 index 00000000..97a94c9b --- /dev/null +++ b/vendor/plugins/NewBlog/test/integration/navigation_test.rb @@ -0,0 +1,10 @@ +require 'test_helper' + +class NavigationTest < ActionDispatch::IntegrationTest + fixtures :all + + # test "the truth" do + # assert true + # end +end + diff --git a/vendor/plugins/NewBlog/test/test_helper.rb b/vendor/plugins/NewBlog/test/test_helper.rb new file mode 100644 index 00000000..dcd3b276 --- /dev/null +++ b/vendor/plugins/NewBlog/test/test_helper.rb @@ -0,0 +1,10 @@ +# Configure Rails Environment +ENV["RAILS_ENV"] = "test" + +require File.expand_path("../dummy/config/environment.rb", __FILE__) +require "rails/test_help" + +Rails.backtrace_cleaner.remove_silencers! + +# Load support files +Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }