on second thought...

This commit is contained in:
nilsding 2014-11-02 13:47:35 +01:00
parent ae66877cde
commit dd802036b1
23 changed files with 216 additions and 144 deletions

View File

@ -1,6 +1,6 @@
source 'https://rubygems.org'
gem 'rails', '4.1.6'
gem 'rails', '4.1.7'
gem 'pg', group: :postgres
gem 'mysql2', group: :mysql
@ -16,10 +16,12 @@ gem 'sdoc', '~> 0.4.1', group: :doc
gem 'bcrypt', '~> 3.1.7'
gem 'haml'
gem 'semantic-ui-sass', '~> 0.19.3.0'
gem 'bootstrap-sass', '~> 3.2.0.1'
gem 'bootswatch-rails', '~> 3.2.0'
gem 'will_paginate'
gem 'http_accept_language'
gem 'devise'
gem 'bootstrap_form'
gem 'font-kit-rails'
gem 'nprogress-rails'

View File

@ -1,27 +1,27 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
actionmailer (4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
mail (~> 2.5, >= 2.5.4)
actionpack (4.1.6)
actionview (= 4.1.6)
activesupport (= 4.1.6)
actionpack (4.1.7)
actionview (= 4.1.7)
activesupport (= 4.1.7)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
actionview (4.1.6)
activesupport (= 4.1.6)
actionview (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
erubis (~> 2.7.0)
activemodel (4.1.6)
activesupport (= 4.1.6)
activemodel (4.1.7)
activesupport (= 4.1.7)
builder (~> 3.1)
activerecord (4.1.6)
activemodel (= 4.1.6)
activesupport (= 4.1.6)
activerecord (4.1.7)
activemodel (= 4.1.7)
activesupport (= 4.1.7)
arel (~> 5.0.0)
activesupport (4.1.6)
activesupport (4.1.7)
i18n (~> 0.6, >= 0.6.9)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
@ -29,6 +29,11 @@ GEM
tzinfo (~> 1.1)
arel (5.0.1.20140414130214)
bcrypt (3.1.9)
bootstrap-sass (3.2.0.2)
sass (~> 3.2)
bootstrap_form (2.2.0)
bootswatch-rails (3.2.4)
railties (>= 3.1)
builder (3.2.2)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
@ -38,7 +43,7 @@ GEM
execjs
coffee-script-source (1.8.0)
daemons (1.1.9)
devise (3.4.0)
devise (3.4.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
@ -49,7 +54,7 @@ GEM
erubis (2.7.0)
eventmachine (1.0.3)
execjs (2.2.2)
font-kit-rails (1.0.2)
font-kit-rails (1.1.0)
rails
haml (4.0.5)
tilt
@ -76,19 +81,19 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.1.6)
actionmailer (= 4.1.6)
actionpack (= 4.1.6)
actionview (= 4.1.6)
activemodel (= 4.1.6)
activerecord (= 4.1.6)
activesupport (= 4.1.6)
rails (4.1.7)
actionmailer (= 4.1.7)
actionpack (= 4.1.7)
actionview (= 4.1.7)
activemodel (= 4.1.7)
activerecord (= 4.1.7)
activesupport (= 4.1.7)
bundler (>= 1.3.0, < 2.0)
railties (= 4.1.6)
railties (= 4.1.7)
sprockets-rails (~> 2.0)
railties (4.1.6)
actionpack (= 4.1.6)
activesupport (= 4.1.6)
railties (4.1.7)
actionpack (= 4.1.7)
activesupport (= 4.1.7)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
raindrops (0.13.0)
@ -98,23 +103,21 @@ GEM
responders (1.1.1)
railties (>= 3.2, < 4.2)
sass (3.2.19)
sass-rails (4.0.3)
sass-rails (4.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0)
sprockets (~> 2.8, <= 2.11.0)
sass (~> 3.2.2)
sprockets (~> 2.8, < 2.12)
sprockets-rails (~> 2.0)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
semantic-ui-sass (0.19.3.0)
sass (~> 3.2)
simplecov (0.9.1)
docile (~> 1.1.0)
multi_json (~> 1.0)
simplecov-html (~> 0.8.0)
simplecov-html (0.8.0)
spring (1.1.3)
sprockets (2.11.0)
sprockets (2.11.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
@ -130,7 +133,7 @@ GEM
thor (0.19.1)
thread_safe (0.3.4)
tilt (1.4.1)
turbolinks (2.4.0)
turbolinks (2.5.1)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
@ -150,6 +153,9 @@ PLATFORMS
DEPENDENCIES
bcrypt (~> 3.1.7)
bootstrap-sass (~> 3.2.0.1)
bootstrap_form
bootswatch-rails (~> 3.2.0)
coffee-rails (~> 4.1.0)
devise
font-kit-rails
@ -160,10 +166,9 @@ DEPENDENCIES
mysql2
nprogress-rails
pg
rails (= 4.1.6)
rails (= 4.1.7)
sass-rails (~> 4.0.3)
sdoc (~> 0.4.1)
semantic-ui-sass (~> 0.19.3.0)
simplecov
spring
thin

View File

@ -1,9 +1,6 @@
#= require jquery
#= require jquery_ujs
#= require turbolinks
#= require semantic-ui
#= require bootstrap
#= require_tree .
$(document).ready ->
$('.ui.dropdown').dropdown
on: "hover"

View File

@ -1,73 +1,9 @@
/*
*= require font-kit-rails/open-sans
*= require rails_bootstrap_forms
*= require_self
*/
@import "semantic-ui";
@import "bootswatch/flatly/variables";
@import "bootstrap";
body { padding-top: $navbar-height; }
@import "bootswatch/flatly/bootswatch";
@import "base";
html,
body {
font-size: 15px;
height: 100%;
}
body {
font-family: "Open Sans", "Helvetica Neue", "Helvetica", "DejaVu Sans", "Arial", sans-serif;
background: #FFFFFF;
margin: 0px;
padding: 0px;
color: #555555;
text-rendering: optimizeLegibility;
min-width: 320px;
}
/* mobile only */
@media only screen and (max-width : 768px) {
.ui.page.grid.segment {
padding-top: 2rem;
padding-bottom: 2rem;
}
h1.ui.header {
font-size: 1.5em;
}
.masthead.segment {
background-size: auto;
}
.masthead.segment .information {
margin-left: 190px;
}
.masthead.segment .image {
bottom: -65px;
width: 150px;
}
.masthead.segment .button {
font-size: 1rem;
}
.overview .divided.grid .header .icon {
font-size: 1.5em;
}
.overview .divided.grid .header + p {
min-height: 0px;
}
.masthead.segment .column {
font-size: 0.7rem;
}
.masthead.segment .column p {
display: none;
}
}
@media only screen and (max-width : 1000px) {
}

View File

@ -1,9 +1,6 @@
module ApplicationHelper
def nav_entry(body, path, options={})
options = {class: "", icon: "", label: "", label_color: "red"}.merge options
body = semantic_icon(options[:icon]) + " " + body unless options[:icon].empty?
body = body + " " + content_tag(:div, options[:label], class: "ui #{options[:label_color]} label") unless options[:label].empty?
link_to(body, path, class: "#{'active' if current_page? path} item #{options[:class]}")
def nav_entry(body, path)
content_tag(:li, link_to(body, path), class: ('active' if current_page? path))
end
##

View File

@ -0,0 +1,12 @@
<h2>Resend confirmation instructions</h2>
<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div><%= f.label :screen_name %><br />
<%= f.email_field :screen_name, autofocus: true %></div>
<div><%= f.submit "Resend confirmation instructions" %></div>
<% end %>
<%= render "devise/shared/links" %>

View File

@ -1,6 +1,6 @@
.container
%h1 Resend confirmation instructions
= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
= bootstrap_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
= devise_error_messages!
= f.email_field :screen_name, autofocus: true, label: "User name"

View File

@ -0,0 +1,5 @@
<p>Welcome <%= @screen_name %>!</p>
<p>You can confirm your account email through the link below:</p>
<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>

View File

@ -0,0 +1,8 @@
<p>Hello <%= @resource.email %>!</p>
<p>Someone has requested a link to change your password. You can do this through the link below.</p>
<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>
<p>If you didn't request this, please ignore this email.</p>
<p>Your password won't change until you access the link above and create a new one.</p>

View File

@ -0,0 +1,7 @@
<p>Hello <%= @resource.email %>!</p>
<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
<p>Click the link below to unlock your account:</p>
<p><%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %></p>

View File

@ -0,0 +1,16 @@
<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, autofocus: true, autocomplete: "off" %></div>
<div><%= f.label :password_confirmation, "Confirm new password" %><br />
<%= f.password_field :password_confirmation, autocomplete: "off" %></div>
<div><%= f.submit "Change my password" %></div>
<% end %>
<%= render "devise/shared/links" %>

View File

@ -1,6 +1,6 @@
.container
%h1 Change your password
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
= bootstrap_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

View File

@ -0,0 +1,12 @@
<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 :screen_name %><br />
<%= f.email_field :screen_name, autofocus: true %></div>
<div><%= f.submit "Send me reset password instructions" %></div>
<% end %>
<%= render "devise/shared/links" %>

View File

@ -1,6 +1,6 @@
.container
%h1 Forgot your password?
= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
= bootstrap_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
= devise_error_messages!
= f.text_field :screen_name, autofocus: true, "User name"

View File

@ -0,0 +1,31 @@
<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 :screen_name %><br />
<%= f.email_field :screen_name, autofocus: true %></div>
<div><%= f.label :email %><br />
<%= f.email_field :email %></div>
<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
<% end %>
<div><%= f.label :password %> <i>(leave blank if you don't want to change it)</i><br />
<%= f.password_field :password, autocomplete: "off" %></div>
<div><%= f.label :password_confirmation %><br />
<%= f.password_field :password_confirmation, autocomplete: "off" %></div>
<div><%= f.label :current_password %> <i>(we need your current password to confirm your changes)</i><br />
<%= f.password_field :current_password, autocomplete: "off" %></div>
<div><%= f.submit "Update" %></div>
<% end %>
<h3>Cancel my account</h3>
<p>Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete %></p>
<%= link_to "Back", :back %>

View File

@ -1,6 +1,6 @@
.container
%h1 Edit #{resource_name.to_s.humanize}
= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
= devise_error_messages!
= f.text_field :screen_name, autofocus: true, label: "User name"

View File

@ -1,7 +1,7 @@
.container
%h1 Sign up
= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
= bootstrap_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f|
= devise_error_messages!
= f.text_field :screen_name, autofocus: true, label: "User name"

View File

@ -2,7 +2,7 @@
%h1 Sign in
= render 'layouts/messages'
= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
= bootstrap_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
= f.text_field :login, autofocus: true, label: "User name"
= f.password_field :password, autocomplete: "off", label: "Password"

View File

@ -0,0 +1,25 @@
<%- if controller_name != 'sessions' %>
<%= link_to "Sign in", new_session_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<%= link_to "Sign up", new_registration_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
<%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
<%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
<% end -%>
<%- if devise_mapping.omniauthable? %>
<%- resource_class.omniauth_providers.each do |provider| %>
<%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
<% end -%>
<% end -%>

View File

@ -0,0 +1,12 @@
<h2>Resend unlock instructions</h2>
<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
<%= devise_error_messages! %>
<div><%= f.label :email %><br />
<%= f.email_field :email, autofocus: true %></div>
<div><%= f.submit "Resend unlock instructions" %></div>
<% end %>
<%= render "devise/shared/links" %>

View File

@ -2,7 +2,7 @@
%h1 Resend unlock instructions
= render 'layouts/messages'
= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
= bootstrap_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
= devise_error_messages!
= f.email_field :email, autofocus: true, label: "Email address"

View File

@ -1,19 +1,26 @@
%nav.ui.fixed.inverted.main.menu
%h3.header.item justask
= nav_entry "Home", "/", icon: "home"
%nav.navbar.navbar-default.navbar-fixed-top{role: "navigation"}
.container
.navbar-header
%button.navbar-toggle{"data-target" => "#j2-main-navbar-collapse", "data-toggle" => "collapse", type: "button"}
%span.sr-only Toggle navigation
%span.icon-bar
%span.icon-bar
%span.icon-bar
%a.navbar-brand{href: "/"} justask2
#j2-main-navbar-collapse.collapse.navbar-collapse
%ul.nav.navbar-nav
= nav_entry "Front", "/"
%ul.nav.navbar-nav.navbar-right
- if user_signed_in?
= nav_entry "Inbox", "/inbox", icon: "inbox", label: "2"
- else
= nav_entry "About", "/about", icon: ""
.right.menu
- if user_signed_in?
.ui.dropdown.item
%li.dropdown
%a.dropdown-toggle{href: "#", "data-toggle" => "dropdown"}
= current_user.screen_name
= semantic_icon "dropdown"
.menu
= link_to "Profile", edit_user_registration_path, class: "item"
= link_to "Settings", "#", class: "item"
= link_to "Logout", destroy_user_session_path, method: :delete, class: "item"
%b.caret
%ul.dropdown-menu
%li= link_to "Profile", edit_user_registration_path
%li= link_to "Settings", "#"
%li.divider
%li= link_to "Logout", destroy_user_session_path, method: :delete
- else
= nav_entry "Sign in", new_user_session_path #, "right floated text"
= nav_entry "Sign up", new_user_registration_path #, "right floated text"
= nav_entry "Sign in", new_user_session_path
= nav_entry "Sign up", new_user_registration_path

View File

@ -1,7 +1,7 @@
!!! 5
%html
%head
%title justask
%title justask2
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
= javascript_include_tag 'application', 'data-turbolinks-track' => true
= csrf_meta_tags
@ -11,5 +11,5 @@
- if Rails.env.development?
%hr
.container
%p.text-danger Debug output:
%p.text-danger EVIL DEBUG MODE OF DOOM ENABLED!!!
= debug params