member list edit

app/views/admin/attributes/edit.html.erb

@@ -8,6 +8,20 @@
                     <h4><span><%= t(eval(":#{@attribute_type}"))%></span></h4>
                                         <div class="form-horizontal">
                         <div class="clear">
+							
+                            <div class="control-group pull-left">
+                                <label class="control-label" for="key"><%= t(:key) %></label>
+                                <div class="controls">
+                                    <% if @attribute.new_record? %>
+                                        <%= f.text_field :key, :placeholder => t(:key) %>
+                                    <% else %>
+                                        <div><%= @attribute.key%></div>
+                                    <% end %>
+                                </div>
+                            </div>
+                            <%= 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]"}%>
+							
+							
 						
                             <div class="control-group pull-left">
                                 <label class="control-label" for="key"><%= t(:to_search) %></label>
@@ -23,24 +37,13 @@
                                 </div>
                             </div>
 							
-                            <div class="control-group pull-left">
-                                <label class="control-label" for="key"><%= t(:key) %></label>
-                                <div class="controls">
-                                    <% if @attribute.new_record? %>
-                                        <%= f.text_field :key, :placeholder => t(:key) %>
-                                    <% else %>
-                                        <div><%= @attribute.key%></div>
-                                    <% end %>
-                                </div>
-                            </div>
-                            <%= 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]"}%>
                         </div>
                     </div>
                 </div>
 						<% if @attribute._type == "Info" %>
 						
 						<div class="map-block back attributes">
-							<h4><span><%=  @attribute.title+ t(:attributes)%></span></h4>
+							<h4><span><%=  @attribute.title+ t(:field)%></span></h4>
 							<div id="attribute_field_list">
 							<%= render :partial=>"shared/attribute_field/attribute_field",:collection=>@attribute.attribute_fields%>
 							</div>

app/views/admin/plugins/_plugin_list.html.erb

@@ -0,0 +1,18 @@
+			<div id="module-nav">
+                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
+                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
+                <div class="module-nav-view">
+                    <ul class="nav nav-pills">
+                        <%= 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 -%>
+
+
+                    </ul>
+                </div>
+            </div>

app/views/admin/plugins/index.html.erb

@@ -4,23 +4,6 @@
 
 
         <div id="isotope" class="user-data">
-            <div id="module-nav">
-                <div class="arrow_next pull-right"><i class="icon-chevron-right"></i></div>
-                <div class="arrow_prev pull-left"><i class="icon-chevron-left"></i></div>
-                <div class="module-nav-view">
-                    <ul class="nav nav-pills">
-                        <%= 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 -%>
-
-
-                    </ul>
-                </div>
-            </div>
+            <%= render :partial => 'plugin_list' %>
             <%= render :partial => @right_partial %>
         </div>

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"%>
           <a class="btn btn-small pull-right btn-danger remove_attribute"><i class="icon-trash icon-large"></i> <%= t(:delete_)%></a>
           <div class="clear">
+              <div class="control-group pull-left">
+                  <label class="control-label" for="key"><%= t(:key) %></label>
+                  <div class="multipleInput">
+                      <div class="controls">
+                        <%= text_field "#{@field_name}[attribute_fields][#{@af_counter}]","key",:value=>attribute_field.key%>
+                      </div>
+                  </div>
+              </div>
+              <%= 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]"}%>
+			  
+			  
 				<div class="control-group">
 					<label class="control-label" for="key"><%= t(:to_search) %></label>
 					<div class="controls">
@@ -21,15 +32,8 @@
 						</label> 
 					</div>
 				</div>
-              <div class="control-group pull-left">
-                  <label class="control-label" for="key"><%= t(:key) %></label>
-                  <div class="multipleInput">
-                      <div class="controls">
-                        <%= text_field "#{@field_name}[attribute_fields][#{@af_counter}]","key",:value=>attribute_field.key%>
-                      </div>
-                  </div>
-              </div>
-              <%= 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]"}%>
+				
+				
               <div class="control-group pull-left">
                   <label class="control-label" for=""><%= t(:type)%></label>
                   <div class="controls">
@@ -46,7 +50,7 @@
       <div class="<%= attribute_field.disabled ?  'hide' : ''%>">
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeA") do%>
               <div class="control-group">
-                  <label class="control-label"><%= t(:options)%></label>
+                  <label class="control-label"><%= t(:enabled_for)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                             <%= check_box_tag("#{@field_name}[attribute_fields][#{@af_counter}][typeA][cross_lang]","true",attribute_field["typeA"]["cross_lang"]) %>
@@ -103,7 +107,7 @@
           <% end %>
           <%= content_tag :div,:class=>show_type_panel(attribute_field,"typeD") do%>
               <div class="control-group">
-                  <label class="control-label"><%= t(:options)%></label>
+                  <label class="control-label"><%= t(:enabled_for)%></label>
                   <div class="controls">
                       <label class="checkbox inline">
                         <%= check_box_tag("#{@field_name}[attribute_fields][#{@af_counter}][typeD][cross_lang]","true",attribute_field["typeD"]["cross_lang"]) %>

app/views/admin/roles/edit_sub_role.html.erb

@@ -4,6 +4,18 @@
                     <h4><span><%= t(eval(":#{@attribute_type}"))%>:<%= @attribute.title %></span></h4>
                                         <div class="form-horizontal">
                         <div class="clear">
+							
+                            <div class="control-group pull-left">
+                                <label class="control-label" for="key"><%= t(:key) %></label>
+                                <div class="controls">
+                                    <% if @sub_attribute.new_record? %>
+                                        <%= f.text_field :key, :placeholder => t(:key) %>
+                                    <% else %>
+                                        <div><%= @sub_attribute.key%></div>
+                                    <% end %>
+                                </div>
+                            </div>
+                            <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@sub_attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"sub_role[title_translations]"}%>
 						
                             <div class="control-group pull-left">
                                 <label class="control-label" for="key"><%= t(:to_search) %></label>
@@ -19,17 +31,6 @@
                                 </div>
                             </div>
 							
-                            <div class="control-group pull-left">
-                                <label class="control-label" for="key"><%= t(:key) %></label>
-                                <div class="controls">
-                                    <% if @sub_attribute.new_record? %>
-                                        <%= f.text_field :key, :placeholder => t(:key) %>
-                                    <% else %>
-                                        <div><%= @sub_attribute.key%></div>
-                                    <% end %>
-                                </div>
-                            </div>
-                            <%= render :partial=>"shared/attribute_field/placeholder_block",:locals=>{:values=>@sub_attribute.title_translations,:class_ext=>"pull-left",:label_ext=>t(:item_name),:field_name=>"sub_role[title_translations]"}%>
                         </div>
                     </div>
                 </div>

app/views/admin/roles/role_field.html.erb

@@ -6,7 +6,7 @@
             <div class="site-map role-block">
                 
 				<div class="map-block back attributes">
-					<h4><span><%=  @attribute.title+ t(:attributes)%></span></h4>
+					<h4><span><%=  @attribute.title + t(:role)%></span></h4>
 					<div id="attribute_field_list">
 					<%= render :partial=>"attribute_field",:collection=>@attribute.attribute_fields%>
 					</div>

app/views/admin/roles/sub_role.html.erb

@@ -56,5 +56,5 @@
 </table>
 
 <div class="form-actions form-fixed pagination-right">
-	<%= link_to content_tag(:i,t(:new_sub_role),:class=>"icon-plus icon-white"),eval("admin_#{@attribute_type}_add_sub_role_path(@attribute)"),:class=>"btn btn-primary pull-right"%>
+	<%= link_to content_tag(:i,t("new.sub_role"),:class=>"icon-plus icon-white"),eval("admin_#{@attribute_type}_add_sub_role_path(@attribute)"),:class=>"btn btn-primary pull-right"%>
 </div>

app/views/admin/roles/sub_role_field.html.erb

@@ -6,7 +6,7 @@
             <div class="site-map role-block">
                 
 				<div class="map-block back attributes">
-					<h4><span><%=  @attribute.title+ t(:attributes)%> - <%=  @sub_attribute.title %></span></h4>
+					<h4><span><%=  @attribute.title+ t(:role)%> - <%=  @sub_attribute.title %></span></h4>
 					<div id="attribute_field_list">
 					<%= render :partial=>"attribute_field",:collection=>@sub_attribute.attribute_fields%>
 					</div>

app/views/admin/users_new_interface/_side_bar.html.erb

@@ -3,16 +3,24 @@
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('users_new_interface')) do -%>
       <%= content_tag :li, link_to((t(:all_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_users_new_interface_index_path), :class => active_for_action('users_new_interface', 'index') %>
       <%= content_tag :li, link_to((t(:add_member) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, new_admin_users_new_interface_path), :class => active_for_action('users_new_interface', 'new') if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:roles) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_roles_path ), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, edit_admin_info_path(Info.first.id.to_s)), :class => active_for_action('users_new_interfacexx', 'index') if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:authorigation) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
-      <%= content_tag :li, link_to((t(:registrant) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_authorization) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_registration) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, '#'), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_role) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe,admin_roles_path ), :class => active_for_action('users_new_interfacexx', 'index')  if (is_admin? rescue nil) %>
+      <%= content_tag :li, link_to((t(:member_info) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, edit_admin_info_path(Info.first.id.to_s)), :class => active_for_action('users_new_interfacexx', 'index') if (is_admin? rescue nil) %>
     <% end -%>
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
-  <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t(:analysis)), admin_plugins_path %>
+  <%= link_to content_tag(:i, nil, :class => 'icons-graduation')+ content_tag(:span, t(:academic_info)), admin_plugins_path %>
     <%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('plugins')) do -%>
-      <%= content_tag :li, link_to((t(:all_plugins) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
+      <%= content_tag :li, link_to((t(:list_) + content_tag(:i, nil, :class => 'icon-chevron-right')).html_safe, admin_plugins_path), :class => active_for_action('users_new_interface', 'index') %>
     <% end -%>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-pie')+ content_tag(:span, t(:analysis)), '#' %>
+<% end -%>
+
+<%= content_tag :li, :class => active_for_controllers('plugins')  do -%>
+  <%= link_to content_tag(:i, nil, :class => 'icons-layout')+ content_tag(:span, t(:groups)), '#' %>
 <% end -%>

app/views/admin/users_new_interface/_user_for_listing.html.erb

@@ -2,10 +2,11 @@
                     <td class="span1"><% if is_admin? %><input type="checkbox"><% end%></td>
                     <td class="span3">
                         <div class="label-group">
-                            <div class="label-td"><!-- 
-                                <span class="label label-teacher"># TODO:Teacher</span>
-                                <span class="label label-student"># TODO:Student</span>
-                                <span class="label label-staff"># TODO:Staff</span> -->
+                            <div class="label-td">
+							<% user_for_listing.roles.each do |rf| %>
+							<% @roledata = Role.find(rf.id) %>
+							<span class="label label-<%= @roledata.key %>"><%= @roledata.title %></span>
+							<% end %>
                             </div>
                         </div>
                     </td>

app/views/admin/users_new_interface/edit.html.erb

@@ -21,6 +21,7 @@
 
     <%= form_for @user, :url => admin_users_new_interface_path(@user), :html => { :multipart => true } do |f| %>
       <%= f.error_messages %>
+      <%= render :partial => 'user_basic', :locals => {:f => f}%>
       <%= render :partial => 'form', :locals => { :f => f } %>
       <div class="button_bar">
         <%= link_back %>