small changes to mobile
|
|
@ -4,10 +4,10 @@
|
||||||
|
|
||||||
= render 'shared/stream', :posts => @posts
|
= render 'shared/stream', :posts => @posts
|
||||||
|
|
||||||
%div{:data => {:role => 'footer', :id => 'footer-toolbar', :position => 'fixed'}}
|
/%div{:data => {:role => 'footer', :id => 'footer-toolbar', :position => 'fixed'}}
|
||||||
%div{:data => {:role => 'navbar'}}
|
/ %div{:data => {:role => 'navbar'}}
|
||||||
%ul
|
/ %ul
|
||||||
%li{:class => 'ui-btn-active'}
|
/ %li{:class => 'ui-btn-active'}
|
||||||
= link_to 'posts', '#'
|
/ = link_to 'posts', '#'
|
||||||
%li
|
/ %li
|
||||||
=link_to 'contacts', '#'
|
/ =link_to 'contacts', '#'
|
||||||
|
|
|
||||||
|
|
@ -26,11 +26,10 @@
|
||||||
%h1
|
%h1
|
||||||
= person_image_tag (current_user.person)
|
= person_image_tag (current_user.person)
|
||||||
= current_user.real_name
|
= current_user.real_name
|
||||||
%div{:data => {:role => 'fieldcontain'}}
|
|
||||||
= select_tag "aspect_picker", aspect_select_options(@aspects, @aspect)
|
= select_tag "aspect_picker", aspect_select_options(@aspects, @aspect)
|
||||||
|
|
||||||
= yield
|
= yield
|
||||||
|
|
||||||
%div{:data => {:role => 'fieldcontain'}}
|
/%div{:data => {:role => 'fieldcontain'}}
|
||||||
= form_tag(people_path, :method => 'get') do
|
/ = form_tag(people_path, :method => 'get') do
|
||||||
= text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search'
|
/ = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search'
|
||||||
|
|
|
||||||
|
|
@ -11,15 +11,19 @@
|
||||||
|
|
||||||
= status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
|
= status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
|
||||||
|
|
||||||
.options_and_submit
|
%fieldset{:class => 'ui-grid-a'}
|
||||||
- if aspect == :all
|
.options_and_submit
|
||||||
= status.submit t('.share'), :title => t('.share_with_all')
|
%div{:class => 'ui-block-a'}
|
||||||
- else
|
- if aspect == :all
|
||||||
= status.submit t('.share'), :title => t('.share_with', :aspect => aspect)
|
= status.submit t('.share'), :title => t('.share_with_all')
|
||||||
|
- else
|
||||||
|
= status.submit t('.share'), :title => t('.share_with', :aspect => aspect)
|
||||||
|
|
||||||
- if aspect == :all
|
- if aspect == :all
|
||||||
.public_toggle
|
%div{:class => 'ui-block-a'}
|
||||||
%p.checkbox_select
|
|
||||||
= status.check_box( :public, {}, true, false )
|
.public_toggle
|
||||||
= status.label :public, t('.make_public')
|
%p.checkbox_select
|
||||||
= link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;"
|
= status.check_box( :public, {}, true, false )
|
||||||
|
= status.label :public, t('.make_public')
|
||||||
|
= link_to '(?)', "#question_mark_pane", :class => 'question_mark', :style=>"display:none;"
|
||||||
|
|
|
||||||
|
|
@ -15,10 +15,6 @@
|
||||||
- else
|
- else
|
||||||
= current_user.aspects_with_post( post.id ).join(', ')
|
= 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
|
= render type_partial(post), :post => post
|
||||||
|
|
||||||
.info
|
.info
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
-# licensed under the Affero General Public License version 3 or later. See
|
-# licensed under the Affero General Public License version 3 or later. See
|
||||||
-# the COPYRIGHT file.
|
-# the COPYRIGHT file.
|
||||||
|
|
||||||
= markdownify(post.message)
|
%h3= markdownify(post.message)
|
||||||
%br
|
%br
|
||||||
- for photo in post.photos
|
- for photo in post.photos
|
||||||
= link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
|
= link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,7 @@ javascripts:
|
||||||
- public/javascripts/stream.js
|
- public/javascripts/stream.js
|
||||||
mobile:
|
mobile:
|
||||||
- public/javascripts/vendor/jquery144.min.js
|
- public/javascripts/vendor/jquery144.min.js
|
||||||
|
- public/javascripts/custom-mobile-scripting.js
|
||||||
- public/javascripts/rails.js
|
- public/javascripts/rails.js
|
||||||
- public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
|
- public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
|
||||||
- public/javascripts/vendor/jquery_mobile_a2.min.js
|
- public/javascripts/vendor/jquery_mobile_a2.min.js
|
||||||
|
|
|
||||||
7
public/javascripts/custom-mobile-scripting.js
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
$(document).bind("mobileinit", function(){
|
||||||
|
$.extend( $.mobile , {
|
||||||
|
|
||||||
|
ajaxLinksEnabled : false
|
||||||
|
ajaxFormsEnabled : false
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
@ -1,3 +1,6 @@
|
||||||
|
img {
|
||||||
|
border-radius: 5px; }
|
||||||
|
|
||||||
ul {
|
ul {
|
||||||
list-style: none; }
|
list-style: none; }
|
||||||
|
|
||||||
|
|
@ -24,6 +27,8 @@ li.message {
|
||||||
color: #444444;
|
color: #444444;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
font-size: 14px; }
|
font-size: 14px; }
|
||||||
|
li.message .content .aspect {
|
||||||
|
display: inline; }
|
||||||
li.message .content .stream_photo {
|
li.message .content .stream_photo {
|
||||||
float: left;
|
float: left;
|
||||||
margin-top: 6px; }
|
margin-top: 6px; }
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,9 @@
|
||||||
|
img
|
||||||
|
:border-radius 5px
|
||||||
ul
|
ul
|
||||||
:list-style none
|
:list-style none
|
||||||
|
|
||||||
|
|
||||||
.avatar
|
.avatar
|
||||||
:width 50px
|
:width 50px
|
||||||
:height 50px
|
:height 50px
|
||||||
|
|
@ -31,6 +35,9 @@ li.message
|
||||||
:padding
|
:padding
|
||||||
:left 65px
|
:left 65px
|
||||||
|
|
||||||
|
.aspect
|
||||||
|
:display inline
|
||||||
|
|
||||||
|
|
||||||
:color #444
|
:color #444
|
||||||
:font
|
:font
|
||||||
|
|
|
||||||
BIN
public/stylesheets/vendor/images/ajax-loader.png
vendored
Normal file
|
After Width: | Height: | Size: 503 B |
BIN
public/stylesheets/vendor/images/form-check-off.png
vendored
Normal file
|
After Width: | Height: | Size: 364 B |
BIN
public/stylesheets/vendor/images/form-check-on.png
vendored
Normal file
|
After Width: | Height: | Size: 460 B |
BIN
public/stylesheets/vendor/images/form-radio-off.png
vendored
Normal file
|
After Width: | Height: | Size: 453 B |
BIN
public/stylesheets/vendor/images/form-radio-on.png
vendored
Normal file
|
After Width: | Height: | Size: 519 B |
BIN
public/stylesheets/vendor/images/icon-search-black.png
vendored
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
public/stylesheets/vendor/images/icons-18-black.png
vendored
Normal file
|
After Width: | Height: | Size: 907 B |
BIN
public/stylesheets/vendor/images/icons-18-white.png
vendored
Normal file
|
After Width: | Height: | Size: 908 B |
BIN
public/stylesheets/vendor/images/icons-36-black.png
vendored
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
public/stylesheets/vendor/images/icons-36-white.png
vendored
Normal file
|
After Width: | Height: | Size: 1.7 KiB |