Made landing page and log in views content-type agnostic.
Added an un-minified version of jquery-mobile for debugging.
This commit is contained in:
parent
6e1ed78861
commit
bedc7ca41b
6 changed files with 3552 additions and 16 deletions
|
|
@ -1,13 +1,9 @@
|
|||
-# Copyright (c) 2010, Diaspora Inc. This file is
|
||||
-# licensed under the Affero General Public License version 3 or later. See
|
||||
-# the COPYRIGHT file.
|
||||
|
||||
%div{:data => {:role => 'content'}}
|
||||
%div{:data => {:role => 'fieldcontain'}}
|
||||
=render 'shared/publisher', :aspect => @aspect
|
||||
|
||||
= render 'shared/stream', :posts => @posts
|
||||
|
||||
/%div{:data => {:role => 'footer', :id => 'footer-toolbar', :position => 'fixed'}}
|
||||
/ %div{:data => {:role => 'navbar'}}
|
||||
/ %ul
|
||||
/ %li{:class => 'ui-btn-active'}
|
||||
/ = link_to 'posts', '#'
|
||||
/ %li
|
||||
/ =link_to 'contacts', '#'
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ javascripts:
|
|||
mobile:
|
||||
- public/javascripts/vendor/jquery144.min.js
|
||||
- public/javascripts/custom-mobile-scripting.js
|
||||
- public/javascripts/rails.js
|
||||
- public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
|
||||
- public/javascripts/vendor/jquery_mobile_a2.min.js
|
||||
- public/javascripts/mobile.js
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
$(document).bind("mobileinit", function(){
|
||||
$.extend( $.mobile , {
|
||||
|
||||
ajaxLinksEnabled : false
|
||||
ajaxFormsEnabled : false
|
||||
});
|
||||
});
|
||||
// $(document).bind("mobileinit", function(){
|
||||
// $.extend( $.mobile , {
|
||||
//
|
||||
// ajaxLinksEnabled : false
|
||||
// ajaxFormsEnabled : false
|
||||
// });
|
||||
// });
|
||||
|
|
|
|||
3541
public/javascripts/vendor/jquery_mobile_a2.js
vendored
Normal file
3541
public/javascripts/vendor/jquery_mobile_a2.js
vendored
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue