Commit 8f3410f8ae14764bdb5feba851ecda1394b58b86 to notphil's deluuxjournal

notphil / deluuxjournal

Description:	Journaling / Blogging Application
Homepage:	http://deluuxjournal.heroku.com
Clone URL:	git://github.com/notphil/deluuxjournal.git Give this clone URL to anyone. `git clone git://github.com/notphil/deluuxjournal.git`

Converted to non-iframe app

notphil (author)

Tue Jul 15 03:31:25 -0700 2008

commit 8f3410f8ae14764bdb5feba851ecda1394b58b86
tree 3f09d0b28a5d644a888099a0a75c95de528d4ae9
parent 40d38588b1ef4dd4c6acfc68ea49eef9af302322

app/controllers/notes_controller.rb
app/views/layouts/default.html.erb
app/views/layouts/notes.html.erb
app/views/notes/edit.html.erb
app/views/notes/index.html.erb
app/views/notes/new.html.erb
app/views/notes/show.html.erb

app/controllers/notes_controller.rb

0
@@ -39,6 +39,7 @@ class NotesController < ApplicationController
0
   end
0
 
0
   def create
0
+
0
     @note = Note.new(params[:note])
0
     @note.text = params[:text]
0
     @note.title = params[:title]
0
@@ -54,10 +55,8 @@ class NotesController < ApplicationController
0
         else
0
           flash[:notice] = "Added your entry!"
0
         end
0
-
0
-        format.html {
0
-          app_redirect_to :action => "index"
0
-        }
0
+        @notes = Note.find_by(params[:dl_sig_owner_user])
0
+        format.html { render :action => "index" }
0
       else
0
         format.html { render :action => "new" }
0
       end
0
@@ -77,8 +76,8 @@ class NotesController < ApplicationController
0
         else
0
           flash[:notice] = "Updated your entry!"
0
         end
0
-
0
-        format.html { app_redirect_to :action => "index" }
0
+        @notes = Note.find_by(params[:dl_sig_owner_user])
0
+        format.html { render :action => "index" }
0
         format.xml  { head :ok }
0
       else
0
         format.html { render :action => "edit" }
0
@@ -92,7 +91,7 @@ class NotesController < ApplicationController
0
     @note.destroy
0
 
0
     respond_to do |format|
0
-      format.html { app_redirect_to :action => :index }
0
+      format.html { redirect_to :action => :index }
0
       format.xml  { head :ok }
0
     end
0
   end

app/views/layouts/default.html.erb

0
@@ -1,30 +1 @@
0
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
0
-<html xmlns="http://www.w3.org/1999/xhtml">
0
-
0
-<head>
0
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
0
-  <title><%= (defined? title and !title.nil?) ? title : "Deluux" %></title>
0
-  <link rel="stylesheet" type="text/css" href="/build/base/base-min.css" />
0
-  <link rel="stylesheet" type="text/css" href="/build/reset-fonts-grids/reset-fonts-grids.css" />
0
-  <%= stylesheet_link_tag 'screen' %>
0
-  <%= stylesheet_link_tag 'default' %>
0
-  <%= stylesheet_link_tag 'color.css' %>
0
-</head>
0
-
0
-<body>
0
-  <div id="doc">
0
-    <div id="hd">
0
-      <div id="header">
0
-        Deluux Blog
0
-      </div>
0
-    </div>
0
-    <div>
0
-      <%= yield %>
0
-    </div><!-- yui-gc -->
0
-    <div id="ft">
0
-    </div>
0
-  </div>
0
-</body>
0
-</html>
0
-
0
-
0
+<%= yield %>

app/views/layouts/notes.html.erb

0
@@ -1,17 +1,4 @@
0
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
0
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
0
-
0
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
0
-<head>
0
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
0
-  <title></title>
0
-  <%= stylesheet_link_tag 'screen' %>
0
-  <%= stylesheet_link_tag 'default' %>
0
-  <%= javascript_include_tag :defaults %>
0
-  <link rel="stylesheet" type="text/css" href="/stylesheets/base.css" />
0
-  <link rel="stylesheet" type="text/css" href="/stylesheets/reset-fonts-grids.css" />
0
-  <link rel="stylesheet" type="text/css" href="/stylesheets/deluux.css" />
0
-  <script type="text/javascript" src="/javascripts/tiny_mce/tiny_mce.js"></script>
0
+  <script type="text/javascript" src="http://notphilatall.com:3003/javascripts/tiny_mce/tiny_mce.js"></script>
0
   <script type="text/javascript">
0
   tinyMCE.init({
0
   // General options
0
@@ -45,17 +32,9 @@
0
   }
0
   });
0
 </script>
0
-</head>
0
-<body>
0
 <style>
0
   body {
0
     text-align:left;
0
   }
0
 </style>
0
-<% if flash[:notice] %>
0
-<div id="flash"><%= flash[:notice] %></div>
0
-<% end %>
0
 <%= yield  %>
0
-
0
-</body>
0
-</html>

app/views/notes/edit.html.erb

0
@@ -23,7 +23,7 @@
0
     <% } %>
0
 
0
     <p style="font-size: 1.5em; text-align: center; width: 100%;">
0
-      <%= submit_tag( "Update" ) %> or <%= app_link_to( "Cancel", :action => "index" ) %>
0
+      <%= submit_tag( "Update" ) %> or <%= link_to( "Cancel", :action => "index" ) %>
0
     </p>
0
 
0
   </div>

app/views/notes/index.html.erb

0
@@ -6,7 +6,7 @@
0
     <% for note in @notes[0...3] %>
0
     <div class="note section" style="padding-top: 0.5em; padding-left: 1em; border: 2px solid #A6E3F9; background-color: #D6F3F9; padding-bottom: 2em;" >
0
       <h2 class="title subsection" style="text-align: left; font-weight: bolder;">
0
-        <%= app_link_to note.title , {:action => :show, :id => note.id}, {:class => "edit"} %>
0
+        <%= link_to note.title , "/#{params[:dl_sig_stub]}/show/#{note.id}", {:class => "edit"} %>
0
       </h2>
0
       <div class="text subsection" style="max-height: 7em; overflow: hidden;">
0
         <%= note.text %>
0
@@ -15,10 +15,10 @@
0
         Written <%= time_ago_in_words(note.created_at) %> ago.
0
       </div>
0
       <div style="float: right; font-weight: bolder; padding-right: 1em;">
0
-        <%= app_link_to 'Read' , {:action => :show, :id => note.id}, {:class => "show"} %>
0
+        <%= link_to 'Read' , "/#{params[:dl_sig_stub]}/show/#{note.id}", {:class => "show"} %>
0
         <% if is_owner? %>
0
-          <%= app_link_to 'Edit' , {:action => :edit, :id => note.id}, {:class => "edit"} %>
0
-          <%= app_link_to 'Delete' , {:action => :destroy, :id => note.id}, {:class => "destroy"} %>
0
+          <%= link_to 'Edit' , "/#{params[:dl_sig_stub]}/edit/#{note.id}", {:class => "edit"} %>
0
+          <%= link_to 'Delete', "/#{params[:dl_sig_stub]}/destroy/#{note.id}", {:class => "destroy"} %>
0
         <% end %>
0
       </div>
0
     </div>
0
@@ -28,15 +28,15 @@
0
     <ul style="margin-left: 2em;">
0
       <% if is_owner? %>
0
       <div style="margin-bottom: 2em; font-weight: bolder; margin-top: 1em; font-size: 1.5em;">
0
-        <%= app_link_to 'New Entry', {:action => :new}, {:class => :new} %>
0
+        <%= link_to 'New Entry', "/#{params[:dl_sig_stub]}/new", {:class => "new"} %>
0
       </div>
0
       <% end %>
0
     <h3>Past Entries</h3>
0
     <% for note in @notes %>
0
       <% if note.title.length > 0 %>
0
-        <li style="list-style-position: inside;"><%= app_link_to abbreviate(note.title, 15), {:action => :show, :id => note.id}  %></li>
0
+        <li style="list-style-position: inside;"><%= link_to abbreviate(note.title, 15), "/#{params[:dl_sig_stub]}/show/#{note.id}" %></li>
0
       <% else %>
0
-        <li style="list-style-position: inside;"><%= app_link_to note.created_at.strftime("%d/%m/%y %H:%M"), {:action => :show, :id => note.id}  %></li>
0
+        <li style="list-style-position: inside;"><%= link_to note.created_at.strftime("%d/%m/%y %H:%M"), "/#{params[:dl_sig_stub]}/show/#{note.id}" %></li>
0
       <% end %>
0
     <% end %>
0
    </ul>

app/views/notes/new.html.erb

0
@@ -108,12 +108,8 @@ var update_friend_notify_field = function(){
0
 
0
     <%= hidden_field_tag :notify_id_list %>
0
 
0
-    <% params.each{|k,v| %>
0
-      <%= hidden_field_tag( k, v ) if k[0..2]=="dl_" %>
0
-    <% } %>
0
-
0
     <p style="font-size: 1.5em; text-align: center; width: 100%;">
0
-      <%= submit_tag( "Create" ) %> or <%= app_link_to( "Cancel", :action => "index" ) %>
0
+      <%= submit_tag( "Create" ) %> or <%= link_to( "Cancel", "/#{params[:dl_sig_stub]}/index" ) %>
0
     </p>
0
 
0
   </div>

app/views/notes/show.html.erb

0
@@ -4,8 +4,8 @@
0
 
0
 <% if is_owner? %>
0
 <div style="font-style: italic; float: right; padding-right: 2em;">
0
-  You wrote this <%= time_ago_in_words(@note.created_at) %> ago and can <%= app_link_to 'edit' , {:action => :edit, :id => @note.id}, {:class => "edit"} %>
0
-  or <%= app_link_to 'delete' , {:action => :destroy, :id => @note.id}, {:class => "destroy"} %> it.
0
+  You wrote this <%= time_ago_in_words(@note.created_at) %> ago and can <%= link_to 'edit' , {:action => :edit, :id => @note.id}, {:class => "edit"} %>
0
+  or <%= link_to 'delete' , {:action => :destroy, :id => @note.id}, {:class => "destroy"} %> it.
0
 </div>
0
 <% end %>
0

Comments

No one has commented yet.