diff --git a/app/views/devise/sessions/new.haml b/app/views/devise/sessions/new.haml index 04e3d4aff..1e9b883a3 100644 --- a/app/views/devise/sessions/new.haml +++ b/app/views/devise/sessions/new.haml @@ -36,6 +36,8 @@ = f.text_field :username %span.pod_location ="@#{AppConfig[:pod_uri].host}" + %br + %br %p = f.label :password , t('password') @@ -45,14 +47,20 @@ = link_to t('devise.shared.links.forgot_your_password'), new_password_path(resource_name) - else \. - - %p.submit - = f.submit t('.sign_in') - %span + %br - if !AppConfig[:registrations_closed] && devise_mapping.registerable? && controller_name != 'registrations' = link_to t('devise.shared.links.sign_up'), new_registration_path(resource_name) - else \. + %p.submit + = f.submit t('.sign_in') + %span#remember_me + - if devise_mapping.rememberable? + = f.check_box :remember_me + = f.label :remember_me, t('.remember_me') + - else + \. + = image_tag 'ajax-loader.gif', :id => "spinner", :class => "hidden" diff --git a/app/views/devise/sessions/new.mobile.haml b/app/views/devise/sessions/new.mobile.haml index 9f0d0d22a..1f2729717 100644 --- a/app/views/devise/sessions/new.mobile.haml +++ b/app/views/devise/sessions/new.mobile.haml @@ -14,6 +14,9 @@ = f.label :password , t('password') = f.password_field :password = f.submit t('.sign_in') + - if devise_mapping.rememberable? + = f.check_box :remember_me + = f.label :remember_me, t('.remember_me') %p = render :partial => "devise/shared/links" diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 09a0191a4..9a592daf2 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -23,54 +23,6 @@ = stylesheet_link_tag "blueprint/print", :media => 'print' = include_stylesheets :default, :media => 'all' - - = javascript_include_tag AppConfig[:pod_uri].scheme.to_s + "://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" - - :javascript - !window.jQuery && document.write(unescape('%3Cscript src="/javascripts/vendor/jquery144.min.js"%3E%3C/script%3E')) - - - unless @landing_page - = include_javascripts :main - -if current_user - :javascript - Diaspora.widgets.i18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}"); - - - - if current_user - = include_javascripts :flash_socket #unless modern_browser? - = javascript_include_tag 'web-socket-receiver' - = render 'js/websocket_js' - - = csrf_meta_tag - - = yield(:head) - = csrf_meta_tag - - -if AppConfig[:google_a_site] - :javascript - var _gaq = _gaq || []; - _gaq.push(['_setAccount', '#{AppConfig[:google_a_site]}']); - _gaq.push(['_trackPageview']); - - (function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); - })(); - - -if AppConfig[:piwik_id] - :javascript - var pkBaseURL = (("https:" == document.location.protocol) ? "https://#{AppConfig[:piwik_url]}/" : "http://#{AppConfig[:piwik_url]}/"); - document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); - :javascript - try { - var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", #{AppConfig[:piwik_id]}); - piwikTracker.trackPageView(); - piwikTracker.enableLinkTracking(); - } catch( err ) {} - - if current_user %link{:rel => "alternate", :href => "#{current_user.public_url}", :type => "application/atom+xml", :title => "Public Diaspora Feed for #{current_user.name}"} @@ -121,3 +73,48 @@ feedback_widget_options.style = "idea"; var feedback_widget = new GSFN.feedback_widget(feedback_widget_options); + -if AppConfig[:google_a_site] + :javascript + var _gaq = [['_setAccount', '#{AppConfig[:google_a_site]}'], ['_trackPageview']]; + (function(d, t) { + var g = d.createElement(t), + s = d.getElementsByTagName(t)[0]; + g.async = true; + g.src = ('https:' == location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; + s.parentNode.insertBefore(g, s); + })(document, 'script'); + + -if AppConfig[:piwik_id] + :javascript + var pkBaseURL = (("https:" == document.location.protocol) ? "https://#{AppConfig[:piwik_url]}/" : "http://#{AppConfig[:piwik_url]}/"); + document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); + :javascript + try { + var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", #{AppConfig[:piwik_id]}); + piwikTracker.trackPageView(); + piwikTracker.enableLinkTracking(); + } catch( err ) {} + + + + = javascript_include_tag AppConfig[:pod_uri].scheme.to_s + "://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js" + + :javascript + !window.jQuery && document.write(unescape('%3Cscript src="/javascripts/vendor/jquery144.min.js"%3E%3C/script%3E')) + + - unless @landing_page + = include_javascripts :main + -if current_user + :javascript + Diaspora.widgets.i18n.loadLocale(#{get_javascript_strings_for(current_user.language).to_json}, "#{current_user.language}"); + + - if current_user + = include_javascripts :flash_socket #unless modern_browser? + = javascript_include_tag 'web-socket-receiver' + = render 'js/websocket_js' + + = csrf_meta_tag + + = yield(:head) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index b9fdc5b72..97175dd0b 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -9,7 +9,7 @@ $(document).ready(function() { itemSelector : "#main_stream .stream_element", // selector for all items you'll retrieve bufferPx: 300, - debug: true, + debug: false, donetext: "no more.", loadingText: "", loadingImg: '/images/ajax-loader.gif' diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 5a2fa81d0..a5e6bcd6a 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -2397,6 +2397,7 @@ ul.show_comments &.submit :width auto + :bottom 15px input :width auto @@ -2463,3 +2464,12 @@ ul.show_comments #sort_by :text-align right + +#remember_me + input[type='checkbox'] + :display inline + :height auto !important + :top 2px !important + label + :font-size inherit !important + :position static diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass index 26eeb1af7..06e94078a 100644 --- a/public/stylesheets/sass/mobile.sass +++ b/public/stylesheets/sass/mobile.sass @@ -61,6 +61,7 @@ a .login_form @include mobile-box + :padding 10px label :font-weight bold