account cancelation, article styles on app

13 years ago · 13a2db04c5
19 changed files with 56 additions and 23 deletions
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@ -5,6 +5,7 @@
 // the compiled file.
 //
 //= require jquery
+//= require jquery-ui
 //= require jquery_ujs
 //= require pjax
 //= require active_scaffold
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@ -2,13 +2,20 @@
 * This is a manifest file that'll automatically include all the stylesheets available in this directory
 * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
 * the top of the compiled file, but it's generally better to create a new file per style scope.
+
 *= require normalize
+
 *= require theme/base
-*= require theme/default
+*= require theme/theme
 *= require theme/error_explanation
+*= require theme/public
+*= require theme/application
+
 *= require pages/home
 *= require pages/team
 *= require pages/help
+*= require pages/edit_account
+
 *= require active_scaffold
 *= require overrides
 *= require slides
--- a/app/assets/stylesheets/pages/edit_account.css.scss
+++ b/app/assets/stylesheets/pages/edit_account.css.scss
@ -0,0 +1,11 @@
+.danger-zone {
+    h3 {
+        color: #cc4831;        
+    }
+    form input {
+        color: #cc4831;        
+    }
+    p {
+        color: #cc4831;        
+    }
+}
--- a/app/assets/stylesheets/pages/home.css.scss
+++ b/app/assets/stylesheets/pages/home.css.scss
@ -1,12 +1,6 @@
@import "compass/css3/text-shadow";
@import "ui/buttons";

-.home-page .header-inner {
-    width: 77%;
-    margin: auto;
-    position: relative;
-}
-
 #main .home-page-block {
    background-color: #333333;
    .content h1 {
--- a/app/assets/stylesheets/theme/application.css.scss
+++ b/app/assets/stylesheets/theme/application.css.scss
@ -0,0 +1,8 @@
+.application #main {
+    width: 100%;
+}
+
+.application #main .article {
+    width: 77%;
+    margin: auto;
+}
--- a/app/assets/stylesheets/theme/error_explanation.css.scss
+++ b/app/assets/stylesheets/theme/error_explanation.css.scss
@ -16,4 +16,4 @@
            border: 1px solid #cc4831;
        }
    }
-}
+}
--- a/app/assets/stylesheets/theme/public.css.scss
+++ b/app/assets/stylesheets/theme/public.css.scss
@ -0,0 +1,5 @@
+.public .header-inner {
+    width: 77%;
+    margin: auto;
+    position: relative;
+}
--- a/app/assets/stylesheets/theme/default.scss
+++ b/app/assets/stylesheets/theme/default.scss
--- a/app/models/user.rb
+++ b/app/models/user.rb
@ -16,7 +16,8 @@ class User < ActiveRecord::Base
  # Setup accessible (or protected) attributes for your model
  attr_accessible :email, :password, :password_confirmation, :remember_me, :first_name, :last_name
  
-  has_many :records
+  has_many :domains, :inverse_of => :user, :dependent => :destroy
+  has_many :records, :inverse_of => :user, :dependent => :destroy
  
  def name
    first_name + ' ' + last_name
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@ -4,8 +4,6 @@
    <h2>Edit <%= resource_name.to_s.humanize %></h2>
    <div class="content login">

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

@ -30,11 +28,19 @@
        <div><%= f.submit "Update" %></div>
      <% end %>

-      <h3>Cancel my account</h3>
+      <br />
+      <%= link_to "Back", :back %>
+      <br />  

-      <p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
+      <div class="danger-zone">
+        <h3>Danger zone</h3>
+        <p>
+          If you cancel your account all your data will be deleted!
+          <%= button_to "Cancel account", registration_path(resource_name), 
+            :confirm => "All your data will be deleted! Are you sure?", :method => :delete %>
+        </p>
+      </div>

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

    </div>
  </div>
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -11,7 +11,7 @@
    <div id="container">
      <%= render :partial => 'fragments/top' %>
      <div id="wrapper" class="wat-cf">
-        <div id="main" style="width: 100%;" data-pjax-container="true">
+        <div id="main" data-pjax-container="true">
          <%= flash_display 'flash' %>          
          <%= yield %>
        </div>
--- a/app/views/layouts/public.html.erb
+++ b/app/views/layouts/public.html.erb
@ -6,7 +6,7 @@
    <%= javascript_include_tag "application" %>
    <%= csrf_meta_tag %>
  </head>
-  <body class="home-page">
+  <body class="public">

    <div id="container">
      <%= render :partial => 'fragments/top' %>
--- a/app/views/pages/about.html.erb
+++ b/app/views/pages/about.html.erb
@ -1,4 +1,4 @@
-<div class="block">
+<div class="block article">
  <div class="content">
    <div class="inner">

--- a/app/views/pages/contact.html.erb
+++ b/app/views/pages/contact.html.erb
@ -1,4 +1,4 @@
-<div class="block">
+<div class="block article">
  <div class="content">
    <div class="inner">

--- a/app/views/pages/help.html.erb
+++ b/app/views/pages/help.html.erb
@ -1,4 +1,4 @@
-<div class="block">
+<div class="block article">
  <div class="content">
    <div class="inner help-page">

--- a/app/views/pages/home.html.erb
+++ b/app/views/pages/home.html.erb
@ -1,4 +1,4 @@
-<div class="block home-page-block">
+<div class="block home-page-block article">
  <div class="content">
    <h1>Totally Free DNS service for Geeks <small>created by Geeks</small></h1>
    <div class="inner home-page-inner">
--- a/app/views/pages/privacy.html.erb
+++ b/app/views/pages/privacy.html.erb
@ -1,4 +1,4 @@
-<div class="block">
+<div class="block article">
  <div class="content">
    <div class="inner">

--- a/app/views/pages/team.html.erb
+++ b/app/views/pages/team.html.erb
@ -1,4 +1,4 @@
-<div class="block">
+<div class="block article">
  <div class="content">
    <div class="inner team">
      
--- a/app/views/pages/terms.html.erb
+++ b/app/views/pages/terms.html.erb
@ -1,4 +1,4 @@
-<div class="block">
+<div class="block article">
  <div class="content">
    <div class="inner">