kit_cms 2.3.20 → 2.3.22

data/app/views/admin/q/show.html.haml

@@ -0,0 +1,98 @@
+- content_for :main do
+
+  .auth
+    %h1.notificationqueue_icon Notification Queue '#{@publisher.name}'
+
+    .link(style='margin: 20px 0;')
+      = icon_to "Notification Queue Publishers", "/admin/q" if is_admin?
+
+    = icon_to_show "Create Event", "create" 
+
+    #create(style="display: none;")
+      = form_for @event, :url=>"/admin/q/#{@publisher.id}" do |f|
+        %p
+          %label Topic
+          = f.text_field :topic
+        
+        %p
+          %label Class
+          = f.select :klass, options_from_collection_for_select(@publisher.q_klasses.select("distinct name").all, :name, :name, @event.klass), :include_blank=>true
+
+        %p
+          %label Data
+          = f.text_area :data
+
+        %p
+          %label
+          = kit_submit "Create"
+
+    .advanced
+      %h3
+        Classes: 
+        = @publisher.q_klasses.count
+
+      = icon_to "Classes", "/admin/q/#{@publisher.id}/klasses"
+
+    %h3
+      Sent:
+      = @publisher.q_messages.count
+    
+    = icon_to "Sent", "/admin/q/#{@publisher.id}/messages" 
+
+    %h3 
+      Events:
+      = @publisher.q_events.count
+
+    = icon_to "Events", "/admin/q/#{@publisher.id}/events" 
+ 
+    %h3 
+      Subscriptions:
+      = @publisher.q_subscriptions.count
+
+    = icon_to "Subscriptions", "/admin/q/#{@publisher.id}/subscriptions" 
+
+    %h3 
+      Users:
+      = @publisher.q_users.count
+
+    = icon_to "Users", "/admin/q/#{@publisher.id}/users" 
+
+    .advanced(style="margin-top: 10px;")
+      = icon_to_show("Authentication", "auth") unless params[:auth]
+
+      #auth(style='#{"display: none; " unless params[:auth]} margin-top: 10px;')
+        %p
+          %label Name: 
+          = best_in_place @publisher, :name, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label EMail (sender): 
+          = best_in_place @publisher, :mail_from, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Callback Auth URL:
+          = best_in_place @publisher, :callback_auth_url, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Auth ID: 
+          = best_in_place @publisher, :auth_id, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Method: 
+          = best_in_place @publisher, :auth_method, :path=>"/admin/q/#{@publisher.id}"
+          Typically: digest, token
+        %p
+          %label Token: 
+          = best_in_place @publisher, :token, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Auth Secret: 
+          = best_in_place @publisher, :auth_secret, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Twitter Consumer Key:
+          = best_in_place @publisher, :twitter_consumer_key, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Twitter Consumer Secret:
+          = best_in_place @publisher, :twitter_consumer_secret, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Twitter OAuth Token:
+          = best_in_place @publisher, :twitter_oauth_token, :path=>"/admin/q/#{@publisher.id}"
+        %p
+          %label Twitter OAuth Token Scret:
+          = best_in_place @publisher, :twitter_oauth_token_secret, :path=>"/admin/q/#{@publisher.id}"
+

data/app/views/admin/q/subscriptions.html.haml

@@ -0,0 +1,26 @@
+- content_for :main do
+
+  %h1.notificationqueue_icon= "Notification Queue '#{@publisher.name}' Subscriptions"
+
+  .link(style='margin: 20px 0;')
+    = icon_to "Notification Queue", "/admin/q/#{@publisher.id}"
+
+  - subscriptions = @publisher.q_subscriptions.includes(:q_user).order("id desc").page(params[:s_page]).per(100)
+  
+  %table.loosen_more
+    %tr
+      %th Topic
+      %th Created
+      %th User ID
+      %th Address
+      %th Last Notification Sent
+      
+    - subscriptions.each do |s|
+      %tr
+        %td= s.topic
+        %td= time_ago_in_words(s.created_at) 
+        %td= s.q_user.email
+        %td= s.q_user.methods
+        %td= time_ago_in_words(s.last_notification) rescue ''
+  = paginate subscriptions, :param_name=>:s_page
+

data/app/views/admin/q/users.html.haml

@@ -0,0 +1,27 @@
+- content_for :main do
+
+  %h1.notificationqueue_icon= "Notification Queue '#{@client.name}' Users"
+
+  .link(style='margin: 20px 0;')
+    = icon_to "Notification Queue", "/admin/q/#{@client.id}"
+
+  - users = @client.q_users.order("id desc").page(params[:u_page]).per(100)
+  
+  = paginate users, :param_name=>:u_page
+  %table.loosen_more
+    %tr
+      %th External ID
+      %th Created 
+      %th Updated
+      %th Method
+      %th Address
+    - users.each do |u|
+      %tr
+        %td= u.q_external_id
+        %td= time_ago_in_words(u.created_at)
+        %td= time_ago_in_words(u.updated_at)
+        %td= u.notification_method
+        %td= u.display_notification
+
+
+

data/app/views/admin/snippet/edit.html.erb

@@ -18,7 +18,7 @@
   </div>
   </div>
     <b>Content:</b><br/>
-    <%= cm_editor('html', :snippet, :body, f) %>
+    <%= cm_editor("snippet[body]", {:mode=>'html'}) %>
 
 
     <%= kit_submit "Save" %> or <%= link_to "Cancel", "/admin/snippet/#{@snippet.id}" %>

data/app/views/admin/snippet/new.html.erb

@@ -17,7 +17,7 @@
   </div>
 
   <b>Content:</b><br/>
-    <%= cm_editor('html', :snippet, :body, f) %>
+    <%= cm_editor("snippet[body]", {:mode=>'html'}) %>
 
     <%= kit_submit "Save" %> or <%= icon_to "Cancel", "/admin/snippet" %>
   <% end %>

data/app/views/admin/stylesheet/show.html.haml

@@ -21,7 +21,7 @@
       - if flash[:notice]
         #error_explanation
           = flash[:notice]
-      = cm_editor('scss', :sheet, :body, f, "stylesheet_body")
+      = cm_editor("sheet[body]", {:mode=>'scss'})
 
       = kit_submit "Save"
       = link_to "Delete", "/admin/stylesheet/#{@sheet.id}", :method=>:delete, :class=>"action", :confirm=>"Are you sure you want to delete this stylesheet?  It cannot be undone."

data/app/views/admin/user/index.html.erb

@@ -27,7 +27,7 @@
         <td>
             <select name="grp_id">
               <option></option>
-              <%= options_from_collection_for_select(Group.order(:name).all, "id", "name", params[:grp_id]) %>
+              <%= options_from_collection_for_select(Group.sys(_sid).order(:name).all, "id", "name", params[:grp_id]) %>
             </select>
             <div class="field_help">
               Optional: a group to which the user(s) belong(s)
@@ -52,14 +52,23 @@
   <% if @users != nil  %> 
   <div style="margin-top: 10px;" id="user-list">
     <%= paginate(@users) %>
-    <ul class='long_list'>
+    <table class='loosen'>
+      <tr>
+        <th>Email</th>
+        <th>Nickname</th>
+        <th>Status</th>
+        <th>Last Sign In</th>
+      </tr>
       <% @users.each do |user| %>
         <% next if user.id.to_i==1 %>
-        <li>
-        <%= link_to user.email, "/admin/user/#{user.id}" %> <%= user.display_name %>
-        </li>
+        <tr>
+          <td><%= link_to user.email, "/admin/user/#{user.id}" %></td>
+            <td><i><%= user.display_name %></i></td>
+            <td><%= user.status_display %></td>
+            <td><%= time_ago_in_words user.last_sign_in_at rescue 'not signed in' %></td>
+          </tr>
       <% end %>
-    </ul>
+    </table>
   </div>
 
 

data/app/views/admin/user/view.html.erb

@@ -15,12 +15,12 @@
 
   <% if Preference.get_cached(_sid, 'show_groups') %>
   <tr><td valign='top'><%= link_to "Groups", "/admin/groups" %>:</td><td>
-      <%= @user.groups.map {|g| link_to g.name, "/admin/user/#{@user.id}/group/#{g.id}", :method=>"delete" }.join(", ").html_safe %>
+      <%= @user.groups.sys(_sid).map {|g| link_to g.name, "/admin/user/#{@user.id}/group/#{g.id}", :method=>"delete" }.join(", ").html_safe %>
       <%= "<span class='field_help'>click to remove</span>".html_safe if @user.groups.size>0 %>
         <% one_group = false %>
       <div style="display: none;" id="add_to_groups">
         <ul>
-          <% Group.order(:name).all.each do |group| %>
+          <% Group.sys(_sid).order(:name).all.each do |group| %>
           <% next if @user.groups.include?(group)  %>
           <li>
           <% one_group = true %>
@@ -44,11 +44,12 @@
 
   <tr><td width="200">Sign in count:</td><td><%= @user.sign_in_count %></td></tr>
   <tr><td>Registered:</td><td><%= time_ago_in_words(@user.created_at) %> ago at <%= @user.created_at %></td></tr>
+  <tr><td>Sign Up IP:</td><td><%= ip_info_link @user.sign_up_ip rescue '' %></td></tr>
     <tr><td>Last sign in:</td><td><%= time_ago_in_words(@user.last_sign_in_at) rescue 'never' %> ago at <%= @user.last_sign_in_at rescue 'never' %></tr>
     <tr><td>Current sign in:</td><td><%= time_ago_in_words(@user.current_sign_in_at) rescue 'never' %> ago at <%= @user.current_sign_in_at rescue 'never'%></tr>
-      <tr><td>Current sign in IP:</td><td><%= @user.current_sign_in_ip %></td></tr>
+      <tr><td>Current sign in IP:</td><td><%= ip_info_link @user.current_sign_in_ip %></td></tr>
       <tr><td>Last sign in:</td><td><%= time_ago_in_words(@user.last_sign_in_at) rescue 'never' %></td></tr>
-      <tr><td>Last sign in IP:</td><td><%= @user.last_sign_in_ip rescue 'none' %></td></tr>
+      <tr><td>Last sign in IP:</td><td><%= @user.last_sign_in_up ? ip_info_link(@user.last_sign_in_ip) : '' rescue 'none' %></td></tr>
       <% if feature?("newsletters") %>
       <tr><td>Subscribed Newsletter:</td><td><%= @user.subscribe_newsletter==1 ? 'Yes' : 'No' %>
           <%= link_to "Unsubscribe", "/admin/user/#{@user.id}?newsletter=0", :class=>"action_pl" if @user.subscribe_newsletter==1 %>

data/app/views/admin/views/_form.html.haml

@@ -11,17 +11,17 @@
 
     %p
       = f.label :body
-      = cm_editor("html", :view, :body, f, nil, :height=>"400px")
+      = cm_editor("view[body]", {:mode=>"html", :height=>"400px"})
 
     %p
       = f.label :header
-      = cm_editor("html", :view, :header, f, nil, :height=>"120px")
+      = cm_editor("view[header]", {:mode=>"html", :height=>"120px"})
       .field_help
         Optional
 
     %p
       = f.label :footer
-      = cm_editor("html", :view, :footer, f, nil, :height=>"120px")
+      = cm_editor("view[footer]", {:mode=>"html", :height=>"120px"})
       .field_help
         Optional
 

data/app/views/calendar/_buy_tickets.html.haml

@@ -65,7 +65,7 @@
       %p.terms
         %label(for="terms")
           Accept our 
-          = link_to "Terms and Conditions", options[:term_url], :target=>"_blank"
+          = link_to "Terms and Conditions", options[:terms_url], :target=>"_blank"
         = check_box_tag :terms
 
     

data/app/views/calendar/_calendar_entry.html.haml

@@ -81,7 +81,7 @@
       Owner options: 
       = link_to options[:list_sold_label] || "Show Sold Tickets", options[:list_sold_url]
 
-  - if options[:sell_tickets_setup_url] && entry.sell_tickets==0 && ( (current_user && entry.user_id == current_user.id ) || current_user.admin?)
+  - if options[:sell_tickets_setup_url] && entry.sell_tickets==0 && ( (current_user && entry.user_id == current_user.id ) || (current_user && current_user.admin?))
     = link_to options[:sell_tickets_setup_label] || "Sell Tickets For This Online", options[:sell_tickets_setup_url]
 
 

data/app/views/calendar/_month.html.haml

@@ -101,10 +101,11 @@
           - col += 1
 
       %td(id="box_#{key}" rel="#{key}" class="date_box #{date.strftime("%A").downcase if key==1} #{'today' if (date+(key-1).days).to_date==Date.today}")
+        .day_wrap
         - if mini
           = key
         - else
-          = link_to_function key, "month_show_day(#{key})"
+          = link_to key, "jump_details", :onClick=>"month_show_day(#{key})"
         - if days.size==0 || mini
            
         - else 
@@ -118,11 +119,12 @@
                   .event_count
                     = "#{cnt}"
                 
-                = link_to_function "more...", "month_show_day(#{key})"
+                = link_to "more...", "jump_details", :onClick=>"month_show_day(#{key})"
                 - break
               - else
-                = "*" unless entry.approved_at
-                = link_to_function truncate(entry.name, :length=>20), "month_show_entry(#{key}, #{entry.id})"
+                .day_entry
+                  = "*" unless entry.approved_at
+                  = link_to truncate(entry.name, :length=>20), "jump_details", :onClick=>"month_show_entry(#{key}, #{entry.id})"
 
 
       - if col==7
@@ -137,13 +139,11 @@
         - need_close = true
 
     = "</tr>".html_safe if need_close
-
-
-
         
   .clear
 
   - unless mini
+    %a(id="jump_details")
     .details
       - entries.keys.sort.each do |key|
         %ul(id="day_#{key}" style="display: none;")

data/app/views/form/_show.html.haml

@@ -57,7 +57,7 @@
           %ul
             - other_fields.each do |field|
               - next if field.hidden==1
-              - value = current_value(@sub, field)
+              - value = current_value(@sub, field) rescue ""
               = render :partial=>"/form/field", :locals=>{:field=>field, :value=>value}
 
       - if form.use_text_captcha?(request, current_user)

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

@@ -32,11 +32,11 @@
               = t "forum.post_title"
             = form.text_field :title
         #body
-          %label(label_for='post_body')
-            = t "forum.post_body"
-          .post_box(style="border: thin #AAA solid; margin-bottom: 10px;")
-            = form.text_area :body
-            = cm_editor('markdown', :topic_post, :body, form, nil, {:theme=>"neat", :dont_show_mode=>true, :dont_show_line_numbers=>true, :height=>300, :show_toolbar=>true}) if Preference.get_cached(_sid, "use_markdown_editor")=="true"
+          .post_box
+            - if use_markdown_editor=='true'
+              = cm_editor("topic_post[body]", {:mode=>"markdown", :theme=>"neat", :dont_show_mode=>true, :dont_show_line_numbers=>true, :show_toolbar=>true, :height=>300, :width=>797})
+            - else
+              = form.text_area :body
 
         - formatting = kit_snippet('Forum Post Formatting Help')
         - if formatting.not_blank?
@@ -46,8 +46,7 @@
         #submit
           = link_to_function t("forum.submit_post"), "send_this_form();", :class=>"action"
           .display_name
-            Posting as "
-            = current_user.display_name if current_user && current_user.display_name
-            "
+            = t "forum.posting_as"
+            "#{current_user.display_name if current_user && current_user.display_name}"
 
 

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

@@ -33,8 +33,20 @@ function done_delete(id, visible) {
   $('#mod_button_'+id).show();
 }
 
+function mod_reply(post_id, thread_id) {
+  var body = $('#body_'+post_id);
+  body.append("<div id='popup_form'></div>");
+  div = $('#popup_form');
+  div.append('<textarea style="width: 400px;" rows="10" id="topic_post_reply"></textarea>');
+  div.append('<br/><input type="button" onClick="save_reply(' + post_id + ',' + thread_id + ');" value="Save"/>');
+  $('#topic_post_reply').focus();
+  $('#reply_' + post_id).hide();
+}
+
 var editing_id = null;
 
+var use_markdown_editor = <%= use_markdown_editor %>;
+
 function edit_post(thread_id, post_id) {
   if (editing_id!=null) {
     $('#popup_form').remove();
@@ -43,19 +55,33 @@ function edit_post(thread_id, post_id) {
   body.append('<div id="popup_form"></div>');
   div = $('#popup_form');
 
-  div.append('Post: <textarea style="width:95%;" rows="18" id="topic_post_body_mod"></textarea>');
-  // TODO: Markdown editor
-  div.append('Comment: <textarea style="width:95%;" rows="6" id="comment"></textarea>');
+  if (use_markdown_editor) {
+    div.append('Post: <div style="width:800px;" id="topic_post_body_mod"></div>');
+    $('#topic_post_body_mod').load("/forums/post/"+post_id+"?editor=1&mod=1");
+  }  
+  else {
+    div.append('Post: <textarea style="width:800px;" rows="18" id="topic_post_body_mod"></textarea>');
+    $('#topic_post_body_mod').load("/forums/post/"+post_id);
+  }
+
+  div.append('Comment: <textarea style="width:800px;" rows="6" id="comment"></textarea>');
   div.append('<br/><input type="button" onClick="save_edit();" value="Save"/>');
-  $('#topic_post_body_mod').load("/forums/post/"+post_id);
 
   editing_id = post_id;
 }
 
-
 function save_edit() {
   var id = editing_id;
-  var body = $('#topic_post_body_mod').val();
+
+  var body;
+  if (use_markdown_editor) {
+    body = get_editor_by_name('topic_post_body_mod').getValue();
+    deregister_editor_by_name('topic_post_body_mod');
+  } 
+  else {
+    body = $('#topic_post_body_mod').val();
+  }
+
   var comment = $('#comment').val();
   $('#mod_button_'+id).show();
   $('#mod_comment_'+id).hide();				
@@ -73,6 +99,18 @@ function save_edit() {
   });
 }
 
+function save_reply(post_id, thread_id) {
+  $.ajax({
+    type: 'post',
+    url: '/forums/mod/' + thread_id + '-mod',
+  data: {"topic_post[body]": $('#topic_post_reply').val()},
+  success: function(data) {
+    $('#popup_form').remove();
+    $('#body_' + post_id).append("<div style='color: red;'>Reply saved</div>");
+  }
+  });
+}
+
 function show_mod_comments(post_id) {
   $('#mod_button_'+post_id).hide();
   $('#mod_comment_'+post_id).load("/forums/comments/" + post_id);
@@ -96,3 +134,5 @@ function spam(thread_id, mode) {
 $(document).ready(function() {
   $('#mod_spam_popup').dialog({autoOpen: false, modal:true});
 });
+
+