redditor 0.1.10 → 0.1.11

data/app/views/redditor/admin/{pages/_page.haml → _page.haml}

@@ -1,9 +1,8 @@
 = f.fields_for :page, f.object.page do |p|
 
   - unless f.object.new_record?
-    %dl.redditor{data: {"sort-url" => url_for(redditor.sort_admin_page_path(p.object))}}
-      - p.object.content_blocks.each do |content_block|
-        = render partial: "redditor/admin/pages/content_block", locals: {p: p, page: p.object, content_block: content_block}, :layout => "redditor/admin/pages/wrap_dd"
+    %dl#redditor.redditor{data: {"sort-url" => url_for(redditor.sort_admin_page_path(p.object))}}
+      = render partial: "redditor/admin/content_block", collection: p.object.content_blocks, locals: {p: p, page: p.object}
 
     %div.redditor__add-blocks
       %p

data/app/views/redditor/admin/_slider_block.haml

@@ -0,0 +1,16 @@
+.redditor__title.redditor__title_slider
+  = t 'redditor.title.slider'
+= redditor_validate f
+
+.redditor__sep
+
+- unless f.object.new_record?
+  %ul.slider-block-images{data: {"sortable-url" => redditor.sort_admin_page_slider_block_images_path(f.object.page_id, f.object.id)}}
+    = render partial: "redditor/admin/slider_block_image", collection: f.object.images, :as => :i
+
+.redditor__sep
+
+- unless f.object.new_record?
+  .b-button.js-fileapi-wrapper
+    .b-button__text= t("redditor.add.upload_images")
+    = file_field_tag :src, :class => "b-button__input redditor__js-fileapi", name: nil, :multiple => true, data: {"upload-url" => redditor.admin_page_slider_block_images_path(f.object.page_id, f.object.id)}

data/app/views/redditor/admin/_text_block.haml

@@ -0,0 +1,5 @@
+.redditor__title.redditor__title_text
+  = t 'redditor.title.text'
+= redditor_validate f
+
+= f.text_area :body, size: "25x15", class: "redditor__textarea"

data/app/views/redditor/admin/{pages/_validate.haml → _validate.haml}

@@ -1,4 +1,4 @@
 - if f.object.errors.any?
-  %ol.validate
+  %ol.redditor__validate
     - f.object.errors.full_messages.each do |msg|
       %li= msg

data/app/views/redditor/admin/{pages/_video_block.haml → _video_block.haml}

@@ -1,7 +1,7 @@
-.tit-form
+.redditor__title.redditor__title_video
   = t 'redditor.title.video'
-  = image_tag 'redditor/add_video_big.png'
 = redditor_validate f
+
 - if f.object.youtube.present?
   %iframe(width="#{f.object.width || "100%"}" height="#{f.object.height || 315}" src="http://www.youtube.com/embed/#{f.object.youtube}" frameborder="0" allowfullscreen)
   %br

data/app/views/redditor/admin/_wrapper.haml

@@ -0,0 +1,3 @@
+= fields_for @page.pageable.class.name.downcase.to_sym, @page.pageable do |a|
+  = a.fields_for :page, :include_id => false do |p|
+    = render "redditor/admin/content_block", {p: p, content_block: content_block}

data/app/views/redditor/admin/new.js.erb

@@ -0,0 +1,5 @@
+$.redditor.$el
+.append('<%= j(render(partial: "redditor/admin/wrapper", locals: {content_block: @content_block})) %>')
+.find("ul.slider-block-images").sortable($.redditor.sliderBlockImagesSortableParams)
+$.redditor.sortList()
+$.redditor.afterFunc()

data/app/views/redditor/admin/slider_block_image.js.coffee

@@ -0,0 +1,2 @@
+$("#slider_block_<%= @slider_block.id %>").find("ul.slider-block-images")
+.append '<%= j(render "redditor/admin/slider_block_image", {i: @image}) %>'

data/app/views/redditor/admin/wrapper.js.coffee

@@ -0,0 +1,5 @@
+$("#<%= real_name(@content_block) %>_<%= @content_block.temp_id %>, #<%= real_name(@content_block) %>_<%= @content_block.id %>").closest("dd")
+.replaceWith('<%= j(render(partial: "redditor/admin/wrapper", locals: {content_block: @content_block, page: @page})) %>')
+.end()
+.find("ul.slider-block-images").sortable $.redditor.sliderBlockImagesSortableParams
+$.redditor.afterFunc()

data/app/views/redditor/images/_image.html.haml

@@ -1 +1 @@
-%li{id: "image_<%= image.id %>"}= image_tag image.src.url, alt: image.description, title: image.description
+%li{id: "image_#{image.id}"}= image_tag image.src.url, alt: image.description, title: image.description

data/app/views/redditor/slider_blocks/_slider_block_image.html.haml

@@ -1 +1 @@
-%li{id: "slider_block_image_<%= image.id %>"}= image_tag image.src.url, alt: image.description, title: image.description
+%li{id: "slider_block_image_#{image.id}"}= image_tag image.src.url, alt: image.description, title: image.description

data/config/locales/redditor.ru.yml

@@ -4,7 +4,7 @@ ru:
       text_block: Добавить текст
       video_block: Добавить видео
       image_block: Добавить фото
-      slider_block: Добавить логотипы
+      slider_block: Добавить слайдер
       upload_image: Загрузить изображение
       upload_images: Загрузить изображения
       change_image: "Заменить изображение"

data/lib/redditor/engine.rb

@@ -4,8 +4,7 @@ module Redditor
 
     initializer 'redditor.action_controller' do |app|
       ActiveSupport.on_load :action_controller do
-        helper Redditor::FileapiHelper
-        helper Redditor::PagesHelper
+        helper Redditor::ApplicationHelper
       end
     end
   end

data/lib/redditor/version.rb

@@ -1,3 +1,3 @@
 module Redditor
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/redditor.gemspec

@@ -19,15 +19,8 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 4.0.0"
-  s.add_dependency 'haml'
-  s.add_dependency "carrierwave"
-  s.add_dependency "rmagick"
-  s.add_dependency "coffee-rails"
-  s.add_dependency "jquery-rails"
-  # s.add_dependency 'fileapi', git: 'git@github.com:redde/fileapi.git'
-
-  s.add_development_dependency 'jquery-rails'
+  s.add_dependency "rails", ">= 4.0.0"
+  
   s.add_development_dependency 'capybara'
   s.add_development_dependency 'poltergeist'
   s.add_development_dependency "haml-rails"

data/spec/dummy/app/assets/images/redactor/plugins/file.html

@@ -0,0 +1,3 @@
+<form id="redactorUploadFileForm" method="post" action="" enctype="multipart/form-data">
+	<input type="file" id="redactor_file" name="file" />
+</form>

data/spec/dummy/app/assets/images/redactor/plugins/image.html

@@ -0,0 +1,39 @@
+<div id="redactor_tabs">
+	<a href="javascript:void(null);" class="redactor_tabs_act">%RLANG.upload%</a>	
+	<a href="javascript:void(null);">%RLANG.choose%</a>		
+	<a href="javascript:void(null);">%RLANG.link%</a>		
+</div>
+
+
+<form id="redactorInsertImageForm" method="post" action="" enctype="multipart/form-data">	
+	<div id="redactor_tab1" class="redactor_tab">
+		<input type="file" id="redactor_file" name="file" />
+	</div>	
+	<div id="redactor_tab2" class="redactor_tab" style="display: none;">
+		<div id="redactor_image_box"></div>
+	</div>	
+</form>	
+
+	
+<div id="redactor_tab3" class="redactor_tab" style="display: none;">
+	<table class="redactor_ruler" width="100%">
+		<tr>
+			<td nowrap>%RLANG.image_web_link%</td>
+			<td width="100%"><input name="redactor_file_link" id="redactor_file_link"  style="width: 99%"  /></td>
+		</tr>
+		<tr>
+			<td></td>
+			<td>
+
+				<span class="redactor_btns_box">
+					<input type="button" name="upload" id="redactor_upload_btn" value="%RLANG.insert%" />&nbsp;&nbsp;
+					<a href="javascript:void(null);" style="color: #777; font-size: 12px;" id="redactor_btn_modal_close">%RLANG.cancel%</a>
+				</span>
+				<div style="clear: both;"></div>					
+				
+			</td>
+		</tr>
+	
+	</table>
+</div>
+

data/spec/dummy/app/assets/images/redactor/plugins/image_edit.html

@@ -0,0 +1,35 @@
+
+<table class="redactor_ruler">
+	<tr>
+		<td nowrap>%RLANG.title%</td>
+		<td><input id="redactor_file_alt" style="width: 99%;" /></td>
+	</tr>
+	<tr>
+		<td nowrap>%RLANG.link%</td>
+		<td><input id="redactor_file_link" style="width: 99%;" /></td>
+	</tr>
+	<tr>
+		<td nowrap class="small">%RLANG.image_position%</td>
+		<td width="100%">
+			<select id="redactor_form_image_align">
+				<option value="none">%RLANG.none%</option>
+				<option value="left">%RLANG.left%</option>
+				<option value="right">%RLANG.right%</option>
+			</select>
+		</td>
+	</tr>
+	<tr>
+		<td><a href="javascript:void(null);" id="redactor_image_delete_btn" style="color: #000;">%RLANG._delete%</a></td>
+		<td>
+
+			<span class="redactor_btns_box">
+				<input type="button" name="save" id="redactorSaveBtn" value="%RLANG.save%" />&nbsp;&nbsp;
+				<a href="javascript:void(null);" style="color: #777; font-size: 12px;" id="redactor_btn_modal_close">%RLANG.cancel%</a>
+			</span>
+			<div style="clear: both;"></div>		
+		
+		</td>
+	</tr>
+</table>
+
+

data/spec/dummy/app/assets/images/redactor/plugins/link.html

@@ -0,0 +1,74 @@
+<form id="redactorInsertLinkForm" method="post" action="" enctype="multipart/form-data">
+
+
+	<div id="redactor_tabs">
+		<a href="javascript:void(null);" class="redactor_tabs_act">URL</a>
+		<a href="javascript:void(null);">Email</a>
+		<a href="javascript:void(null);">%RLANG.anchor%</a>
+		<a href="javascript:void(null);">%RLANG.file%</a>
+	</div>
+	
+	<input type="hidden" id="redactor_tab_selected" value="1" />
+	
+	<div class="redactor_tab" id="redactor_tab1">
+		<table class="redactor_ruler">
+			<tr>
+				<td nowrap>URL</td>
+				<td width="100%"><input id="redactor_link_url" style="width: 99%; font-size: 16px;"  /></td>
+			</tr>
+			<tr>
+				<td>%RLANG.text%</td>
+				<td><input class="redactor_link_text" id="redactor_link_url_text" style="width: 99%; font-size: 16px;" /></td>
+			</tr>
+		</table>
+	</div>
+	<div class="redactor_tab" id="redactor_tab2" style="display: none;">
+		<table class="redactor_ruler">
+			<tr>
+				<td nowrap>Email</td>
+				<td width="100%"><input id="redactor_link_mailto" style="width: 99%; font-size: 16px;"  /></td>
+			</tr>
+			<tr>
+				<td>%RLANG.text%</td>
+				<td><input class="redactor_link_text" id="redactor_link_mailto_text" style="width: 99%; font-size: 16px;" /></td>
+			</tr>
+		</table>
+	</div>
+	<div class="redactor_tab" id="redactor_tab3" style="display: none;">
+		<table class="redactor_ruler">
+			<tr>
+				<td nowrap>%RLANG.anchor%</td>
+				<td width="100%"><input id="redactor_link_anchor" style="width: 99%; font-size: 16px;"  /></td>
+			</tr>
+			<tr>
+				<td>%RLANG.text%</td>
+				<td><input class="redactor_link_text" id="redactor_link_anchor_text" style="width: 99%; font-size: 16px;" /></td>
+			</tr>
+		</table>
+	</div>
+	<div class="redactor_tab" id="redactor_tab4" style="display: none;">
+		<table class="redactor_ruler">
+			<tr>
+				<td>%RLANG.text%</td>
+				<td><input class="redactor_link_text" id="redactor_link_file_text" style="width: 99%; font-size: 16px;" /></td>
+			</tr>
+			<tr>
+				<td></td>
+				<td>
+				
+					<input type="file" id="redactor_file" name="file" />
+				
+				</td>
+			</tr>
+		</table>	
+		
+	</div>
+
+
+</form>
+
+<span class="redactor_btns_box">
+<input type="button" id="redactor_insert_link_btn" value="%RLANG.insert%" />&nbsp;&nbsp;
+<a href="javascript:void(null);" style="color: #777; font-size: 12px;" id="redactor_btn_modal_close">%RLANG.cancel%</a>
+</span>
+<div style="clear: both;"></div>

data/spec/dummy/app/assets/images/redactor/plugins/table.html

@@ -0,0 +1,25 @@
+
+<table class="redactor_ruler" width="99%">
+	<tr>
+		<td>%RLANG.Rows%:</td>
+		<td width="100%"><input size="5" value="2" id="redactor_table_rows" /></td>
+	</tr>
+	<tr>	
+		<td>%RLANG.Columns%:</td>
+		<td><input size="5" value="3" id="redactor_table_columns" /></td>
+	</tr>
+	
+	<tr>
+		<td></td>
+		<td>
+			<br />
+			<span class="redactor_btns_box">
+				<input type="button" name="upload" id="redactor_insert_table_btn" value="%RLANG.insert%" />&nbsp;&nbsp;
+				<a href="javascript:void(null);" style="color: #777; font-size: 12px;" id="redactor_btn_modal_close">%RLANG.cancel%</a>
+			</span>
+			<div style="clear: both;"></div>			
+		
+		</td>
+	</tr>
+</table>
+

data/spec/dummy/app/assets/images/redactor/plugins/video.html

@@ -0,0 +1,15 @@
+<form id="redactorInsertVideoForm">
+<div style="font-size: 11px; margin-bottom: 3px;">%RLANG.video_html_code%</div>
+<table class="redactor_ruler" style="width: 99%;">
+	<tr>
+	 	<textarea id="redactor_insert_video_area" style="width: 99%; height: 160px;"></textarea>
+	</tr>
+</table>
+</form>
+
+
+<span class="redactor_btns_box">
+	<input type="button" id="redactor_insert_video_btn" value="%RLANG.insert%" />&nbsp;&nbsp;
+	<a href="javascript:void(null);" style="color: #777; font-size: 12px;" id="redactor_btn_modal_close">%RLANG.cancel%</a>
+</span>
+<div style="clear: both;"></div>

data/spec/dummy/app/assets/javascripts/application.js

@@ -11,6 +11,14 @@
 // about supported directives.
 //
 //= require jquery
+//= require jquery.ui.all
 //= require jquery_ujs
-//= require redditor/application
-//= require_tree .
+//= require redditor
+//= require jquery-migrate-1.2.1
+//= require redactor/redactor
+//= require redactor/langs/ru
+//= require redactor/toolbars/default
+
+$.redditor.afterFunc = function(){
+  $.redditor.$el.find('textarea').redactor();
+};