kit_cms 2.3.20 → 2.3.22

data/app/views/forum/_post_moderation.html.haml

@@ -27,5 +27,6 @@
   = post.created_by_user.spam_points
    
    
-  IP: #{post.ip}
+  IP:
+  = ip_info_link post.ip
 

data/app/views/forum/_post_preview.html.haml

@@ -1,10 +1,2 @@
-%html
-  %head
-    = stylesheet_link_tag "application"
-    = kit_stylesheets(['forums'])
-
-  %body
-    .post_preview
-      .post_preview_inner(style="overflow: hidden; border: thin #DDD solid; padding: 5px; ")
-        = post.display_body.html_safe
+NOT USED
 

data/app/views/forum/_post_scripts.js.erb

@@ -17,6 +17,7 @@ $(document).ready(function() {
 });
 
 var editing_id = null;
+var use_markdown_editor = <%= use_markdown_editor %>;
 
 function user_edit_post(post_id) {
   if (editing_id!=null) {
@@ -25,9 +26,16 @@ function user_edit_post(post_id) {
   var bod = $('#body_'+post_id);
   bod.append('<div id="popup_form"></div>');
   div = $('#popup_form');
+  if (use_markdown_editor) {
+    div.append('Post: <div style="width:95%; z-index: 0;" id="topic_post_body_edit"></div>');
+    $('#topic_post_body_edit').load("/forums/post/"+post_id+"?editor=1");
+  }  
+  else {
+    div.append('Post: <textarea style="width:95%;" rows="18" id="topic_post_body_edit"></textarea>');
+    $('#topic_post_body_edit').load("/forums/post/"+post_id);
+  }
 
-  div.append('Post: <textarea style="width:95%;" rows="18" id="topic_post_body_edit"></textarea>');
-  // TODO Markdown editor
+  $('div#posts div.edit').hide();
   div.append('<br/><input type="button" onClick="user_save_edit();" value="Save"/>');
   $('#topic_post_body_edit').load("/forums/post/"+post_id);
   editing_id = post_id;
@@ -36,7 +44,15 @@ function user_edit_post(post_id) {
 
 function user_save_edit() {
   var id = editing_id;
-  var bod = $('#topic_post_body_edit').val();
+  var bod;
+  if (use_markdown_editor) {
+    bod = get_editor_by_name('topic_post_body_edit').getValue();
+    deregister_editor_by_name('topic_post_body_edit');
+  } 
+  else {
+    bod = $('#topic_post_body_edit').val();
+  }
+
   $('#popup_form').remove();
   editing_id = null;
 
@@ -87,7 +103,16 @@ function show_post() {
 }
 
 function validate_post() {
-  var msgbody = $('#topic_post_body').val();
+  var msgbody = "";
+
+  if (use_markdown_editor) {
+    var editor = get_editor_by_name("topic_post[body]");
+    msgbody = editor.getValue();
+  }
+  else {
+    msgbody = $('#topic_post_body').val();
+  }
+
   if (msgbody.length<2) {
     alert("You must write something!");
     return false;
@@ -107,7 +132,6 @@ function validate_post() {
   <% end %>	
   $('#topic_post_submit').val('Saving...');
   $('#topic_post_submit').attr('disabled', true);
-  $('#topic_post_body').focus();
   return true;
 }
 

data/app/views/forum/fetch_raw.html.haml

@@ -0,0 +1 @@
+= cm_editor("topic_post_body_#{is_mod ? 'mod' : 'edit'}", {:value=>@post.raw_body, :mode=>"markdown", :theme=>"neat", :dont_show_mode=>true, :dont_show_line_numbers=>true, :show_toolbar=>true, :height=>300, :width=>800}).html_safe 

data/app/views/forum/moderate.html.haml

@@ -30,5 +30,6 @@
         .mod_comment(id="mod_comment_#{post.id}")
         .info
           .mod_actions
+            = link_to_function "Quick Reply", "mod_reply(#{post.id}, #{post.topic_thread_id});", :id=>"reply_#{post.id}"
             = render partial:"post_moderation", :locals=>{:post=>post}
 

data/app/views/forum/topic_index.html.haml

@@ -2,6 +2,10 @@
   - content_for :page_scripts do
     = render :partial=>"topic_index", :formats=>[:js]
 
+- content_for :head do
+  = javascript_include_tag "codemirror/editor"
+  = stylesheet_link_tag "codemirror/editor"
+
 #forums.clearfix
 
   = render :partial=>"introduction"

data/app/views/notification/forgotten_password.text.erb

@@ -0,0 +1,2 @@
+<%= kit_snippet("Forgotten Password Email", "You have asked to reset your password.  To do so, please follow this link: #{@reset_link}", @user.system_id) %>
+

data/app/views/pages/content_edit.html.haml

@@ -6,7 +6,7 @@
   .cms_form
     = form_for @page_content, :url=>"/page/#{@page.id}/content/#{@page_content.id}", :method=>:post do |f|
 
-      = cm_editor('html', :page_content, :value, f)
+      = cm_editor("page_content[value]", {:mode=>"html"})
 
       .div
         = kit_submit "Save" 

data/app/views/pages/info.html.erb

@@ -19,9 +19,12 @@ return false;
     <%# TODO: render(:partial=>"favourite_link", :locals=>{:page_url=>@page.full_path }) %>
   </div>
 
+  <% unless @page.is_stub? %>
   <div class="clearfix">
     <%= icon_to "View", @page.full_path, false, :method=>:get %> <%= icon_to("Edit", @page.full_path+"?edit=1") unless @page.is_stub? || @page.locked? %>
   </div>
+  <% end %>
+
   <h1 class="summary_icon" style="margin-top: 20px;">Summary</h1>
   <div class="clearfix">
     <%= icon_to "Edit Info", "/page/#{@page.id}/edit"  unless @page.locked? %> 
@@ -70,6 +73,12 @@ return false;
       <td>Path:</td>
       <td colspan='2'><%= @page.full_path %></td>
     </tr>
+
+    <tr>
+      <td>Links To This Page:</td>
+      <td colspan="2"><%= PageLink.sys(_sid).where(:url=>@page.full_path).count %></td>
+    </tr>
+
     <tr>
       <td>Template:</td>
       <td><%= link_to(@page.page_template.name, "/admin/page_templates/#{@page.page_template_id}") rescue '' %></td>
@@ -203,9 +212,11 @@ return false;
 
   <tr class="advanced">
     <td colspan="3">
-      <p>Show: <%= icon_to "Page Analysis", "/db/content/analyse/#{@page.id}", false, :class=>"icon_stack advanced" %>
+      <p>Show: 
+      <%= icon_to "Links", "/page/#{@page.id}/links", false %>
+      <%= icon_to "Page Analysis", "/db/content/analyse/#{@page.id}", false, :class=>"icon_stack advanced" %>
       <%= icon_to "Content", "/page/#{@page.id}/contents", false, :class=>"advanced"  %>
-      <%= icon_to "Blocks Used On This Page", "/admin/block_instances?page_id=#{@page.id}", false, :class=>"advanced" %>
+      <%= icon_to "Blocks Used", "/admin/block_instances?page_id=#{@page.id}", false, :class=>"advanced" %>
       <%= icon_to_function "Access Permissions", "$('#access').slideDown(); $('#show_access_link').hide();",false, {:id=>'show_access_link', :class=>"icon_stack"} %>
       </p>
     </td>

data/app/views/pages/links.html.haml

@@ -0,0 +1,63 @@
+- content_for :main do 
+
+  %h1.page_icon Page '#{@page.title}' Links
+
+  .link
+    = icon_to "Page Info", "/page/#{@page.id}/info"
+
+  - if @page.needs_crawl
+    .warning(style="margin-top: 10px; color: red;")
+      This information may be out of date. You can
+      = link_to "force an update", "/page/#{@page.id}/links?refresh=1"
+      but be aware it make take some time.  Alternatively one will happen automatically soon.
+
+  - else 
+    - unless @page.updated_crawl
+      .warning(style="margin-top: 10px; color: red;")
+        This page hasn't been processed for link information. You can
+        = link_to "force an update", "/page/#{@page.id}/links?refresh=1"
+        but it will take some time to process.
+    
+
+  - links = @page.page_links.order(:url).limit(500).all
+  %h3 
+    Pages This One Links To:
+    - if links.size==500
+      Showing the first 500 but there are more
+    - else
+      = links.size
+  %ul.link_list
+    - links.each do |page|
+      %li
+        - other_page = Page.sys(_sid).where(:full_path=>page.url).first rescue nil
+        .title.clearfix(class="http_#{page.http_status}")
+          .left
+            = link_to truncate(page.url, :length=>80), page.url
+          - if other_page
+            = other_page.title
+            [
+            = link_to other_page.status.name, "/page/#{other_page.id}/info"
+            ]
+
+
+  - links = PageLink.sys(_sid).order(:url).where(:url=>@page.full_path).limit(500).all
+  %h3 
+    Pages Linking To This One:
+    - if links.size==500
+      Showing the first 500 but there are mot
+    - else
+      = links.size
+
+  %ul.link_list
+    - links.each do |page|
+      %li
+        .title.clearfix(class="http_#{page.http_status}")
+          .left
+            = link_to truncate(page.page.full_path, :length=>80), page.page.full_path
+          - if page.page
+            = page.page.title
+            [
+            = link_to page.page.status.name, "/page/#{page.page.id}/info"
+            ]
+
+

data/app/views/user/edit_profile.html.haml

@@ -1,4 +1,4 @@
-#user_profile
+#user_profile.users
   %h1 Your Profile
 
   - if @errors

data/app/views/utility/_cm_editor.html.erb

@@ -1,6 +1,8 @@
+<div class='markdown_instance'>
+
 <script type="text/javascript">
   $(document).ready(function() {
-      var editor_a = parent.document.getElementById('<%= form_field %>');
+      var editor_element = parent.document.getElementById('<%= options[:id] %>');
       var options = { 
       <% unless options[:dont_show_line_numbers] %>
       lineNumbers: true, 
@@ -10,37 +12,38 @@
       lineWrapping: true, 
       matchBrackets: true, 
       collapseRange: true, 
-      mode : '<%= mode %>'};
-      var html_editor = parent.CodeMirror.fromTextArea(editor_a, options);
-      html_editors["<%= form_field %>"] = html_editor;
-  html_editor.focus();
+      mode : '<%= options[:mode] %>'};
+      var editor = parent.CodeMirror.fromTextArea(editor_element, options);
+      register_editor(editor, "<%= options[:id] %>", "<%= name %>");
+      editor.focus();
   <% height = options[:height] %>
   <% width = options[:width] %>
   <% if height || width %>
     <% width = width ?  "\"#{width}\"" : 'null' %>
     <% height = height ?  "\"#{height}\"" : 'null' %>
-    <%= "html_editor.setSize(#{width}, #{height})".html_safe %>
+    <%= "editor.setSize(#{width}, #{height})".html_safe %>
   <% end %>
    
   });
 </script>
 
 <% unless options[:dont_show_mode] %>
-<div class='editor_mode'>Mode: <%= (mode=='htmlmixed' ? 'html' : mode).upcase %>
+<div class='editor_mode'>Mode: <%= (options[:mode]=='htmlmixed' ? 'html' : options[:mode]).upcase %>
 </div>
 <% end %>
 
 <% if options[:show_toolbar] %>
 <div class='toolbar'>
-  <%= render :partial=>"utility/cm_toolbar_#{mode}", :locals=>{:name=>form_field} %>
+  <%= render :partial=>"utility/cm_toolbar_#{options[:mode]}", :locals=>{:name=>options[:id]} %>
 </div>
 <% end %>
 
-<%= form.text_area field %>
+<textarea id="<%= options[:id] %>" name="<%= name %>"><%= options[:value] %></textarea>
 
 <% unless options[:no_preview] %>
-<div id="preview_<%= form_field %>" class='markdown_preview' style='display: none;'>
+<div id="preview_<%= options[:id] %>" class='markdown_preview' style='display: none;'>
   Please wait whilst the preview loads
 </div>
 <% end %>
 
+</div>

data/app/views/utility/_cm_toolbar_markdown.html.haml

@@ -1,6 +1,5 @@
 - rand = rand(100000)
 
-
 %ul.markdown.clearfix(id="tb_#{rand}")
   
   %li.bold(data-cmd="undo" data-hint="Undo")
@@ -37,6 +36,14 @@
   %li.spacer.pre(data-cmd="pre" data-hint="Preformatted")
     = image_tag "/assets/kit/toolbar/formatted.png"
     %label Formatted
+  - if Preference.get_cached(_sid, "forum_use_smilies")=='true'
+    %li.smile(data-cmd="smile" data-hint="Smile")
+      = image_tag "/assets/kit/toolbar/smile.png"
+      %label Smile
+    %li.spacer.wink(data-cmd="wink" data-hint="Wink")
+      = image_tag "/assets/kit/toolbar/wink.png"
+      %label Wink
+
   %li.pre(data-cmd="preview" data-hint="Preview")
     = image_tag "/assets/kit/toolbar/preview.png"
     %label Preview

data/app/views/utility/_menu.html.haml

@@ -86,6 +86,8 @@
             %a.ads_wicon(href="/admin/advertisments") Advertisments
         %p.advanced
           %a.menu_wicon(href="/menus") Menus
+        %p.advanced
+          %a.notificationqueue_wicon(href="/admin/q") Notification Queue
 
     - if can?(:use, :design) 
       %li
@@ -119,6 +121,8 @@
             %a(href="/admin/dashboard/errors") Errors
           %p
             %a(href="/admin/dashboard/logfile") Log File
+          %p
+            %a(href="/admin/dj") Delayed Job Queue
         %p
           %a.help_wicon(href="/db/help") Help
 

data/app/views/utility/mercury_html.html.haml

@@ -22,6 +22,7 @@
   var options = { lineNumbers: true, theme: 'blackboard', indentUnit: 2, lineWrapping: true, matchBrackets: true  , collapseRange: true};
   html_editor = parent.CodeMirror.fromTextArea(editor_a, options);
   html_editor.focus();
+  parent.$('.CodeMirror').css('height', ($(window).height()-40) + 'px');
   }
 
   function the_editor() {

data/config/initializers/elastic_search.rb

@@ -1,7 +1,10 @@
-app_name = Rails.configuration.es_index_name rescue 'kit'
+module ElasticSearch
+    INDEX_NAME = (Rails.configuration.es_index_name rescue Rails.application.class.to_s.split("::").first).downcase
 
-Tire::Model::Search.index_prefix "kit_#{app_name}".downcase
+    Tire::Model::Search.index_prefix INDEX_NAME
+
+    Tire.configure { logger 'log/search.log', :level => 'info' }
+end
 
-Tire.configure { logger 'log/search.log', :level => 'info' }
 
 

data/config/initializers/extend_controller.rb

@@ -2,6 +2,7 @@ module DomainController
 
   attr_accessor :kit_system
 
+
   def licensed(c = nil)
     if c!=nil
       function = c
@@ -50,6 +51,8 @@ module DomainController
             break
         end
       end
+ 
+      session[:system_id] = nil
 
       if system_id
         session[:system_id] = system_id

data/config/initializers/string.rb

@@ -20,6 +20,12 @@ class String
     options[:filter_styles] ||= true
     options[:autolink] ||= true
 
+    if options[:smilies]
+      text = text.gsub(/\:smile\:/, '+smile+smile+')
+      text = text.gsub(/\:wink\:/, '+smile+wink+')
+      text = text.gsub(/\:wall\:/, '+smile+wall+')
+    end 
+    
     r = Maruku.new(text)
 
     options.each do |k,v|
@@ -30,12 +36,9 @@ class String
     
     d = r.to_html.gsub(/!YOUTUBE!([0-9a-zA-Z\_\-]{5,15})!/i,  '<br/><iframe width="560" height="315" src="http://www.youtube.com/embed/\1" frameborder="0" allowfullscreen></iframe><br/>')  unless options[:strict_markdown] || options[:no_youtube]
     d = d.gsub(/!VIMEO!([0-9]{6,9})!/i,  '<br/><iframe src="http://player.vimeo.com/video/\1" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe><br/>') unless options[:strict_markdown] || options[:no_youtube]
- 
-    if options[:smilies]
-      d.gsub!(/:smile:/, '<img src="/assets/smilies/smile.gif" height="20" width="20" />')
-      d.gsub!(/:wink:/, '<img src="/assets/smilies/wink.gif" height="20" width="20" />')
-      d.gsub!(/:wall:/, '<img src="/assets/smilies/wall.gif" height="20" width="20" />')
-    end 
+
+    d = d.gsub(/\+smile\+([a-z0-9]+)\+/i, '<img src="/assets/smilies/\1.gif" class="smiley" />')
+
     return d
   end
 

data/config/initializers/warden.rb

@@ -0,0 +1,49 @@
+Rails.configuration.middleware.use RailsWarden::Manager do |manager|
+    manager.default_strategies :cookie, :token, :email
+    manager.failure_app = AccountController
+  end
+
+  Warden::Strategies.add(:cookie) do
+    def valid?
+      cookies[:sign_in]
+    end
+
+    def authenticate!
+      u = User.cookie_authenticate(session[:system_id], cookies[:sign_in])
+
+      success!(u) if u
+    end
+  end
+
+  Warden::Strategies.add(:email) do
+
+    def valid?
+      session[:system_id] && 
+        (
+          ( params[:email] && params[:password] ) ||
+          ( params[:user] && params[:user][:email] && params[:user][:password] )
+        )
+    end
+
+    def authenticate!
+      u = User.authenticate(session[:system_id], params[:email] || (params[:user] && params[:user][:email]), params[:password] || (params[:user] && params[:user][:password]))
+      success!(u) if u
+    end
+  end
+
+  Warden::Strategies.add(:token) do
+    def valid?
+      session[:system_id] && params[(Preference.get_cached(session[:system_id], "account_token_param") || 'token').to_sym]
+    end
+
+    def authenticate!
+      system_id = nil
+      
+      u = User.token_authenticate(session[:system_id], params[(Preference.get_cached(session[:system_id], "account_token_param") || 'token').to_sym]
+)
+      success!(u) if u
+    end
+
+  end
+
+