diff --git a/app/assets/images/kandanlogo.png b/app/assets/images/kandanlogo.png new file mode 100644 index 00000000..e3e8b0c9 Binary files /dev/null and b/app/assets/images/kandanlogo.png differ diff --git a/app/assets/stylesheets/_base.sass b/app/assets/stylesheets/_base.sass index 3033c0e3..b9856c37 100644 --- 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 index e75c9371..298dafec 100644 --- a/app/views/devise/passwords/edit.html.erb +++ b/app/views/devise/passwords/edit.html.erb @@ -1,16 +1,18 @@ +
+

Change your password

<%= 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 %> -
<%= f.label :password, "New password" %>
- <%= f.password_field :password %>
+

<%= f.label :password, "New password" %>
+ <%= f.password_field :password %>

-
<%= f.label :password_confirmation, "Confirm new password" %>
- <%= f.password_field :password_confirmation %>
+

<%= f.label :password_confirmation, "Confirm new password" %>
+ <%= f.password_field :password_confirmation %>

-
<%= f.submit "Change my password" %>
+

<%= f.submit "Change my password" %>

<% end %> -<%= render :partial => "devise/shared/links" %> \ No newline at end of file +

<%= render :partial => "devise/shared/links" %>

\ No newline at end of file diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb index 6c21e9fd..c227278c 100644 --- a/app/views/devise/passwords/new.html.erb +++ b/app/views/devise/passwords/new.html.erb @@ -1,12 +1,14 @@ +
+

Forgot your password?

<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+

<%= f.label :email %>
+ <%= f.email_field :email %>

-
<%= f.submit "Send me reset password instructions" %>
+

<%= f.submit "Send me reset password instructions" %>

<% end %> -<%= render :partial => "devise/shared/links" %> \ No newline at end of file +

<%= render :partial => "devise/shared/links" %>

\ No newline at end of file diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index ff380509..b6e25cb2 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,25 +1,27 @@ +
+

Edit <%= resource_name.to_s.humanize %>

<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+

<%= f.label :email %>
+ <%= f.email_field :email %>

-
<%= f.label :password %> (leave blank if you don't want to change it)
- <%= f.password_field :password %>
+

<%= f.label :password %> (leave blank if you don't want to change it)
+ <%= f.password_field :password %>

-
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
+

<%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation %>

-
<%= f.label :current_password %> (we need your current password to confirm your changes)
- <%= f.password_field :current_password %>
+

<%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password %>

-
<%= f.submit "Update" %>
+

<%= f.submit "Update" %>

<% end %>

Cancel my account

Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.

-<%= link_to "Back", :back %> +

<%= link_to "Back", :back %>

diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 0ffe83b0..508b0c8f 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,21 +1,23 @@ -

Register an Account

+
+ +

Register an Account

<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> <%= devise_error_messages! %> -
<%= f.label :email %>
- <%= f.email_field :email %>
+

<%= f.label :email %>
+ <%= f.email_field :email %>

-
<%= f.label :username %>
- <%= f.text_field :username %>
+

<%= f.label :username %>
+ <%= f.text_field :username %>

-
<%= f.label :password %>
- <%= f.password_field :password %>
+

<%= f.label :password %>
+ <%= f.password_field :password %>

-
<%= f.label :password_confirmation %>
- <%= f.password_field :password_confirmation %>
+

<%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation %>

-
<%= f.submit "Register" %>
+

<%= f.submit "Register" %>

<% end %> -<%= render :partial => "devise/shared/links" %> +

<%= render :partial => "devise/shared/links" %>

diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index d16e498f..50852371 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,17 +1,20 @@ -

Sign in

+
+ +

Sign In

<%= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %> -
<%= f.label :username %>
- <%= f.text_field :username %>
+

<%= f.label :username %>
+ <%= f.text_field :username %>

-
<%= f.label :password %>
- <%= f.password_field :password %>
+

<%= f.label :password %>
+ <%= f.password_field :password %>

<% if devise_mapping.rememberable? -%> -
<%= f.check_box :remember_me %> <%= f.label :remember_me %>
+

<%= f.check_box :remember_me %> <%= f.label :remember_me %>

<% end -%> -
<%= f.submit "Sign in" %>
+

<%= f.submit "Sign in" %>

<% end %> -<%= render :partial => "devise/shared/links" %> \ No newline at end of file +

<%= render :partial => "devise/shared/links" %>

+
\ No newline at end of file diff --git a/app/views/main/about.html.erb b/app/views/main/about.html.erb new file mode 100644 index 00000000..0c7e836b --- /dev/null +++ b/app/views/main/about.html.erb @@ -0,0 +1,51 @@ + + About Kandan + +
+ +

+ About Kandan + +

+ +

Version 1.0

+ +

Description

+ +

Kandan is an Open Source alternative to HipChat.

+ +

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.

+ +

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.

+ +

Background

+ +

Kandan was originally developed by Cloudfuji 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.

+ +

In talking with the team at Cloudfuji both James Gifford and Tony Guntharp agreed to take over maintenance of the project.

+ +

Features

+
    +
  • Easy deploy to CloudFoundry, Heroku, dotCloud, etc.
    • +
  • Unlimited channels
    • +
  • Embed formats for images and youtube videos with requests for others (twitter, facebook, g+, etc.)
    • +
  • /me command
    • +
  • Highly extensible plugin format
    • +
+ +

Get Involved

+ +

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.

+ +

Make sure you check out these resources as well.

+ + + +

Contact Us

+

If you find any security issues please submit an Issue or email us.

+ +
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb index 63c4fb34..da7ccb5f 100644 --- a/app/views/main/index.html.erb +++ b/app/views/main/index.html.erb @@ -9,7 +9,6 @@
<%= image_tag "logo.png", :class=>"logo" %> -
@@ -22,8 +21,11 @@
+
+ +
@@ -43,6 +45,9 @@
- <%= link_to 'logout', destroy_user_session_path, :method => :delete %> + <%= link_to 'Edit Account', users_edit_path, @users_edit %>
+ <%= link_to 'Logout', destroy_user_session_path, :method => :delete %>
+
+ <%= link_to 'About Kandan', about_path, @about %>
diff --git a/config/routes.rb b/config/routes.rb index db1fc721..fc5b598f 100644 --- 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.