Merge branches 'master' and 'exception_notification' into new_announcement_dev

vendor/built_in_modules/NewBlog/app/controllers/panel/blog/front_end/comments_controller.rb

@@ -1,7 +0,0 @@
-class Panel::Blog::FrontEnd::CommentsController < ApplicationController
-  def create
-    @post = Post.find(params[:post_id])
-    @comment = @post.comments.create!(params[:comment])
-    redirect_to panel_blog_front_end_post_url(@post)
-  end
-end

vendor/built_in_modules/NewBlog/app/controllers/panel/blog/front_end/posts_controller.rb

@@ -1,17 +0,0 @@
-class Panel::Blog::FrontEnd::PostsController < ApplicationController
-  
-  layout 'production'
-  
-  # GET /posts
-  # GET /posts.xml
-  
-  def index
-    @posts = Post.all
-  end
-  
-  def show
-    @post = Post.find(params[:id])
-  end
-  
-  
-end

vendor/built_in_modules/NewBlog/app/views/panel/blog/back_end/posts/edit.html.erb

@@ -1,8 +0,0 @@
-<h1><%= t('blog.editing_post') %></h1>
-
-<%= form_for @post, :url => panel_blog_back_end_post_path(@post) do |f| %>
-	<%= render :partial => 'form', :locals => {:f => f} %>
-<% end %>
-
-<%= link_to t('blog.show'), panel_blog_back_end_post_path(@post) %> |
-<%= link_back %>

vendor/built_in_modules/NewBlog/lib/NewBlog.rb

@@ -1,5 +0,0 @@
-require "NewBlog/engine"
-
-
-module NewBlog
-end

vendor/built_in_modules/NewBlog/lib/NewBlog/engine.rb

@@ -1,6 +0,0 @@
-module NewBlog
-  class Engine < Rails::Engine
-    isolate_namespace NewBlog
-    PrototypeR4::Application::Orbit_Apps << "NewBlog"
-  end
-end

vendor/built_in_modules/NewBlog/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end

vendor/built_in_modules/blog/app/views/panel/blog/posts/index.html.erb

@@ -1,25 +0,0 @@
-<h1><%= t('blog.list_post') %></h1>
-
-<table>
-  <tr>
-    <th><%= t('blog.title') %></th>
-    <th><%= t('blog.body') %></th>
-    <th></th>
-    <th></th>
-    <th></th>
-  </tr>
-
-<% @posts.each do |post| %>
-  <tr>
-    <td><%= post.title %></td>
-    <td><%= post.body %></td>
-    <td><%= link_to t('blog.show'), panel_blog_post_path(post) %></td>
-    <td><%= link_to t('blog.edit'), edit_panel_blog_post_path(post) %></td>
-    <td><%= link_to t('blog.delete'), panel_blog_post_path(post), :confirm => t('blog.sure?'), :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to t('blog.new_post'), new_panel_blog_back_end_post_path %>

vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/back_end/posts_controller.rb

@@ -1,4 +1,4 @@
-class Panel::Blog::BackEnd::PostsController < ApplicationController
+class Panel::NewBlog::BackEnd::PostsController < ApplicationController
   
   layout 'admin'
   
@@ -45,7 +45,7 @@ class Panel::Blog::BackEnd::PostsController < ApplicationController
 
     respond_to do |format|
       if @post.save
-        format.html { redirect_to(panel_blog_post_url(@post), :notice => t('blog.create_post_success')) }
+        format.html { redirect_to(panel_new_blog_post_url(@post), :notice => t('blog.create_post_success')) }
         format.xml  { render :xml => @post, :status => :created, :location => @post }
       else
         format.html { render :action => "new" }
@@ -61,7 +61,7 @@ class Panel::Blog::BackEnd::PostsController < ApplicationController
 
     respond_to do |format|
       if @post.update_attributes(params[:post])
-        format.html { redirect_to(panel_blog_post_url(@post), :notice => t('blog.update_post_success')) }
+        format.html { redirect_to(panel_new_blog_post_url(@post), :notice => t('blog.update_post_success')) }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
@@ -77,7 +77,7 @@ class Panel::Blog::BackEnd::PostsController < ApplicationController
     @post.destroy
 
     respond_to do |format|
-      format.html { redirect_to(panel_blog_posts_url) }
+      format.html { redirect_to(panel_new_blog_posts_url) }
       format.xml  { head :ok }
     end
   end

vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/comments_controller.rb

@@ -0,0 +1,7 @@
+class Panel::NewBlog::FrontEnd::CommentsController < ObitFrontendController
+  def create
+    @post = Post.find(params[:post_id])
+    @comment = @post.comments.create!(params[:comment])
+    redirect_to panel_new_blog_front_end_post_url(@post)
+  end
+end

vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/front_end/posts_controller.rb

@@ -0,0 +1,21 @@
+class Panel::NewBlog::FrontEnd::PostsController < ObitFrontendController
+  
+  
+  def initialize
+    super
+    @app_title = NewBlog::MOUDLEAPP_TITLE
+  end
+  
+  # GET /posts
+  # GET /posts.xml
+  
+  def index
+    @posts = Post.all
+  end
+  
+  def show
+    @post = Post.find(params[:id])
+  end
+  
+  
+end

vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb

@@ -1,7 +1,12 @@
-class Panel::Blog::Widget::PostsController < ApplicationController
+class Panel::NewBlog::Widget::PostsController < ObitWidgetController
   
   layout 'production'
   
+  def initialize
+    super
+    @app_title = NewBlog::MOUDLEAPP_TITLE
+  end
+  
   # GET /posts
   # GET /posts.xml
   def index

vendor/built_in_modules/new_blog/app/helpers/application_helper.rb

@@ -0,0 +1,6 @@
+module ApplicationHelper
+  
+  def check_show_frontend
+    front_end_available(NewBlog::MOUDLEAPP_TITLE)
+  end
+end

vendor/built_in_modules/new_blog/app/helpers/new_blog_helper.rb

@@ -0,0 +1,5 @@
+module NewBlogHelper
+  def self.check_show_frontend
+    ApplicationController.front_end_available(NewBlog::MOUDLEAPP_TITLE)
+  end
+end

vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/edit.html.erb

@@ -0,0 +1,8 @@
+<h1><%= t('blog.editing_post') %></h1>
+
+<%= form_for @post, :url => panel_new_blog_back_end_post_path(@post) do |f| %>
+	<%= render :partial => 'form', :locals => {:f => f} %>
+<% end %>
+
+<%= link_to t('blog.show'), panel_new_blog_back_end_post_path(@post) %> |
+<%= link_back %>

vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :secondary do %>
   <ul class="list">
-	  <li><%= link_to t('blog.new_post'), new_panel_blog_back_end_post_path, :class => 'seclink1' %></li>
+	  <li><%= link_to t('blog.new_post'), new_panel_new_blog_back_end_post_path, :class => 'seclink1' %></li>
   </ul>
 <% end -%>
 
@@ -21,9 +21,9 @@
   <tr>
     <td><%= post.title %></td>
     <td><%= truncate(post.body,:length=>15) %></td>
-    <td><%= link_to t('blog.show'), panel_blog_back_end_post_path(post) %></td>
-    <td><%= link_to t('blog.edit'), edit_panel_blog_back_end_post_path(post) %></td>
-    <td><%= link_to t('blog.delete'), panel_blog_back_end_post_path(post), :confirm => t('blog.sure?'), :method => :delete %></td>
+    <td><%= link_to t('blog.show'), panel_new_blog_back_end_post_path(post) %></td>
+    <td><%= link_to t('blog.edit'), edit_panel_new_blog_back_end_post_path(post) %></td>
+    <td><%= link_to t('blog.delete'), panel_new_blog_back_end_post_path(post), :confirm => t('blog.sure?'), :method => :delete %></td>
   </tr>
 <% end %>
 </table>

vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/latest_post.html.erb

@@ -1,4 +1,4 @@
-<%=stylesheet_link_tag "NewBlog/application"%>
+<%=stylesheet_link_tag "new_blog/application"%>
 <h2><%=@post.title%></h2>
 <p>
   <%= @post.body%>

vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/new.html.erb

@@ -1,12 +1,12 @@
 <% content_for :secondary do %>
   <ul class="list">
-	  <li><%= link_to t('blog.index'), panel_blog_back_end_posts_path, :class => 'seclink2' %></li>
+	  <li><%= link_to t('blog.index'), panel_new_blog_back_end_posts_path, :class => 'seclink2' %></li>
   </ul>
 <% end -%>
 
 <%= flash_messages %>
 <h1><%= t('blog.new_post') %></h1>
-<%= form_for @post, :url => panel_blog_back_end_posts_path do |f| %>
+<%= form_for @post, :url => panel_new_blog_back_end_posts_path do |f| %>
 	<%= render :partial => 'form', :locals => {:f => f} %>
 <% end %>
 

vendor/built_in_modules/new_blog/app/views/panel/new_blog/back_end/posts/show.html.erb

@@ -18,7 +18,7 @@
   </p>
 <% end %>
 
-<%= form_for Comment.new, :url => panel_blog_front_end_comments_path do |f| %>
+<%= form_for Comment.new, :url => panel_new_blog_front_end_comments_path do |f| %>
   <p>
 
     <%= f.label :name, "Author" %><br />
@@ -34,5 +34,5 @@
 <% end %>
 
 
-<%= link_to t('blog.edit'), edit_panel_blog_back_end_post_path(@post) %> |
+<%= link_to t('blog.edit'), edit_panel_new_blog_back_end_post_path(@post) %> |
 <%= link_back %>

vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/_post_frontend.html.erb

@@ -2,6 +2,6 @@
 <%= post_frontend.title %><br />
 <p>
 	<%= truncate(post_frontend.body,:length=>25) %>
-	<%= link_to 'Read more...',panel_blog_front_end_post_path(post_frontend) %>
+	<%= link_to 'Read more...',panel_new_blog_front_end_post_path(post_frontend) %>
 </p>
 </div>

vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/index.html.erb

@@ -1,6 +1,6 @@
 <% content_for :secondary do %>
   <ul class="list">
-	  <li><%= link_to t('blog.new_post'), new_panel_blog_back_end_post_path, :class => 'seclink1' %></li>
+	  <li><%= link_to t('blog.new_post'), new_panel_new_blog_back_end_post_path, :class => 'seclink1' %></li>
   </ul>
 <% end -%>
 

vendor/built_in_modules/new_blog/app/views/panel/new_blog/front_end/posts/show.html.erb

@@ -18,7 +18,7 @@
   </p>
 <% end %>
 
-<%= form_for Comment.new, :url => panel_blog_front_end_comments_path do |f| %>
+<%= form_for Comment.new, :url => panel_new_blog_front_end_comments_path do |f| %>
   <p>
 
     <%= f.label :name, "Author" %><br />

vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/index.html.erb

@@ -1,4 +1,4 @@
-<%=stylesheet_link_tag "NewBlog/application"%>
+<%=stylesheet_link_tag "new_blog/application"%>
 <div class="widget_index">
 	<table>
   	<tr>
@@ -8,7 +8,7 @@
 
 		<% @posts.each do |post| %>
   	<tr>
-    	<td><%= link_to post.title,panel_blog_front_end_post_path(post) %></td>
+    	<td><%= link_to post.title,panel_new_blog_front_end_post_path(post) %></td>
     	<td><%= post.body.truncate(14) %></td>
   	</tr>
 		<% end %>

vendor/built_in_modules/new_blog/app/views/panel/new_blog/widget/posts/latest_post.html.erb

@@ -1,4 +1,4 @@
-<%=stylesheet_link_tag "NewBlog/application"%>
+<%=stylesheet_link_tag "new_blog/application"%>
 <div class="widget_latest_post">
 	<h2><%= @post.title %> </h2>
 	<p>

vendor/built_in_modules/new_blog/config/initializers/app_config.rb

@@ -0,0 +1,18 @@
+# module NewBlog
+#     class MyEngine < Rails::Engine
+#       # Add a load path for this specific Engine
+#       # config.autoload_paths << File.expand_path("../lib/some/path", __FILE__)
+#       put "ABC"
+#       PrototypeR4::Application::Orbit_Apps << "NewBlog"
+#       
+#       # initializer "my_engine.add_middleware" do |app|
+#       #   app.middleware.use MyEngine::Middleware
+#       # end
+#     end  
+#   
+# end
+module NewBlog
+  VERSION = "0.0.1"
+  MOUDLEAPP_TITLE =  "NewBlog"
+end
+# PrototypeR4::Application::Orbit_Apps << "NewBlog"

vendor/built_in_modules/new_blog/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
   
   namespace :panel do
-    namespace :blog do
+    namespace :new_blog do
       namespace :back_end do
         root :to => "posts#index"
         resources :posts

vendor/built_in_modules/new_blog/lib/NewBlog.rb

@@ -0,0 +1,5 @@
+require "new_blog/engine"
+
+
+module NewBlog
+end

vendor/built_in_modules/new_blog/lib/new_blog/engine.rb

@@ -0,0 +1,5 @@
+module NewBlog
+  class Engine < Rails::Engine
+    isolate_namespace new_blog
+  end
+end

vendor/built_in_modules/new_blog/new_blog.json

@@ -6,5 +6,7 @@
   "intro": "A simple blog……",
   "update_info": "Some info",
   "create_date": "11-11-2011",
-	"app_pages":  ["/panel/blog/front_end/"]
+	"app_pages":  ["/panel/new_blog/front_end/"],
+	"widgets": ["/panel/new_blog/widget/latest_post","/panel/new_blog/widget/"],
+	"enable_frontend": false
 }