Merge pull request #41 from fusion94/master

Changes to support the 1.0 release
kandanapp · Feb 3, 2013 · 46207f4 · 46207f4
2 parents 22a0816 + 809cf7b
commit 46207f4
Show file tree

Hide file tree

Showing 10 changed files with 142 additions and 46 deletions.
diff --git a/app/assets/images/kandanlogo.png b/app/assets/images/kandanlogo.png
diff --git a/app/assets/stylesheets/_base.sass b/app/assets/stylesheets/_base.sass
@@ -21,7 +21,7 @@
   padding: 0 5px
   +box-shadow(inset 0px -10px 10px -10px #000000)
   border-bottom: 1px solid #FFF
-  margin-top: -2px
+  margin-top: 0px
 
 .user_menu_link
   float: right
@@ -52,7 +52,7 @@ cite
   display: none
   top: 0px    
   z-index: 9000
-  height: 32px
+  height: 100px
   width: 100px
   padding: 5px
   bottom: -24px
@@ -90,14 +90,40 @@ body
   width: 100%
   font-size: 13px
   font-family: 'PT Sans', sans-serif
-  margin-left: 20px
+  margin-left: 0px
 
 .main-area
   width: $main-area-width
   float: left
   padding-bottom: 70px
-  padding-top: 22px
+  padding-top: 42px
   height: 100%
 
 #channels
   height: 100%
+
+.about 
+  padding-top: 120px
+
+.aboutlogo
+  position: relative
+  float: right
+  margin: -150px 320px 0 0
+
+.about p,h1,h3,
+  margin-left: auto
+  margin-right: auto
+  width: 600px
+
+.about ul
+  margin-left: auto
+  margin-right: auto  
+  width: 600px
+
+.devise
+  padding-top: 20px
+
+.devise p,h1,h2,
+  margin-left: auto
+  margin-right: auto
+  width: 600px  
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
@@ -1,16 +1,18 @@
+<div class="devise">
+
 <h2>Change your password</h2>
 
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
   <%= f.hidden_field :reset_password_token %>
 
-  <div><%= f.label :password, "New password" %><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password, "New password" %><br />
+  <%= f.password_field :password %></p>
 
-  <div><%= f.label :password_confirmation, "Confirm new password" %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <p><%= f.label :password_confirmation, "Confirm new password" %><br />
+  <%= f.password_field :password_confirmation %></p>
 
-  <div><%= f.submit "Change my password" %></div>
+  <p><%= f.submit "Change my password" %></p>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<p><%= render :partial => "devise/shared/links" %></p>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
@@ -1,12 +1,14 @@
+<div class="devise">
+
 <h2>Forgot your password?</h2>
 
 <%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.submit "Send me reset password instructions" %></div>
+  <p><%= f.submit "Send me reset password instructions" %></p>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<p><%= render :partial => "devise/shared/links" %></p>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
@@ -1,25 +1,27 @@
+<div class="devise">
+
 <h2>Edit <%= resource_name.to_s.humanize %></h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
+  <%= f.password_field :password %></p>
 
-  <div><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <p><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></p>
 
-  <div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
-  <%= f.password_field :current_password %></div>
+  <p><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
+  <%= f.password_field :current_password %></p>
 
-  <div><%= f.submit "Update" %></div>
+  <p><%= f.submit "Update" %></p>
 <% end %>
 
 <h3>Cancel my account</h3>
 
 <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
 
-<%= link_to "Back", :back %>
+<p><%= link_to "Back", :back %></p>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
@@ -1,21 +1,23 @@
-<h3>Register an Account</h3>
+<div class="devise">
+
+<h2>Register an Account</h2>
 
 <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
   <%= devise_error_messages! %>
 
-  <div><%= f.label :email %><br />
-  <%= f.email_field :email %></div>
+  <p><%= f.label :email %><br />
+  <%= f.email_field :email %></p>
 
-  <div><%= f.label :username %><br />
-  <%= f.text_field :username %></div>
+  <p><%= f.label :username %><br />
+  <%= f.text_field :username %></p>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password %><br />
+  <%= f.password_field :password %></p>
 
-  <div><%= f.label :password_confirmation %><br />
-  <%= f.password_field :password_confirmation %></div>
+  <p><%= f.label :password_confirmation %><br />
+  <%= f.password_field :password_confirmation %></p>
 
-  <div><%= f.submit "Register" %></div>
+  <p><%= f.submit "Register" %></p>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<p><%= render :partial => "devise/shared/links" %></p>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
@@ -1,17 +1,20 @@
-<h2>Sign in</h2>
+<div class="devise">
+
+<h2>Sign In</h2>
 
 <%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
-  <div><%= f.label :username %><br />
-  <%= f.text_field :username %></div>
+  <p><%= f.label :username %><br />
+  <%= f.text_field :username %></p>
 
-  <div><%= f.label :password %><br />
-  <%= f.password_field :password %></div>
+  <p><%= f.label :password %><br />
+  <%= f.password_field :password %></p>
 
   <% if devise_mapping.rememberable? -%>
-    <div><%= f.check_box :remember_me %> <%= f.label :remember_me %></div>
+    <p><%= f.check_box :remember_me %> <%= f.label :remember_me %></p>
   <% end -%>
 
-  <div><%= f.submit "Sign in" %></div>
+  <p><%= f.submit "Sign in" %></p>
 <% end %>
 
-<%= render :partial => "devise/shared/links" %>
+<p><%= render :partial => "devise/shared/links" %></p>
+</div>
diff --git a/app/views/main/about.html.erb b/app/views/main/about.html.erb
@@ -0,0 +1,51 @@
+
+  <title>About Kandan</title>
+
+<div class="about">
+
+ 	<h1>
+ 		About Kandan
+			<img class="aboutlogo" src="/assets/kandanlogo.png" height="125" width="125">
+ 	</h1>
+
+	<h3>Version 1.0</h3>
+
+	<h3>Description</h3>
+
+	<p>Kandan is an Open Source alternative to HipChat.</p>
+
+	<p>What is Kandan? Kandan is a private chat service for your company or team. You can invite colleagues to share ideas and files in a persistent group chat room or rooms.</p>
+
+	<p>Unlike HipChat or other alternatives, Kandan is completely Open Source and can be hosted internally or externally by your organization or by a third party.</p>
+
+	<h3>Background</h3>
+
+	<p>Kandan was originally developed by <a href="http://cloudfuji.com/">Cloudfuji</a> and they started development on it back on March 6th of 2012. Development went pretty fast and furious until about June 4th of 2012. After that there wasn’t another commit to the repository until some pull requests came in during the month of January of 2013.</p>
+
+	<p>In talking with the team at Cloudfuji both <a href="http://jamesrgifford.com/">James Gifford</a> and <a href="http://fusion94.org">Tony Guntharp</a> agreed to take over maintenance of the project.</p>
+
+	<h3>Features</h3>
+		<ul>
+			<li>Easy deploy to CloudFoundry, Heroku, dotCloud, etc.</li>
+			<li>Unlimited channels</li>
+			<li>Embed formats for images and youtube videos with requests for others (twitter, facebook, g+, etc.)</li>
+			<li>/me command</li>
+			<li>Highly extensible plugin format</li>
+		</ul>
+
+	<h3>Get Involved</h3>
+
+	<p>Since Kandan is a fully open-source app, we would appreciate if you dive in and start adding features, fixing bugs (what bugs?), and cleaning up the code.</p>
+
+	<p>Make sure you check out these resources as well.</p>
+
+	<ul>
+		<li><a href="https://github.com/kandanapp/kandan/issues">GitHub Issues Tracker</a></li>
+		<li><a href="https://twitter.com/kandanapp">@kandanapp</a> on Twitter</li>
+		<li><a href="http://kandan-demo.kandanapp.com">Kandan Demo</a> (Yes we eat our own DogFood)</li>
+	</ul>
+
+	<h3>Contact Us</h3>
+	<p>If you find any security issues please submit an <a href="https://github.com/kandanapp/kandan/issues">Issue</a> or <a href="mailto:[email protected]">email us</a>.</p>
+
+</div>
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
@@ -9,7 +9,6 @@
 <div id="kandan">
   <div class="header">
     <%= image_tag "logo.png", :class=>"logo" %>  
-
     <a href="#" class="user_menu_link">
       <cite class="user_flag"></cite>
       <div class="user"></div>
@@ -22,8 +21,11 @@
     </div>
   </div>
 
+
   <div id="app_body">
     <div class="main-area">
+
+
       <div id="mask_container">
 	<div id="head-mask">
 	  <div class="corner_cover" style="float:left;position:relative;left:-10px;"></div>
@@ -43,6 +45,9 @@
 
 </div>
   <div class="user_menu">
-    <%= link_to 'logout', destroy_user_session_path, :method => :delete %>
+    <%= link_to 'Edit Account', users_edit_path, @users_edit %><br />
+    <%= link_to 'Logout', destroy_user_session_path, :method => :delete %><br />
+    <hr>
+    <%= link_to 'About Kandan', about_path, @about %>
   </div>
 
diff --git a/config/routes.rb b/config/routes.rb
@@ -4,13 +4,16 @@
   devise_for :users
 
   get '/search' => "main#search"
-  
+
   resources :channels do
     resources :activities
     resources :attachments
   end
 
   get "/active_users" => "apis#active_users"
+
+  get "/about" =>"main#about"
+  get "/users/edit" =>"main#users_edit"
 
   # The priority is based upon order of creation:
   # first created -> highest priority.