Changes in page_edit
This commit is contained in:
		
							parent
							
								
									82fa85def8
								
							
						
					
					
						commit
						4685952bd6
					
				
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 2.9 KiB | 
|  | @ -11,6 +11,7 @@ | |||
| } | ||||
| .nav-list ol li { | ||||
| 	padding: 5px 0; | ||||
| 	list-style: none; | ||||
| } | ||||
| .nav-list ol li a { | ||||
| 	font-size: 13px; | ||||
|  |  | |||
|  | @ -110,10 +110,8 @@ | |||
| 	padding:6px; | ||||
| } | ||||
| #orbit-bar .nav > li.search { | ||||
| 	background-image: none; | ||||
| 	overflow: hidden; | ||||
| 	width: 28px; | ||||
| 	margin-bottom: 0; | ||||
| 	position: relative; | ||||
| } | ||||
| #orbit-bar .nav > li > a.orbit-bar-home { | ||||
|  | @ -686,6 +684,32 @@ | |||
| 	z-index: 2 !important; | ||||
| } | ||||
| 
 | ||||
| #back_main .editable { | ||||
| 	position: relative; | ||||
| } | ||||
| #back_main .editable:after { | ||||
| 	content: ''; | ||||
| 	clear: both; | ||||
| 	display: block; | ||||
| 	visibility: hidden; | ||||
| 	height: 0; | ||||
| } | ||||
| 
 | ||||
| #back_main .edit_link a { | ||||
| 	position: absolute; | ||||
| 	z-index: 10; | ||||
| 	width: 100%; | ||||
| 	height: 100%; | ||||
| 	top: 0; | ||||
| 	left: 0; | ||||
| 	text-indent: -9999px; | ||||
| 	background: url(<%= asset_path 'editicon.png' %>) no-repeat center center rgba(255,255,255,.8); | ||||
| 	-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1); | ||||
| 	-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1); | ||||
| 	box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 1); | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| [class^="icons-"] { | ||||
| 	display: inline-block; | ||||
| 	width: 16px; | ||||
|  |  | |||
|  | @ -1,10 +1,11 @@ | |||
| <%= flash_messages %> | ||||
| 
 | ||||
| <h1><%= t('admin.editing_page') %></h1> | ||||
| 
 | ||||
| <%= form_for @item, :url => admin_page_path(@item) do |f| %> | ||||
|   <%= render :partial => "form", :locals => { :f => f } %> | ||||
|   <p> | ||||
|     <%= f.submit t('update') %> <%= link_back %> | ||||
|   </p> | ||||
| <% end %> | ||||
| <div id="poststuff"> | ||||
| 	<h1><%= t('admin.editing_page') %></h1> | ||||
| 	<%= form_for @item, :url => admin_page_path(@item), :html => { :class => 'form-horizontal edit_page' }  do |f| %> | ||||
| 		<%= render :partial => "form", :locals => { :f => f } %> | ||||
| 		<div class="form-actions"> | ||||
| 			<%= f.submit t('update'), :class => 'btn btn-primary' %> | ||||
| 			<%= link_to t('cancel'), get_go_back, :class=>"btn" %> | ||||
| 		</div> | ||||
| 	<% end %> | ||||
| </div> | ||||
|  | @ -1,52 +1,92 @@ | |||
| <%= f.error_messages %> | ||||
| <%= f.hidden_field :parent, :value => (@item.parent.id rescue nil) %> | ||||
| 
 | ||||
| <p> | ||||
| <%= f.label :name, t('admin.name') %> | ||||
| <%= f.text_field :name, :class => 'text' %> | ||||
| </p> | ||||
| <div class="control-group"> | ||||
| 	<%= f.label :name, t('admin.name'), :class => 'control-label' %> | ||||
| 	<div class="controls"> | ||||
| 		<%= f.text_field :name, :class => 'text input-xlarge' %> | ||||
| 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 	</div> | ||||
| </div> | ||||
| 
 | ||||
| <%= f.fields_for :i18n_variable, (@item.new_record? ? @item.build_i18n_variable : @item.i18n_variable) do |f| %> | ||||
|   <% @site_valid_locales.each do |locale| %> | ||||
|     <p> | ||||
| 			<%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}" %> | ||||
| 			<%= f.text_field locale %> | ||||
| 		</p> | ||||
|   <% end %> | ||||
| 	<% @site_valid_locales.each do |locale| %> | ||||
| 		<div class="control-group"> | ||||
| 			<%= f.label :locale, "#{t('admin.title')} #{I18nVariable.from_locale(locale)}", :class => 'control-label' %> | ||||
| 			<div class="controls"> | ||||
| 				<%= f.text_field locale, :class => 'text input-xlarge' %> | ||||
| 				<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 			</div> | ||||
| 		</div> | ||||
| 	<% end %> | ||||
| <% end %> | ||||
| 
 | ||||
| <p> | ||||
| 	<%= t('admin.design_name') %> | ||||
| 	<%= f.collection_select :design, @designs, :id, :title, {:selected => @design.id}, {:rel => admin_pages_path} %> | ||||
| </p> | ||||
| <p> | ||||
| 	<%= t('admin.theme') %> | ||||
| 	<%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %> | ||||
| </p> | ||||
| <p> | ||||
| 	<%= t('admin.module_app') %> | ||||
| 	<%= render :partial => "app_selector", :locals => { :f => f } %> | ||||
| 	<span id="app_page_url"><%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%> </span> | ||||
| 	<span id="app_page_category"><%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%> </span> | ||||
| </p> | ||||
| <p> | ||||
| 	<%= f.label :is_published, "#{t('admin.is_published')} ?" %> | ||||
| 	<%= f.radio_button :is_published, true %>Yes <%= f.radio_button :is_published, false %> No | ||||
| </p> | ||||
| <p> | ||||
| 	<%= f.label :menu_enabled_for, "#{t('admin.menu_enabled_for')}:" %> | ||||
| 	<% @site_valid_locales.each do |valid_locale| %> | ||||
| 		<%= check_box_tag 'page[menu_enabled_for][]', valid_locale, (@item.menu_enabled_for.nil? ? true : @item.menu_enabled_for.include?(valid_locale)) %> | ||||
| 		<%= I18nVariable.from_locale(valid_locale) %> | ||||
| 	<% end %> | ||||
| 	<%= hidden_field_tag 'page[menu_enabled_for][]', '' %> | ||||
| </p> | ||||
| <p> | ||||
| 	<%= f.label :enabled_for, "#{t('admin.enabled_for')}:" %> | ||||
| 	<% @site_valid_locales.each do |valid_locale| %> | ||||
| 		<%= check_box_tag 'page[enabled_for][]', valid_locale, (@item.enabled_for.nil? ? true : @item.enabled_for.include?(valid_locale)) %> | ||||
| 		<%= I18nVariable.from_locale(valid_locale) %> | ||||
| 	<% end %> | ||||
| 	<%= hidden_field_tag 'page[enabled_for][]', '' %> | ||||
| </p> | ||||
| <div class="control-group"> | ||||
| 	<%= f.label :name, t('admin.design_name'), :class => 'control-label' %> | ||||
| 	<div class="controls"> | ||||
| 		<%= f.collection_select :design, @designs, :id, :title, {:selected => @design.id}, {:rel => admin_pages_path} %> | ||||
| 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 	</div> | ||||
| </div> | ||||
| <div class="control-group"> | ||||
| 	<%= f.label :name, t('admin.theme'), :class => 'control-label' %> | ||||
| 	<div class="controls"> | ||||
| 		<%= f.select :theme_id, @design.themes.collect { |t| [t.name.capitalize, t.id] }, :include_blank => true %> | ||||
| 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 	</div> | ||||
| </div> | ||||
| <div class="control-group"> | ||||
| 	<%= f.label :name, t('admin.module_app'), :class => 'control-label' %> | ||||
| 	<div class="controls"> | ||||
| 		<%= render :partial => "app_selector", :locals => { :f => f } %> | ||||
| 		<span id="app_page_url"> | ||||
| 			<%= select('page','app_frontend_url', @app_frontend_urls, :selected => @item.app_frontend_url ) rescue ''%> | ||||
| 		</span> | ||||
| 		<span id="app_page_category"> | ||||
| 			<%= select('page','category', @categories.collect{|category| [category.i18n_variable[I18n.locale], category.id]}, :selected => @item[:category], :include_blank => true ) rescue ''%> | ||||
| 		</span> | ||||
| 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 	</div> | ||||
| </div> | ||||
| <div class="control-group"> | ||||
| 	<%= f.label :is_published, "#{t('admin.is_published')} ?", :class => 'control-label' %> | ||||
| 	<div class="controls"> | ||||
| 		<label class="radio"> | ||||
| 			<%= f.radio_button :is_published, true %> | ||||
|             Yes | ||||
|         </label> | ||||
| 		<label class="radio"> | ||||
| 			<%= f.radio_button :is_published, false %> | ||||
| 			No | ||||
|         </label>  | ||||
| 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 	</div> | ||||
| </div> | ||||
| <div class="control-group"> | ||||
| 	<%= f.label :menu_enabled_for, "#{t('admin.menu_enabled_for')}:", :class => 'control-label' %> | ||||
| 	<div class="controls"> | ||||
| 		<% @site_valid_locales.each do |valid_locale| %> | ||||
| 		<label class="checkbox"> | ||||
| 			<%= check_box_tag 'page[menu_enabled_for][]', valid_locale, (@item.menu_enabled_for.nil? ? true : @item.menu_enabled_for.include?(valid_locale)) %> | ||||
| 			<%= I18nVariable.from_locale(valid_locale) %> | ||||
|         </label> | ||||
| 		<% end %> | ||||
| 		<%= hidden_field_tag 'page[menu_enabled_for][]', '' %> | ||||
| 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 	</div> | ||||
| </div> | ||||
| 
 | ||||
| <div class="control-group"> | ||||
| 	<%= f.label :enabled_for, "#{t('admin.enabled_for')}:", :class => 'control-label' %> | ||||
| 	<div class="controls"> | ||||
| 		<% @site_valid_locales.each do |valid_locale| %> | ||||
| 		<label class="checkbox"> | ||||
| 			<%= check_box_tag 'page[enabled_for][]', valid_locale, (@item.enabled_for.nil? ? true : @item.enabled_for.include?(valid_locale)) %> | ||||
| 			<%= I18nVariable.from_locale(valid_locale) %> | ||||
|         </label> | ||||
| 		<% end %> | ||||
| 		<%= hidden_field_tag 'page[enabled_for][]', '' %> | ||||
| 		<!-- <p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p> --> | ||||
| 	</div> | ||||
| </div> | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,13 +1,11 @@ | |||
| <h1><%= t('admin.new_page') %></h1> | ||||
| 
 | ||||
| <%= flash_messages %> | ||||
| 
 | ||||
| <%= form_for @item, :url => admin_pages_path, :html => { :class => 'form' } do |f| %> | ||||
| 
 | ||||
|   <%= render :partial => "form", :locals => { :f => f } %> | ||||
|    | ||||
|   <p> | ||||
|     <%= f.submit t('create') %> <%= link_back %> | ||||
|   </p> | ||||
|    | ||||
| <% end %> | ||||
| <div id="poststuff"> | ||||
| 	<h1><%= t('admin.new_page') %></h1> | ||||
| 	<%= form_for @item, :url => admin_page_path, :html => { :class => 'form-horizontal edit_page' }  do |f| %> | ||||
| 		<%= render :partial => "form", :locals => { :f => f } %> | ||||
| 		<div class="form-actions"> | ||||
| 			<%= f.submit t('update'), :class => 'btn btn-primary' %> | ||||
| 			<%= link_to t('cancel'), get_go_back, :class=>"btn" %> | ||||
| 		</div> | ||||
| 	<% end %> | ||||
| </div> | ||||
|  | @ -175,6 +175,7 @@ module ParserCommon | |||
|           ret << "<div id='#{content['name']}' part_id='#{part.id}' class='editable' style='border:solid 1px; margin:5px; padding:5px;'>" if part | ||||
|           ret << "<div class='edit_link' style='display:none'>" | ||||
|           ret << " <a href='#{edit_admin_page_part_path(part.id)}' class='nav'>#{t(:edit)}</a>" if part | ||||
|           ret << '</div>' | ||||
|         end | ||||
|         case part.kind | ||||
|         when 'text' | ||||
|  | @ -189,7 +190,6 @@ module ParserCommon | |||
|         else | ||||
|             '' | ||||
|         end if part | ||||
|         ret << '</div>' if edit | ||||
|       end | ||||
|       scope = "<#{content.name}" | ||||
|       content.attributes.each_pair do |key, value| | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue