typo 5.4.4 → 5.5

data/public/stylesheets/administration.css

@@ -512,7 +512,7 @@ div.setting { float: left; margin-bottom: 12px;}
 
 /* Form */
 .float { display: block; float: left; width: 200px; line-height: 20px; }
-.large { width: 100%; }
+.large { width: 99%; }
 .medium { width: 300px;}
 p.settings { width: 530px; text-align: right; }
 .input_text input, .input_text textarea { -moz-border-radius: 3px; -webkit-border-radius: 3px; border-radius: 3px; }
@@ -658,4 +658,21 @@ td.paginate {
   margin-left: 4%;
 }
 
-.target { cursor: move;}
+.target { cursor: move;}
+
+#header {
+  float: left;
+  width: 70%;
+}
+
+#logout {
+  display: block;
+  width: 28%;
+  margin-left: 70%;
+  text-align: right;
+  padding-top: 10px;
+}
+
+#container {
+  clear: both;
+}

data/themes/dirtylicious/views/articles/_article.html.erb

@@ -9,22 +9,26 @@
   </div>
   
   <div class="content">
-    <% unless controller.action_name == 'redirect' %>
-      <% if article.excerpt? %>
-        <%= article.excerpt %>
+    <% if article.password.nil? or article.password.empty? %>
+      <% unless controller.action_name == 'redirect' %>
+        <% if article.excerpt? %>
+          <%= article.excerpt %>
+        <% else %>
+          <%= article.html(:body) %>
+          <% if article.extended? %>
+            <div class="extended">
+              <p><%= link_to_permalink article, _("Continue reading") + "..." %></p>
+            </div>
+          <% end %>
+        <% end %>
       <% else %>
         <%= article.html(:body) %>
-        <% if article.extended? %>
-          <div class="extended">
-            <p><%= link_to_permalink article,"Continue reading..." %></p>
-          </div>
-        <% end %>
+        <div class="extended">
+          <%= article.html(:extended) %>
+        </div>
       <% end %>
     <% else %>
-      <%= article.html(:body) %>
-      <div class="extended">
-        <%= article.html(:extended) %>
-      </div>
+      <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
     <% end %>
   </div>
 

data/themes/dirtylicious/views/articles/_article_content.html.erb

@@ -0,0 +1 @@
+<%= @article.html(:all) %>

data/themes/dirtylicious/views/articles/_password_form.html.erb

@@ -0,0 +1,10 @@
+<div id='content-<%= article.id %>'>
+  <p>This post is password protected. Please fill in your password or login to view the content</p>
+  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
+    <%= password_field(:article, :password) %>
+    <input type='hidden' name='article[id]' value='<%= article.id %>' />
+    <%= submit_to_remote('check_password', _('Submit') + '!',
+                         :update => "content-#{article.id}",
+                         :url    => {:action => 'check_password'}) %>
+  <% end %>
+</div>

data/themes/scribbish/views/articles/_article.html.erb

@@ -10,23 +10,27 @@
   </p>
 
   <div class="content">
-    <% unless controller.action_name == 'redirect' %>
-      <% if article.excerpt? %>
-        <%= article.excerpt %>
+    <% if article.password.nil? or article.password.empty? %>
+      <% unless controller.action_name == 'redirect' %>
+        <% if article.excerpt? %>
+          <%= article.excerpt %>
+        <% else %>
+          <%= article.html(:body) %>
+          <% if article.extended? %>
+            <div class="extended">
+              <p><%= link_to_permalink article,"Continue reading..." %></p>
+            </div>
+          <% end %>
+        <% end %>
       <% else %>
         <%= article.html(:body) %>
-        <% if article.extended? %>
-          <div class="extended">
-            <p><%= link_to_permalink article,"Continue reading..." %></p>
-          </div>
-        <% end %>
+        <div class="extended">
+          <%= article.html(:extended) %>
+        </div>
+      <% end %>
+      <% else %>
+        <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
       <% end %>
-    <% else %>
-      <%= article.html(:body) %>
-      <div class="extended">
-        <%= article.html(:extended) %>
-      </div>
-    <% end %>
   </div>
 
   <ul class="meta">

data/themes/scribbish/views/articles/_article_content.html.erb

@@ -0,0 +1 @@
+<%= @article.html(:all) %>

data/themes/scribbish/views/articles/_password_form.html.erb

@@ -0,0 +1,10 @@
+<div id='content-<%= article.id %>'>
+  <p>This post is password protected. Please fill in your password or login to view the content</p>
+  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
+    <%= password_field(:article, :password) %>
+    <input type='hidden' name='article[id]' value='<%= article.id %>' />
+    <%= submit_to_remote('check_password', _('Submit') + '!',
+                         :update => "content-#{article.id}",
+                         :url    => {:action => 'check_password'}) %>
+  <% end %>
+</div>

data/themes/standard_issue/views/articles/_article.html.erb

@@ -1,22 +1,26 @@
 <div class="atomentry" id="article-<%= article.id %>">
   <h2 class="title"><%= (controller.action_name.include? 'permalink') ? article.title : link_to_permalink(article,article.title) %></h2>
   <div class="content">
-    <% unless controller.action_name == 'redirect' %>
-      <% if article.excerpt? %>
-        <%= article.excerpt %>
+    <% if article.password.nil? or article.password.empty? %>
+      <% unless controller.action_name == 'redirect' %>
+        <% if article.excerpt? %>
+          <%= article.excerpt %>
+        <% else %>
+          <%= article.html(:body) %>
+          <% if article.extended? %>
+            <div class="extended">
+              <p><%= link_to_permalink article,"Continue reading..." %></p>
+            </div>
+          <% end %>
+        <% end %>
       <% else %>
         <%= article.html(:body) %>
-        <% if article.extended? %>
-          <div class="extended">
-            <p><%= link_to_permalink article,"Continue reading..." %></p>
-          </div>
-        <% end %>
+        <div class="extended">
+          <%= article.html(:extended) %>
+        </div>
       <% end %>
     <% else %>
-      <%= article.html(:body) %>
-      <div class="extended">
-        <%= article.html(:extended) %>
-      </div>
+      <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
     <% end %>
   </div>
 	<div class="meta">

data/themes/standard_issue/views/articles/_article_content.html.erb

@@ -0,0 +1 @@
+<%= @article.html(:all) %>

data/themes/standard_issue/views/articles/_password_form.html.erb

@@ -0,0 +1,10 @@
+<div id='content-<%= article.id %>'>
+  <p>This post is password protected. Please fill in your password or login to view the content</p>
+  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
+    <%= password_field(:article, :password) %>
+    <input type='hidden' name='article[id]' value='<%= article.id %>' />
+    <%= submit_to_remote('check_password', _('Submit') + '!',
+                         :update => "content-#{article.id}",
+                         :url    => {:action => 'check_password'}) %>
+  <% end %>
+</div>

data/themes/true-blue-3/helpers/theme_helper.rb

@@ -69,10 +69,10 @@ def category_name(id)
 end
 
 def display_comments_counter(article)
-  pluralize(article.published_comments.size, 
+  link_to pluralize(article.published_comments.size, 
           _('%d comments', article.published_comments.size),
           _('%d comment', article.published_comments.size), 
-          _('%d comments', article.published_comments.size))  
+          _('%d comments', article.published_comments.size)), article.permalink_url
 end
 
 def show_pages_links

data/themes/true-blue-3/stylesheets/style.css

@@ -210,6 +210,10 @@ a {
 
 }
 
+.comments a {
+	color: #fb7c00;
+}
+
 #external {
   position: absolute;
   top: 55px;
@@ -435,7 +439,6 @@ img.gravatar {
 }
 
 p.comment {
-  background: url('../../images/theme/bg_input.jpg') left no-repeat;
   padding: 10px 3px 0 5px;
   width: 230;
   height: 30px;
@@ -444,10 +447,14 @@ p.comment {
 #comment_author,
 #comment_email,
 #comment_url {
-  height: 20px;
+  padding: 10px 3px 0 5px;
   border: none;
   font: 13px/20px "Lucida Sans Unicode", "Lucida Grande", Arial, sans-serif;
   width: 290px;
+	border: #000 1px solid;
+	-moz-border-radius: 5px;
+	moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 #comment_body {
@@ -455,10 +462,13 @@ p.comment {
   font: 13px/20px "Lucida Sans Unicode", "Lucida Grande", Arial, sans-serif;	
   width: 640px;
   height: 175px;
+	border: #000 1px solid;
+	-moz-border-radius: 5px;
+	moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
 }
 
 p.body {
-  background: url('../../images/theme/textarea_bg.jpg') left no-repeat;
   padding: 10px 5px;
 }
 
@@ -553,3 +563,17 @@ a#carousel-previous {
 #carousel-next {
   right: 0;
 }
+
+#form-submit-button {
+	border: #d46900 1px solid;
+	background: url("../../images/theme/submit_form.jpg") bottom left repeat-x #fe9e3f;
+	color: #fff;
+	-moz-border-radius: 4px;
+	moz-border-radius: 4px;
+	border-radius: 4px;
+	-webkit-border-radius: 4px;
+	font: 14px/14px "Lucida Sans Unicode", "Lucida Grande", Arial, sans-serif;
+	text-transform: capitalize;
+	padding: 10px 15px;
+
+}

data/themes/true-blue-3/views/articles/_article.html.erb

@@ -1,17 +1,22 @@
 <div class='category-excerpt <%= "border" if @article_counter >= 0 %>' id="article-<%= article.id %>">
   <h2><%= (controller.controller_name == 'redirect') ? article.title : link_to_permalink(article,article.title) %></h2>
-  <% unless controller.action_name == 'redirect' %>
-    <% if article.excerpt? %>
-      <%= article.excerpt %>
+  <% if article.password.nil? or article.password.empty? %>
+    <% unless controller.action_name == 'redirect' %>
+      <% if article.excerpt? %>
+        <%= article.excerpt %>
+      <% else %>
+        <%= article.html(:body) %>
+      <% end %>
     <% else %>
       <%= article.html(:body) %>
+      <% if article.extended? %>
+        <%= article.html(:extended) %>
+      <% end %>
     <% end %>
-  <% else %>
-    <%= article.html(:body) %>
-    <% if article.extended? %>
-      <%= article.html(:extended) %>
+    <% else %>
+      <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
     <% end %>
-  <% end %>
+    
   <div class='author'>
     Published on <%= _(article.published_at.utc.strftime(_("%%a, %%d %%b %%Y %%H:%%M", article.published_at.utc))) %>
   </div>

data/themes/true-blue-3/views/articles/_article_content.html.erb

@@ -0,0 +1 @@
+<%= @article.html(:all) %>

data/themes/true-blue-3/views/articles/_comment_form.html.erb

@@ -17,7 +17,7 @@
     <%= text_area 'comment', 'body' %>
   </p>
   <p class='comment_submit'>
-    <input type='image' id='form-submit-button' onclick='this.form.submit()' src='<%= image_path "theme/comment.jpg"%>' />
+    <input type='submit' id='form-submit-button' value="<%= _('comment') %>" />
   </p>
 </div>
 <% end %>

data/themes/true-blue-3/views/articles/_password_form.html.erb

@@ -0,0 +1,10 @@
+<div id='content-<%= article.id %>'>
+  <p>This post is password protected. Please fill in your password or login to view the content</p>
+  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
+    <%= password_field(:article, :password) %>
+    <input type='hidden' name='article[id]' value='<%= article.id %>' />
+    <%= submit_to_remote('check_password', _('Submit') + '!',
+                         :update => "content-#{article.id}",
+                         :url    => {:action => 'check_password'}) %>
+  <% end %>
+</div>

data/themes/true-blue-3/views/categories/_article.html.erb

@@ -1,5 +1,6 @@
 <div class='category-excerpt <%= "border" if @article_counter >= 0 %>' id="article-<%= article.id %>">
   <h2><%= link_to_permalink(article, article.title) %></h2>
+  <% if article.password.nil? or article.password.empty? %>
     <% if article.excerpt? %>
       <%= article.excerpt %>
     <% else %>
@@ -11,6 +12,10 @@
         <%= article.html(:extended) %>
       <% end %>
     <% end %>
+  <% else %>
+    <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
+  <% end %>
+  
   <div class='author'>
     Published on <%= _(article.published_at.utc.strftime(_("%%a, %%d %%b %%Y %%H:%%M", article.published_at.utc))) %>
   </div>

data/themes/true-blue-3/views/tags/_article.html.erb

@@ -1,5 +1,6 @@
 <div class='category-excerpt <%= "border" if @article_counter >= 0 %>' id="article-<%= article.id %>">
   <h2><%= (controller.controller_name == 'redirect') ? article.title : link_to_permalink(article,article.title) %></h2>
+  <% if article.password.nil? or article.password.empty? %>
     <% if article.excerpt? %>
       <%= article.excerpt %>
     <% else %>
@@ -11,6 +12,9 @@
         <%= article.html(:extended) %>
       <% end %>
     <% end %>
+  <% else %>
+    <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
+  <% end %>
   <div class='author'>
     Published on <%= _(article.published_at.utc.strftime(_("%%a, %%d %%b %%Y %%H:%%M", article.published_at.utc))) %>
   </div>

data/themes/typographic/views/articles/_article.html.erb

@@ -6,22 +6,26 @@
     </div>
   </div>
   <div class="content">
-    <% unless controller.action_name == 'redirect' %>
-      <% if article.excerpt? %>
-        <%= article.excerpt %>
+    <% if article.password.nil? or article.password.empty? %>
+      <% unless controller.action_name == 'redirect' %>
+        <% if article.excerpt? %>
+          <%= article.excerpt %>
+        <% else %>
+          <%= article.html(:body) %>
+          <% if article.extended? %>
+            <div class="extended">
+              <p><%= link_to_permalink article,"Continue reading..." %></p>
+            </div>
+          <% end %>
+        <% end %>
       <% else %>
         <%= article.html(:body) %>
-        <% if article.extended? %>
-          <div class="extended">
-            <p><%= link_to_permalink article,"Continue reading..." %></p>
-          </div>
-        <% end %>
+        <div class="extended">
+          <%= article.html(:extended) %>
+        </div>
       <% end %>
     <% else %>
-      <%= article.html(:body) %>
-      <div class="extended">
-        <%= article.html(:extended) %>
-      </div>
+      <%= render :partial => 'articles/password_form', :locals => { :article => article } %>
     <% end %>
   </div>
   <% if controller.controller_name == "articles" and controller.action_name == "redirect" %>

data/themes/typographic/views/articles/_article_content.html.erb

@@ -0,0 +1 @@
+<%= @article.html(:all) %>

data/themes/typographic/views/articles/_password_form.html.erb

@@ -0,0 +1,10 @@
+<div id='content-<%= article.id %>'>
+  <p>This post is password protected. Please fill in your password or login to view the content</p>
+  <% remote_form_for :articles, article, :url => { :action => 'check_password'}, :update => "content-#{article.id}" do |f| %>
+    <%= password_field(:article, :password) %>
+    <input type='hidden' name='article[id]' value='<%= article.id %>' />
+    <%= submit_to_remote('check_password', _('Submit') + '!',
+                         :update => "content-#{article.id}",
+                         :url    => {:action => 'check_password'}) %>
+  <% end %>
+</div>

data/vendor/plugins/easy-ckeditor/app/controllers/ckeditor_controller.rb

@@ -12,6 +12,7 @@ class CkeditorController < ActionController::Base
     "image/pjpeg",
     "image/gif",
     "image/png",
+    "image/x-png",
     "application/x-shockwave-flash"
   ]
 
@@ -104,7 +105,7 @@ class CkeditorController < ActionController::Base
     <html>
       <body>
         <script type="text/javascript">
-          window.parent.CKEDITOR.tools.callFunction(1, "#{url_for(:controller => "/articles").gsub(%r{/$},'')}/#{uploaded_file_path}");
+          window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, "#{uploaded_file_path}");
         </script>
       </body>
     </html>'

data/vendor/plugins/easy-ckeditor/lib/ckeditor.rb

@@ -12,7 +12,7 @@ module Ckeditor
   PLUGIN_CONTROLLER_PATH = "#{PLUGIN_PATH}/app/controllers"
   PLUGIN_VIEWS_PATH = "#{PLUGIN_PATH}/app/views"
   PLUGIN_HELPER_PATH = "#{PLUGIN_PATH}/app/helpers"
-  PLUGIN_FILE_MANAGER_URI = ''
+  PLUGIN_FILE_MANAGER_URI = '/fm/filemanager'
   PLUGIN_FILE_MANAGER_UPLOAD_URI = '/ckeditor/upload'
 
   module Helper
@@ -91,22 +91,3 @@ module Ckeditor
     end
   end
 end
-
-include ActionView
-module ActionView::Helpers::AssetTagHelper
-  alias_method :rails_javascript_include_tag, :javascript_include_tag
-
-  #  <%= javascript_include_tag :defaults, :ckeditor %>
-  def javascript_include_tag(*sources)
-    main_sources, application_source = [], []
-    if sources.include?(:ckeditor)
-      sources.delete(:ckeditor)
-      sources.push('ckeditor/ckeditor')
-    end
-    unless sources.empty?
-      main_sources = rails_javascript_include_tag(*sources).split("\n")
-      application_source = main_sources.pop if main_sources.last.include?('application.js')
-    end
-    [main_sources.join("\n"), application_source].join("\n")
-  end
-end