diff --git a/app/views/aspects/index.mobile.haml b/app/views/aspects/index.mobile.haml index a9c155a04..95c790844 100644 --- a/app/views/aspects/index.mobile.haml +++ b/app/views/aspects/index.mobile.haml @@ -4,10 +4,10 @@ = 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', '#' +/%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', '#' diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 68e2ea048..b20c81643 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -26,11 +26,10 @@ %h1 = person_image_tag (current_user.person) = current_user.real_name - %div{:data => {:role => 'fieldcontain'}} = select_tag "aspect_picker", aspect_select_options(@aspects, @aspect) = yield - %div{:data => {:role => 'fieldcontain'}} - = form_tag(people_path, :method => 'get') do - = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search' + /%div{:data => {:role => 'fieldcontain'}} + / = form_tag(people_path, :method => 'get') do + / = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search' diff --git a/app/views/shared/_publisher.mobile.haml b/app/views/shared/_publisher.mobile.haml index b7f01fc8e..2752cf0a7 100644 --- a/app/views/shared/_publisher.mobile.haml +++ b/app/views/shared/_publisher.mobile.haml @@ -11,15 +11,19 @@ = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id) - .options_and_submit - - if aspect == :all - = status.submit t('.share'), :title => t('.share_with_all') - - else - = status.submit t('.share'), :title => t('.share_with', :aspect => aspect) + %fieldset{:class => 'ui-grid-a'} + .options_and_submit + %div{:class => 'ui-block-a'} + - if aspect == :all + = status.submit t('.share'), :title => t('.share_with_all') + - else + = status.submit t('.share'), :title => t('.share_with', :aspect => aspect) - - if aspect == :all - .public_toggle - %p.checkbox_select - = status.check_box( :public, {}, true, false ) - = status.label :public, t('.make_public') - = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;" + - if aspect == :all + %div{:class => 'ui-block-a'} + + .public_toggle + %p.checkbox_select + = status.check_box( :public, {}, true, false ) + = status.label :public, t('.make_public') + = link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;" diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml index 617861a7e..404abde95 100644 --- a/app/views/shared/_stream_element.mobile.haml +++ b/app/views/shared/_stream_element.mobile.haml @@ -15,10 +15,6 @@ - else = current_user.aspects_with_post( post.id ).join(', ') - - if current_user.owns?(post) - .right - = link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete" - = render type_partial(post), :post => post .info diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml index c467cbea6..e559598db 100644 --- a/app/views/status_messages/_status_message.haml +++ b/app/views/status_messages/_status_message.haml @@ -2,7 +2,7 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -= markdownify(post.message) +%h3= markdownify(post.message) %br - for photo in post.photos = link_to (image_tag photo.url(:thumb_medium)), object_path(photo) diff --git a/config/assets.yml b/config/assets.yml index de451dd07..4a194cd3f 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -16,6 +16,7 @@ javascripts: - public/javascripts/stream.js 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 diff --git a/public/javascripts/custom-mobile-scripting.js b/public/javascripts/custom-mobile-scripting.js new file mode 100644 index 000000000..e435105d3 --- /dev/null +++ b/public/javascripts/custom-mobile-scripting.js @@ -0,0 +1,7 @@ +$(document).bind("mobileinit", function(){ + $.extend( $.mobile , { + + ajaxLinksEnabled : false + ajaxFormsEnabled : false + }); +}); diff --git a/public/stylesheets/mobile.css b/public/stylesheets/mobile.css index 05c2a3216..afd31bc35 100644 --- a/public/stylesheets/mobile.css +++ b/public/stylesheets/mobile.css @@ -1,3 +1,6 @@ +img { + border-radius: 5px; } + ul { list-style: none; } @@ -24,6 +27,8 @@ li.message { color: #444444; font-weight: normal; font-size: 14px; } + li.message .content .aspect { + display: inline; } li.message .content .stream_photo { float: left; margin-top: 6px; } diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass index 142a2f41f..8f59200d9 100644 --- a/public/stylesheets/sass/mobile.sass +++ b/public/stylesheets/sass/mobile.sass @@ -1,5 +1,9 @@ +img + :border-radius 5px ul :list-style none + + .avatar :width 50px :height 50px @@ -31,6 +35,9 @@ li.message :padding :left 65px + .aspect + :display inline + :color #444 :font diff --git a/public/stylesheets/vendor/images/ajax-loader.png b/public/stylesheets/vendor/images/ajax-loader.png new file mode 100644 index 000000000..811a2cdd1 Binary files /dev/null and b/public/stylesheets/vendor/images/ajax-loader.png differ diff --git a/public/stylesheets/vendor/images/form-check-off.png b/public/stylesheets/vendor/images/form-check-off.png new file mode 100644 index 000000000..54e2fe0f8 Binary files /dev/null and b/public/stylesheets/vendor/images/form-check-off.png differ diff --git a/public/stylesheets/vendor/images/form-check-on.png b/public/stylesheets/vendor/images/form-check-on.png new file mode 100644 index 000000000..e6daaaf8b Binary files /dev/null and b/public/stylesheets/vendor/images/form-check-on.png differ diff --git a/public/stylesheets/vendor/images/form-radio-off.png b/public/stylesheets/vendor/images/form-radio-off.png new file mode 100644 index 000000000..32bd43392 Binary files /dev/null and b/public/stylesheets/vendor/images/form-radio-off.png differ diff --git a/public/stylesheets/vendor/images/form-radio-on.png b/public/stylesheets/vendor/images/form-radio-on.png new file mode 100644 index 000000000..ddc404970 Binary files /dev/null and b/public/stylesheets/vendor/images/form-radio-on.png differ diff --git a/public/stylesheets/vendor/images/icon-search-black.png b/public/stylesheets/vendor/images/icon-search-black.png new file mode 100644 index 000000000..5721120f8 Binary files /dev/null and b/public/stylesheets/vendor/images/icon-search-black.png differ diff --git a/public/stylesheets/vendor/images/icons-18-black.png b/public/stylesheets/vendor/images/icons-18-black.png new file mode 100644 index 000000000..38f47267f Binary files /dev/null and b/public/stylesheets/vendor/images/icons-18-black.png differ diff --git a/public/stylesheets/vendor/images/icons-18-white.png b/public/stylesheets/vendor/images/icons-18-white.png new file mode 100644 index 000000000..ceb283451 Binary files /dev/null and b/public/stylesheets/vendor/images/icons-18-white.png differ diff --git a/public/stylesheets/vendor/images/icons-36-black.png b/public/stylesheets/vendor/images/icons-36-black.png new file mode 100644 index 000000000..b079c51f4 Binary files /dev/null and b/public/stylesheets/vendor/images/icons-36-black.png differ diff --git a/public/stylesheets/vendor/images/icons-36-white.png b/public/stylesheets/vendor/images/icons-36-white.png new file mode 100644 index 000000000..038cae40d Binary files /dev/null and b/public/stylesheets/vendor/images/icons-36-white.png differ