diff --git a/app/controllers/admin/plugins_controller.rb b/app/controllers/admin/plugins_controller.rb index feeff300..424a482d 100644 --- a/app/controllers/admin/plugins_controller.rb +++ b/app/controllers/admin/plugins_controller.rb @@ -7,7 +7,17 @@ class Admin::PluginsController < ApplicationController @plugins = OrbitApp::Module::Registration.all if(!params[:show_plugin_profile].nil?) - @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).profile_partial_path rescue 'plugin_summary' + + @right_partial = OrbitApp::Plugin::Registration.find_by_key(params[:show_plugin_profile]).admin_partial_path + + if !@right_partial.blank? + respond_to do |format| + format.html { redirect_to( @right_partial ) } + end + else + @right_partial = "admin/users_new_interface/plugin_summary" + end + else @right_partial = "admin/users_new_interface/plugin_summary" end diff --git a/app/views/admin/attributes/edit.html.erb b/app/views/admin/attributes/edit.html.erb index aa87d73c..252cdf71 100644 --- a/app/views/admin/attributes/edit.html.erb +++ b/app/views/admin/attributes/edit.html.erb @@ -8,6 +8,20 @@

<%= t(eval(":#{@attribute_type}"))%>

+ +
+ +
+ <% if @attribute.new_record? %> + <%= f.text_field :key, :placeholder => t(:key) %> + <% else %> +
<%= @attribute.key%>
+ <% end %> +
+
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"#{@attribute_type}[title_translations]"}%> + +
@@ -23,24 +37,13 @@
-
- -
- <% if @attribute.new_record? %> - <%= f.text_field :key, :placeholder => t(:key) %> - <% else %> -
<%= @attribute.key%>
- <% end %> -
-
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"#{@attribute_type}[title_translations]"}%>
<% if @attribute._type == "Info" %>
-

<%= @attribute.title+ t(:attributes)%>

+

<%= @attribute.title+ t(:field)%>

<%= render :partial=>"shared/attribute_field/attribute_field",:collection=>@attribute.attribute_fields%>
diff --git a/app/views/admin/plugins/_plugin_list.html.erb b/app/views/admin/plugins/_plugin_list.html.erb new file mode 100644 index 00000000..f583f92e --- /dev/null +++ b/app/views/admin/plugins/_plugin_list.html.erb @@ -0,0 +1,18 @@ +
+
+
+
+
    + <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %> + <%= link_to t(:all_plugin_summary)%> + <% end -%> + <% @plugins.each do |plugin| %> + <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %> + <%= link_to plugin.name, admin_plugins_path(:show_plugin_profile => plugin.name) %> + <% end -%> + <% end -%> + + +
+
+
\ No newline at end of file diff --git a/app/views/admin/plugins/index.html.erb b/app/views/admin/plugins/index.html.erb index f2b0c21b..cb0d5c7e 100644 --- a/app/views/admin/plugins/index.html.erb +++ b/app/views/admin/plugins/index.html.erb @@ -4,23 +4,6 @@
-
-
-
-
-
    - <%= content_tag :li, :class=>(params[:show_plugin_profile].nil? ? "active" : nil) do %> - <%= link_to t(:all_plugin_summary)%> - <% end -%> - <% @plugins.each do |plugin| %> - <%= content_tag :li, :class=>(params[:show_plugin_profile] == plugin.name ? "active" : nil) do %> - <%= link_to plugin.name, :show_plugin_profile => plugin.name %> - <% end -%> - <% end -%> - - -
-
-
+ <%= render :partial => 'plugin_list' %> <%= render :partial => @right_partial %>
\ No newline at end of file diff --git a/app/views/admin/roles/_attribute_field.html.erb b/app/views/admin/roles/_attribute_field.html.erb index 8ec2675d..d9acf6de 100644 --- a/app/views/admin/roles/_attribute_field.html.erb +++ b/app/views/admin/roles/_attribute_field.html.erb @@ -10,6 +10,17 @@ <%= hidden_field "#{@field_name}[attribute_fields][#{@af_counter}]","to_delete",:value=>false,:class=>"attribute_field_to_delete"%> <%= t(:delete_)%>
+
+ +
+
+ <%= text_field "#{@field_name}[attribute_fields][#{@af_counter}]","key",:value=>attribute_field.key%> +
+
+
+ <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[attribute_fields][#{@af_counter}][title_translations]"}%> + +
@@ -21,15 +32,8 @@
-
- -
-
- <%= text_field "#{@field_name}[attribute_fields][#{@af_counter}]","key",:value=>attribute_field.key%> -
-
-
- <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>attribute_field.title_translations,:class_ext=>"pull-left",:label_ext=>t(:name),:field_name=>"#{@field_name}[attribute_fields][#{@af_counter}][title_translations]"}%> + +
@@ -46,7 +50,7 @@
<%= content_tag :div,:class=>show_type_panel(attribute_field,"typeA") do%>
- +