playground
/
entrydns
mirror of https://github.com/EntryDNS/entrydns.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

account cancelation, article styles on app

pull/1/head
Nicolae Claudius 13 years ago
parent
a31e3762ab
commit
13a2db04c5
19 changed files with 56 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/assets/javascripts/application.js
  2. 9
      app/assets/stylesheets/application.css
  3. 11
      app/assets/stylesheets/pages/edit_account.css.scss
  4. 6
      app/assets/stylesheets/pages/home.css.scss
  5. 8
      app/assets/stylesheets/theme/application.css.scss
  6. 5
      app/assets/stylesheets/theme/public.css.scss
  7. 0
      app/assets/stylesheets/theme/theme.scss
  8. 3
      app/models/user.rb
  9. 18
      app/views/devise/registrations/edit.html.erb
  10. 2
      app/views/layouts/application.html.erb
  11. 2
      app/views/layouts/public.html.erb
  12. 2
      app/views/pages/about.html.erb
  13. 2
      app/views/pages/contact.html.erb
  14. 2
      app/views/pages/help.html.erb
  15. 2
      app/views/pages/home.html.erb
  16. 2
      app/views/pages/privacy.html.erb
  17. 2
      app/views/pages/team.html.erb
  18. 2
      app/views/pages/terms.html.erb

1
app/assets/javascripts/application.js
Unescape View File

@ -5,6 +5,7 @@
// the compiled file. // the compiled file.
// //
//= require jquery //= require jquery
//= require jquery-ui
//= require jquery_ujs //= require jquery_ujs
//= require pjax //= require pjax
//= require active_scaffold //= require active_scaffold

9
app/assets/stylesheets/application.css
Unescape View File

@ -2,13 +2,20 @@
* This is a manifest file that'll automatically include all the stylesheets available in this directory * 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 * 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. * the top of the compiled file, but it's generally better to create a new file per style scope.
*= require normalize *= require normalize
*= require theme/base *= require theme/base
*= require theme/default *= require theme/theme
*= require theme/error_explanation *= require theme/error_explanation
*= require theme/public
*= require theme/application
*= require pages/home *= require pages/home
*= require pages/team *= require pages/team
*= require pages/help *= require pages/help
*= require pages/edit_account
*= require active_scaffold *= require active_scaffold
*= require overrides *= require overrides
*= require slides *= require slides

11
app/assets/stylesheets/pages/edit_account.css.scss
Unescape View File

@ -0,0 +1,11 @@
.danger-zone {
h3 {
color: #cc4831;
}
form input {
color: #cc4831;
}
p {
color: #cc4831;
}
}

6
app/assets/stylesheets/pages/home.css.scss
Unescape View File

@ -1,12 +1,6 @@
@import "compass/css3/text-shadow"; @import "compass/css3/text-shadow";
@import "ui/buttons"; @import "ui/buttons";
.home-page .header-inner {
width: 77%;
margin: auto;
position: relative;
}
#main .home-page-block { #main .home-page-block {
background-color: #333333; background-color: #333333;
.content h1 { .content h1 {

8
app/assets/stylesheets/theme/application.css.scss
Unescape View File

@ -0,0 +1,8 @@
.application #main {
width: 100%;
}
.application #main .article {
width: 77%;
margin: auto;
}

5
app/assets/stylesheets/theme/public.css.scss
Unescape View File

@ -0,0 +1,5 @@
.public .header-inner {
width: 77%;
margin: auto;
position: relative;
}

0
app/assets/stylesheets/theme/default.scss → app/assets/stylesheets/theme/theme.scss
Unescape View File

3
app/models/user.rb
Unescape View File

@ -16,7 +16,8 @@ class User < ActiveRecord::Base
# Setup accessible (or protected) attributes for your model # Setup accessible (or protected) attributes for your model
attr_accessible :email, :password, :password_confirmation, :remember_me, :first_name, :last_name 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 def name
first_name + ' ' + last_name first_name + ' ' + last_name

18
app/views/devise/registrations/edit.html.erb
Unescape View File

@ -4,8 +4,6 @@
<h2>Edit <%= resource_name.to_s.humanize %></h2> <h2>Edit <%= resource_name.to_s.humanize %></h2>
<div class="content login"> <div class="content login">
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %> <%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %> <%= devise_error_messages! %>
@ -30,11 +28,19 @@
<div><%= f.submit "Update" %></div> <div><%= f.submit "Update" %></div>
<% end %> <% end %>
<h3>Cancel my account</h3> <br />
<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :confirm => "Are you sure?", :method => :delete %>.</p>
<%= link_to "Back", :back %> <%= link_to "Back", :back %>
<br />
<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>
</div> </div>
</div> </div>

2
app/views/layouts/application.html.erb
Unescape View File

@ -11,7 +11,7 @@
<div id="container"> <div id="container">
<%= render :partial => 'fragments/top' %> <%= render :partial => 'fragments/top' %>
<div id="wrapper" class="wat-cf"> <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' %> <%= flash_display 'flash' %>
<%= yield %> <%= yield %>
</div> </div>

2
app/views/layouts/public.html.erb
Unescape View File

@ -6,7 +6,7 @@
<%= javascript_include_tag "application" %> <%= javascript_include_tag "application" %>
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
</head> </head>
<body class="home-page"> <body class="public">
<div id="container"> <div id="container">
<%= render :partial => 'fragments/top' %> <%= render :partial => 'fragments/top' %>

2
app/views/pages/about.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="block"> <div class="block article">
<div class="content"> <div class="content">
<div class="inner"> <div class="inner">

2
app/views/pages/contact.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="block"> <div class="block article">
<div class="content"> <div class="content">
<div class="inner"> <div class="inner">

2
app/views/pages/help.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="block"> <div class="block article">
<div class="content"> <div class="content">
<div class="inner help-page"> <div class="inner help-page">

2
app/views/pages/home.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="block home-page-block"> <div class="block home-page-block article">
<div class="content"> <div class="content">
<h1>Totally Free DNS service for Geeks <small>created by Geeks</small></h1> <h1>Totally Free DNS service for Geeks <small>created by Geeks</small></h1>
<div class="inner home-page-inner"> <div class="inner home-page-inner">

2
app/views/pages/privacy.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="block"> <div class="block article">
<div class="content"> <div class="content">
<div class="inner"> <div class="inner">

2
app/views/pages/team.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="block"> <div class="block article">
<div class="content"> <div class="content">
<div class="inner team"> <div class="inner team">

2
app/views/pages/terms.html.erb
Unescape View File

@ -1,4 +1,4 @@
<div class="block"> <div class="block article">
<div class="content"> <div class="content">
<div class="inner"> <div class="inner">

Write Preview
Loading…
Cancel
Save