forked from maccman/holla
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
ngzax
committed
Jul 1, 2011
1 parent
52ef8be
commit a359c9f
Showing
5 changed files
with
59 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,57 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>Holla</title> | ||
| <%= stylesheet_link_tag "application" %> | ||
| <%= csrf_meta_tag %> | ||
| <%= meta_tag "handle", current_user %> | ||
| <%= javascript_include_tag :juggernaut, "application" %> | ||
| </head> | ||
| <body> | ||
| <header id="title"> | ||
| <h1>Holla</h1> | ||
| </header> | ||
| <div id="wrapper"> | ||
| <div id="sidebar"> | ||
| <h3>Channels</h3> | ||
| <ul id="channels"> | ||
| </ul> | ||
|
|
||
| <div id="wrapper"> | ||
| <div id="sidebar"> | ||
| <h3>Channels</h3> | ||
| <ul id="channels"> | ||
| </ul> | ||
| <h3>Options</h3> | ||
| <ul id="options"> | ||
| <li data-name="settings">Settings</li> | ||
| </ul> | ||
|
|
||
| <h3>Options</h3> | ||
| <ul id="options"> | ||
| <li data-name="settings">Settings</li> | ||
| <h3>Search</h3> | ||
| <input type="search" results="0" incremental="true" placeholder="Search"> | ||
| </div> | ||
|
|
||
| <div class="vdivide"></div> | ||
|
|
||
| <div id="content"> | ||
| <div id="messages"> | ||
| <ul class="items"> | ||
| </ul> | ||
|
|
||
| <h3>Search</h3> | ||
| <input type="search" results="0" incremental="true" placeholder="Search"> | ||
| <div class="new"> | ||
| <textarea></textarea> | ||
| <button>Send</button> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="vdivide"></div> | ||
|
|
||
| <div id="content"> | ||
| <div id="messages"> | ||
| <ul class="items"> | ||
| </ul> | ||
|
|
||
| <div class="new"> | ||
| <textarea></textarea> | ||
| <button>Send</button> | ||
| </div> | ||
| </div> | ||
| <div id="searches"> | ||
| <h2>Search results: <span class="query"></span></h2> | ||
| <ul class="items"></ul> | ||
| </div> | ||
|
|
||
| <div id="settings"> | ||
| <h2>Channels</h2> | ||
| <ul class="channels"> | ||
| </ul> | ||
|
|
||
| <div id="searches"> | ||
| <h2>Search results: <span class="query"></span></h2> | ||
| <ul class="items"></ul> | ||
| <h2>Create Channel</h2> | ||
| <div class="createChannel"> | ||
| <form> | ||
| <input type="text" placeholder="Channel name"> | ||
| <button class="pill">New Channel</button> | ||
| </form> | ||
| </div> | ||
|
|
||
| <div id="settings"> | ||
| <h2>Channels</h2> | ||
| <ul class="channels"> | ||
| </ul> | ||
|
|
||
| <h2>Create Channel</h2> | ||
| <div class="createChannel"> | ||
| <form> | ||
| <input type="text" placeholder="Channel name"> | ||
| <button class="pill">New Channel</button> | ||
| </form> | ||
| </div> | ||
|
|
||
| <h2>Profile</h2> | ||
| <h2>Profile</h2> | ||
|
|
||
| <div><%= link_to "Logout", logout_path %></div> | ||
| </div> | ||
| <div><%= link_to "Logout", logout_path %></div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <%= script_template "message" %> | ||
| <%= script_template "channels" %> | ||
| <%= script_template "edit_channel" %> | ||
| <%= script_template "search" %> | ||
| </body> | ||
| </html> | ||
| </div> | ||
|
|
||
| <%= script_template "message" %> | ||
| <%= script_template "channels" %> | ||
| <%= script_template "edit_channel" %> | ||
| <%= script_template "search" %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,4 @@ | ||
| <h3>Choose an Authentication Method:</h3> | ||
| <ul> | ||
| <% ["Google", "MyOpenID", "Twitter", "Yahoo"].each do |service| %> | ||
| <li><%= link_to "#{service}", "/auth/#{service.downcase}" %></li> | ||
| <h3>Please Choose an Authentication Method:</h3> | ||
| <% ["Google", "OpenID", "Twitter", "Yahoo"].each do |service| %> | ||
| <%= link_to(image_tag("/images/#{service.downcase}_64.png"), "/auth/#{service.downcase}")%> | ||
| <% end %> | ||
| </ul> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,17 @@ | ||
| <!DOCTYPE html> | ||
| <% app_title = "Holla" %> | ||
| <html> | ||
| <head> | ||
| <title>Holla2</title> | ||
| <%= stylesheet_link_tag :all %> | ||
| <%= javascript_include_tag :defaults %> | ||
| <title><%= app_title %></title> | ||
| <%= stylesheet_link_tag "application" %> | ||
| <%= csrf_meta_tag %> | ||
| <%= meta_tag "handle", current_user %> | ||
| <%= javascript_include_tag :juggernaut, "application" %> | ||
| </head> | ||
| <body> | ||
|
|
||
| <header id="title"> | ||
| <h1><%= app_title %></h1> | ||
| </header> | ||
| <%= yield %> | ||
|
|
||
| </body> | ||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters