muck-contents 3.1.2 → 3.1.3

data/VERSION

@@ -1 +1 @@
-3.1.2
+3.1.3

data/app/controllers/admin/muck/contents_controller.rb

@@ -1,15 +1,10 @@
-class Admin::Muck::ContentsController < ApplicationController
-  unloadable
+class Admin::Muck::ContentsController < Admin::Muck::BaseController
   
   def index
-  end
-  
-  def edit
-    @content = Content.find(params[:id])
-    @title = @content.title
+    @contents = Content.by_title.by_newest
     respond_to do |format|
-      format.html { render :template => 'contents/edit' }
+      format.html { render :template => 'admin/contents/index' }
     end
   end
-
+  
 end

data/app/views/admin/contents/_content.erb

@@ -0,0 +1,6 @@
+<li id="<%=content.dom_id%>" class="contentContainer delete-container">
+	<span class="link"><a href="<%=content.uri%>" target="_blank"><%= content.title %></a></span>
+	<span class="content-controls">
+		<%= render :partial => 'contents/admin', :locals => {:content => content} %>
+	</span>
+</li>

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

@@ -1,28 +1,26 @@
-<div id="content-pages">
-  <h2><%= t('muck.content.manage_pages_title') %></h2>
-  <div id="pageSearch">
-    <label>Search by Page Name:</label> <input id="autoPages" />
-    <span class="link-button"><%= link_to _("Add New Page"), new_admin_page_path %></span>
+<div id="content-manage">
+  <h2><%= t('muck.contents.manage_content_title') %></h2>
+  <p><%=translate('muck.contents.admin_create_instructions') %></p>
+  <div id="content-search">
+    <label><%=translate('muck.contents.search') %></label> <input id="auto-search" />
   </div>
-  <div id="pageList">
-    <ul id="pageMasterUl">
-      <%= render :partial => 'admin/pages/page', :collection => @pages, :locals => {:parent_id => 0} -%>
+  <div id="content-list-container">
+    <ul id="content-list">
+      <%= render :partial => 'admin/contents/content', :collection => @contents, :locals => {:parent_id => 0} -%>
     </ul>
   </div>
 </div>
 
-<input id="updatePath" type="hidden" value="<%=admin_pages_path%>">
-
 <script type="text/javascript" language="JavaScript">
 jQuery(document).ready(function() {
-  var data = <%= @pages.collect{|page| { :title => page.title, :id => page.id } }.to_json %>;
-  jQuery("#autoPages").autocomplete(data, {
+  var data = <%= @contents.collect{|content| { :title => content.title, :id => content.id } }.to_json.html_safe %>;
+  jQuery("#auto-search").autocomplete(data, {
     minChars: 0,
     autoFill: true,
     mustMatch: false,
     formatItem: function(item) {
       return item.title;
     }
-  }).result(function(event, item) { location.href = '/admin/pages/' + item.id + '/edit'; });
+  }).result(function(event, item) { location.href = '/contents/' + item.id + '/edit'; });
 });
 </script>

data/app/views/contents/_admin.erb

@@ -1,7 +1,4 @@
 <% if logged_in? && content.can_edit?(current_user) -%>
-  <% if current_user.can_add_root_content? -%>
-    <%= link_to t('muck.contents.add'), new_content_path, :title => t('muck.contents.add_title'), :class => 'admin-content' -%> |
-  <% end -%>
   <%= link_to t('muck.contents.edit'), edit_content_path(content.id), :title => t('muck.contents.edit_title'), :class => 'admin-content' -%> | 
   <%= link_to t('muck.contents.delete'), content_path(content.id), :method => :delete, :title => t('muck.contents.delete_title'), :class => 'admin-content', :confirm => t('muck.contents.confirm_delete_content') -%>
 <% end -%>

data/config/locales/en.yml

@@ -1,39 +1,43 @@
----
-en:
-  muck:
-    contents:
-      save: Save
-      cancel: Cancel
-      delete: Delete
+--- 
+en: 
+  muck: 
+    contents: 
+      permalink: "Permalink:"
+      tags_help: Add tags to help identify your content.  Tags can also be used to generate lists of links for a menu.
       edit: Edit
       add: Add
+      default_404_title: 404 Page not found
+      edit_this_content: Edit this content.
+      cancel: Cancel
+      delete: Delete
+      no_images: No images available
+      cant_delete_content: You don't have permission to delete the specified content
+      submit_content_button: Save
+      problem_updating_content: There was a problem updating the content
+      add_new_page: Add New Page
+      confirm_delete_content: Are you sure you wish to delete this content?  This cannot be undone!
+      manage_content_title: Manage site content
+      edit_title: Edit this page.
+      create_error: There was a problem adding your content
+      update_error: There was a problem updating your content
+      tags: Tags
+      no_uri_error: Please set a value for uri before saving the model when contentable is nil
+      content_label: Content
+      choose_layout_help: Select a layout template that will render the chrome for this page.
+      admin_create_instructions: To create a new page just type the desired URL into your browser.
       add_title: Add new page
+      delete_title: Delete this page.
+      title_label: Title
+      save: Save
+      tag_information: Tags help other users find your page and will be used as the meta keywords for the document.
+      tags_label: Tags
+      content_help: This is the content that will appear on the page.
+      problem_adding_content: There was a problem adding the content
       preview: Preview
-      delete_title: "Delete this page."
-      edit_title: "Edit this page."
-      no_files: "No files available"
-      no_images: "No images available"
-      create_error: "There was a problem adding your content"
-      update_error: "There was a problem updating your content"
-      content_removed: "Content successfully removed"
-      cant_delete_content: "You don't have permission to delete the specified content"
-      manage_pages_title: "Manage site content"
-      tag_information: "Tags help other users find your page and will be used as the meta keywords for the document."
-      tags: Tags
-      permalink: "Permalink:"
-      page_doesnt_exist_create: "The page you requested does not exist.  Please provide the information below to create the page."
-      default_404_title: "404 Page not found"
-      default_404_body: "We could not find the page you were looking for."
-      no_uri_error: "Please set a value for uri before saving the model when contentable is nil"
-      submit_content_button: "Save"
-      content_label: "Content"
-      title_label: "Title"
-      title_help: "The title controls the url and the page title displayed in the url bar"
-      tags_label: "Tags"
-      tags_help: "Add tags to help identify your content.  Tags can also be used to generate lists of links for a menu."
-      content_help: "This is the content that will appear on the page."
-      problem_adding_content: "There was a problem adding the content"
-      problem_updating_content: "There was a problem updating the content"
-      confirm_delete_content: "Are you sure you wish to delete this content?  This cannot be undone!"
-      choose_layout: "Select Template"
-      choose_layout_help: "Select a layout template that will render the chrome for this page."
+      content_removed: Content successfully removed
+      title_help: The title controls the url and the page title displayed in the url bar
+      no_files: No files available
+      page_doesnt_exist_create: The page you requested does not exist.  Please provide the information below to create the page.
+      default_404_body: We could not find the page you were looking for.
+      choose_layout: Select Template
+      search: "Search:"

data/config/routes.rb

@@ -9,4 +9,10 @@ Rails.application.routes.draw do
   match '/images_for_content' => 'muck/tiny_mce#images_for_content', :as => :images_for_content
   match '/files_for_content' => 'muck/tiny_mce#files_for_content', :as => :files_for_content
   match '/links_for_content' => 'muck/tiny_mce#links_for_content', :as => :links_for_content
+  
+  # admin
+  namespace :admin do
+    resources :contents, :controller => 'muck/contents'
+  end
+  
 end

data/muck-contents.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-contents}
-  s.version = "3.1.2"
+  s.version = "3.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "app/controllers/muck/tiny_mce_controller.rb",
     "app/helpers/muck_contents_helper.rb",
     "app/helpers/tinymce_helper.rb",
+    "app/views/admin/contents/_content.erb",
     "app/views/admin/contents/index.html.erb",
     "app/views/contents/_admin.erb",
     "app/views/contents/_form.erb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-contents
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 3
   - 1
-  - 2
-  version: 3.1.2
+  - 3
+  version: 3.1.3
 platform: ruby
 authors: 
 - Justin Ball
@@ -181,6 +181,7 @@ files:
 - app/controllers/muck/tiny_mce_controller.rb
 - app/helpers/muck_contents_helper.rb
 - app/helpers/tinymce_helper.rb
+- app/views/admin/contents/_content.erb
 - app/views/admin/contents/index.html.erb
 - app/views/contents/_admin.erb
 - app/views/contents/_form.erb