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

AS released, fix #103

pull/1/head
Nicolae Claudius 13 years ago
parent
501495cca1
commit
9056646108
7 changed files with 22 additions and 19 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. 3
      Gemfile
  2. 11
      Gemfile.lock
  3. 5
      app/assets/javascripts/application.js.coffee
  4. 4
      app/views/layouts/application.html.erb
  5. 4
      app/views/layouts/errors.html.erb
  6. 10
      app/views/layouts/home.html.erb
  7. 4
      app/views/layouts/public.html.erb

3
Gemfile
Unescape View File

@ -12,7 +12,8 @@ gem 'cancan', '~> 1.6.7'
gem 'squeel', '~> 0.9.3' gem 'squeel', '~> 0.9.3'
gem 'sentient_user', '~> 0.3.2' gem 'sentient_user', '~> 0.3.2'
gem 'userstamp_basic', '~> 0.1.0' gem 'userstamp_basic', '~> 0.1.0'
gem 'active_scaffold', '~> 3.2.0', git: 'https://github.com/activescaffold/active_scaffold.git' gem 'active_scaffold', '~> 3.2.1'
# git: 'https://github.com/activescaffold/active_scaffold.git'
# path: '/home/clyfe/dev/active_scaffold' # path: '/home/clyfe/dev/active_scaffold'
gem 'pjax_rails', '~> 0.1.7', git: 'https://github.com/rails/pjax_rails.git' gem 'pjax_rails', '~> 0.1.7', git: 'https://github.com/rails/pjax_rails.git'
gem 'validates_hostname', '~> 1.0.0', git: 'https://github.com/KimNorgaard/validates_hostname.git' gem 'validates_hostname', '~> 1.0.0', git: 'https://github.com/KimNorgaard/validates_hostname.git'

11
Gemfile.lock
Unescape View File

@ -4,13 +4,6 @@ GIT
specs: specs:
validates_hostname (1.0.0) validates_hostname (1.0.0)
GIT
remote: https://github.com/activescaffold/active_scaffold.git
revision: b81585d8dec4616d13da8034fe8a704bf14a5b81
specs:
active_scaffold (3.2.0)
rails (>= 3.1.3)
GIT GIT
remote: https://github.com/jejacks0n/navigasmic.git remote: https://github.com/jejacks0n/navigasmic.git
revision: 6108afe7930fd4b3282cbe8942240bf4f70e2f74 revision: 6108afe7930fd4b3282cbe8942240bf4f70e2f74
@ -43,6 +36,8 @@ GEM
active-model-email-validator (1.0.2) active-model-email-validator (1.0.2)
activemodel activemodel
mail mail
active_scaffold (3.2.1)
rails (>= 3.1.3)
activemodel (3.2.2) activemodel (3.2.2)
activesupport (= 3.2.2) activesupport (= 3.2.2)
builder (~> 3.0.0) builder (~> 3.0.0)
@ -277,7 +272,7 @@ PLATFORMS
DEPENDENCIES DEPENDENCIES
active-model-email-validator (~> 1.0.2) active-model-email-validator (~> 1.0.2)
active_scaffold (~> 3.2.0)! active_scaffold (~> 3.2.1)
acts_as_nested_interval (~> 0.0.2) acts_as_nested_interval (~> 0.0.2)
bootstrap-sass-rails (~> 2.0.0.2) bootstrap-sass-rails (~> 2.0.0.2)
cancan (~> 1.6.7) cancan (~> 1.6.7)

5
app/assets/javascripts/application.js.coffee
Unescape View File

@ -25,8 +25,7 @@ $ ->
$pjaxContainer.on 'pjax:success', (event, data, status, xhr, options) -> $pjaxContainer.on 'pjax:success', (event, data, status, xhr, options) ->
$('.pjax-nav').find('li.active').removeClass 'active' $('.pjax-nav').find('li.active').removeClass 'active'
$(".pjax-nav a[href=\"#{window.location.pathname}\"]").parents('li').addClass 'active' $(".pjax-nav a[href=\"#{window.location.pathname}\"]").parents('li').addClass 'active'
if $pjaxContainerParent.hasClass('container') || $pjaxContainer.find('.container').length > 0 if $pjaxContainer.find('.container').length > 0
$pjaxContainer.removeClass 'container'
$pjaxContainerParent.removeClass 'container' $pjaxContainerParent.removeClass 'container'
else else
$pjaxContainer.addClass 'container' $pjaxContainerParent.addClass 'container'

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

@ -20,8 +20,10 @@
<%= flash_display 'flash' %> <%= flash_display 'flash' %>
<%= yield %> <%= yield %>
</div> </div>
<%= render 'shared/bottom' %>
</div> </div>
<div class="container">
<%= render 'shared/bottom' %>
</div>
</body> </body>
</html> </html>

4
app/views/layouts/errors.html.erb
Unescape View File

@ -19,8 +19,10 @@
<%= flash_display 'flash' %> <%= flash_display 'flash' %>
<%= yield %> <%= yield %>
</div> </div>
<%= render 'shared/bottom' %>
</div> </div>
<div class="container">
<%= render 'shared/bottom' %>
</div>
</body> </body>
</html> </html>

10
app/views/layouts/home.html.erb
Unescape View File

@ -3,13 +3,15 @@
<body class="public"> <body class="public">
<%= render 'shared/navigation' %> <%= render 'shared/navigation' %>
<div data-pjax-container="true" id="main"> <div id="main">
<%= flash_display 'flash' %> <div data-pjax-container="true">
<%= yield %> <%= flash_display 'flash' %>
<%= yield %>
</div>
</div> </div>
<div class="container"> <div class="container">
<%= render 'shared/bottom' %> <%= render 'shared/bottom' %>
</div> </div>
</body> </body>
</html> </html>

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

@ -8,8 +8,10 @@
<%= flash_display 'flash' %> <%= flash_display 'flash' %>
<%= yield %> <%= yield %>
</div> </div>
<%= render 'shared/bottom' %>
</div> </div>
<div class="container">
<%= render 'shared/bottom' %>
</div>
</body> </body>
</html> </html>

Write Preview
Loading…
Cancel
Save