diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 035bd64f5..1fe536c89 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -28,7 +28,11 @@ class ApplicationController < ActionController::Base def mobile_except_ipad if is_mobile_device? - session[:mobile_view] = false if request.env["HTTP_USER_AGENT"].include? "iPad" + if request.env["HTTP_USER_AGENT"].include? "iPad" + session[:mobile_view] = false + else + session[:mobile_view] = true + end end end diff --git a/app/helpers/mobile_helper.rb b/app/helpers/mobile_helper.rb new file mode 100644 index 000000000..0c2b9ad71 --- /dev/null +++ b/app/helpers/mobile_helper.rb @@ -0,0 +1,6 @@ +module MobileHelper + def aspect_select_options(aspects, selected) + selected_id = selected == :all ? "" : selected.id + '\n'.html_safe + options_from_collection_for_select(aspects, "id", "name", selected_id) + end +end \ No newline at end of file diff --git a/app/views/aspects/show.mobile.haml b/app/views/aspects/show.mobile.haml new file mode 100644 index 000000000..5ac59fe3b --- /dev/null +++ b/app/views/aspects/show.mobile.haml @@ -0,0 +1,11 @@ +-# Copyright (c) 2010, Diaspora Inc. This file is +-# licensed under the Affero General Public License version 3 or later. See +-# the COPYRIGHT file. + += render 'shared/publisher', :aspect => @aspect + += render 'shared/stream', :posts => @posts + +#pagination + = will_paginate @posts + diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index be524275c..68e2ea048 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -10,10 +10,13 @@ %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ - = javascript_include_tag 'vendor/jquery144.min','rails' = include_javascripts :mobile = stylesheet_link_tag 'mobile', 'vendor/jquery_mobile.min' = csrf_meta_tag + + :javascript + $(document).ready(Mobile.initialize); + = yield(:head) @@ -24,7 +27,7 @@ = person_image_tag (current_user.person) = current_user.real_name %div{:data => {:role => 'fieldcontain'}} - =select_tag "aspects", options_from_collection_for_select(@aspects, "id", "name") + = select_tag "aspect_picker", aspect_select_options(@aspects, @aspect) = yield diff --git a/config/assets.yml b/config/assets.yml index 266ec6276..de451dd07 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -15,8 +15,11 @@ javascripts: - public/javascripts/image-picker.js - public/javascripts/stream.js mobile: + - public/javascripts/vendor/jquery144.min.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 mailchimp: - public/javascripts/vendor/mailchimp/jquery.form.js - public/javascripts/vendor/mailchimp/jquery.validate.js diff --git a/public/javascripts/mobile.js b/public/javascripts/mobile.js new file mode 100644 index 000000000..89c7368ff --- /dev/null +++ b/public/javascripts/mobile.js @@ -0,0 +1,14 @@ +var Mobile = { + initialize : function(){ + $('#aspect_picker').change(Mobile.changeAspect); + }, + + changeAspect : function() { + Mobile.windowLocation('/aspects/' + $('#aspect_picker option:selected').val()); + }, + + windowLocation : function(url) { + window.location = url; + }, +}; + diff --git a/spec/fixtures/users.yaml b/spec/fixtures/users.yaml index 508b9ba40..1174882e4 100644 --- a/spec/fixtures/users.yaml +++ b/spec/fixtures/users.yaml @@ -1,22 +1,22 @@ --- :users: - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$3B8ebjeIGXSBwC8Y43m/a.zOlbKioxcg.yxhJJiKzCeZsZJ5BY5J. + encrypted_password: $2a$10$NS3bZYEXSN4/OWcwTd.hLON3YDI9imTk/9ovXHNiBwwx62KkrvEFy serialized_private_key: &id002 | -----BEGIN RSA PRIVATE KEY----- - MIICXAIBAAKBgQC0md2P49UwWskyp99x0S2RINRPfGoe006eoEblDZwXWHZ0I7DB - nZEth+L0nNkauKl1BRhrMVnRE0QM7LgYDQXC6AHzTG9Abr2KMcnwtUsrcy8TvI+d - gCsPEKg1y2LfJEbUxcSZNR/o7Qv9aXeuyRFDNHnVy+QXDwrn80OxYjHVrQIDAQAB - AoGAVMvFttC/gWOvAiTGChev8GtcpDGDVhPa3ynb/6IDPwbfHyq+zDmiN6GM01Nt - sFkx32rUC0hxpnQISJVA3rIGmLFDy83T0o5RtbyRBeBe8PfOS2UVSXT5F7OJYzLk - GrKcX+tz37lV13ul8XRIdGpsvWpPSX2Cm1Dvl17R7SuvjqECQQDrGDBknsBWhTRA - rn1Bqhvg2OKwNCRuy9L5lbvTgoGtirZkKxjk+kX2RHNo12TLZ1SAymSXsnr+r/y0 - VNFinmaZAkEAxKko4Yttsu+dQ0XX9N/aj84sj5eTtG4YmiU/WtwM+YzmpnQlJWFF - vVrEz67iTB+4t1LMNFnehibrW9/O9HJYNQJAVQ5gW9cv4V26JPi8aqiAA56UjYmf - 8NIfl5s75G9gOYhpKt6I2DdQXqQvWSws1IajBSG0uUmixEip1hil1NdYaQJAcf1n - D8zEihoveoXqVirGweIMnDKMz+Gc6wQ6A81Wy/Mq4kKiIVePl+EcARFqZBti8wfQ - C2wn+nRmqbtBdxksHQJBAMsT/9s1rIi8HVAdX9Gg+ISq/Yy5+XNZbZlykEFedbZh - ibXOg219Mk+Q1dIpd4XBqdoMQwZdME6tUO4qZ6UTjnI= + MIICXAIBAAKBgQCmuNFsHNwVHKwsQMbqqnSkyXrmXd+iFDqYOMX0WxTGesPF6L2U + vZzq21omn96v6H700NRTfudvXznZa1c82i7yJuDj4WeYzKxHixVPW+vRHDbG+O9Y + QLbYqU2G2IlmWtLNYfy34MgS9ab/U4HzqsqPrh0DzFbunNVeJeBbshGAzQIDAQAB + AoGAW0v54morWqRI5DLUusx884AhfOULAYZyT8lHHXiC9+1iJ447wqfStglIZL5H + A60dWJLCsrZbpfFPjG/rZbdU3QN8squzuvJc+6MbcvQ2ENpCSAmZZ/GMtVt+lHre + ilePUMuBSl5YokQJ50dDBnSMPfDPl6j8i+mFgK/3cIpT90ECQQDTAimxz4U5oQw5 + 86hlamoBasa9jTkkhGQ74t2XBTmuuhOqDLUNNzRnDO+7bsJ96JtN/H28q6ohg74G + /vavIGI3AkEAykVJ7vL+MCXz+7Wjp824tRUHkNvGsXMebUZAwce0N/RfIktjulI0 + wEbkNxpI3GZUuYK7TNBwm5u9L3xiJUODGwJBAL2EXcp0JqZB/Wc3bvHXh+pJ6sJo + yv//YL9g3cE8Ujiaq/q5ewupn4lG1zKzIkBP4N1Ef/IrBJ0hZFWIPivAnDUCQFKf + Lu4OD8p3FkxRC8J1g+dj6a1AOM8vKNSWB8mf23untFx70wa+oZGQ45OmhvCQVDda + sUtVMUo+uW52LljuVNUCQEOyGqNT+/uEsT+MdCYXH7Fz8D3+tY9Oyu8IhgrejGVA + ETDYy2mpXC1GW/wUgB8rLlCs0ekIk+Ng72CdfJTIlnQ= -----END RSA PRIVATE KEY----- pending_request_ids: [] @@ -27,36 +27,36 @@ data: - 76 - 233 - - 136 - - 50 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 46 + - 1 + - 91 last_sign_in_at: - username: bob126fddd2 + username: bob86aeb84c language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$3B8ebjeIGXSBwC8Y43m/a. + password_salt: $2a$10$NS3bZYEXSN4/OWcwTd.hLO remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob1210fd15@pivotallabs.com + email: bob87a73d17@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:30 Z + created_at: 2010-11-22 03:47:14 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -64,49 +64,49 @@ data: - 76 - 233 - - 136 - - 50 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 47 + - 1 + - 92 gender: diaspora_handle: birthday: - last_name: Grimm124b0930 + last_name: Grimm87d433e5 bio: - first_name: Robert12093714 - updated_at: 2010-11-21 20:59:30 Z + first_name: Robert8789a34a + updated_at: 2010-11-22 03:47:14 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 50 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 48 - url: http://google-124018a9.com/ + - 1 + - 93 + url: http://google-87cdcc7b.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id001 - diaspora_handle: bob126fddd2@example.org + diaspora_handle: bob86aeb84c@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$I6C1AXepkDCcarQA33cgxO3HyLeNrgocSQKG1VTXcnXHDWSFpbT8W + encrypted_password: $2a$10$1/YotLRUn3apShIBB/syZudCsWoHXjQRLYS2HDiVzOoEvPEzEsArO serialized_private_key: *id002 pending_request_ids: [] @@ -116,36 +116,36 @@ data: - 76 - 233 - - 136 - - 50 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 49 + - 1 + - 94 last_sign_in_at: - username: bob13746219 + username: bob870554a4 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$I6C1AXepkDCcarQA33cgxO + password_salt: $2a$10$1/YotLRUn3apShIBB/syZu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob139b9b65@pivotallabs.com + email: bob88ed6c7c@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:30 Z + created_at: 2010-11-22 03:47:14 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -153,49 +153,49 @@ data: - 76 - 233 - - 136 - - 50 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 50 + - 1 + - 95 gender: diaspora_handle: birthday: - last_name: Grimm130dba2d + last_name: Grimm884c8ae2 bio: - first_name: Robert133b86f7 - updated_at: 2010-11-21 20:59:30 Z + first_name: Robert888b781b + updated_at: 2010-11-22 03:47:14 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 50 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 51 - url: http://google-13e92b4d.com/ + - 1 + - 96 + url: http://google-88ee29d4.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id003 - diaspora_handle: bob13746219@example.org + diaspora_handle: bob870554a4@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$fVO/Lp9tkl8IrvKoRbLy2OHl.1o.RCnyIeXoKX8nP65dyTr10rc7K + encrypted_password: $2a$10$H8gjBBKDGYoLDGdaqLnAWuTTSjmTKS5jP8Q3HS6Qr6gN1X3/PkAvm serialized_private_key: *id002 pending_request_ids: [] @@ -205,36 +205,36 @@ data: - 76 - 233 - - 136 - - 50 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 52 + - 1 + - 97 last_sign_in_at: - username: bob14819437 + username: bob8863b67b language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$fVO/Lp9tkl8IrvKoRbLy2O + password_salt: $2a$10$H8gjBBKDGYoLDGdaqLnAWu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob14ac162c@pivotallabs.com + email: bob89672902@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:31 Z + created_at: 2010-11-22 03:47:14 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -242,49 +242,49 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 53 + - 1 + - 98 gender: diaspora_handle: birthday: - last_name: Grimm140fce67 + last_name: Grimm89ff6e24 bio: - first_name: Robert14162f1e - updated_at: 2010-11-21 20:59:31 Z + first_name: Robert89b1ee87 + updated_at: 2010-11-22 03:47:14 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 54 - url: http://google-14bd5630.com/ + - 1 + - 99 + url: http://google-89f11e95.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id004 - diaspora_handle: bob14819437@example.org + diaspora_handle: bob8863b67b@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$oCmhQz1V7S1IcAdEc0CXvOQbi5ggDUcisOBGnljYHm4DDXpuLkpPO + encrypted_password: $2a$10$PYen6rAKPmEcR7Exkqcy9usoQfuTZT4kBjNra3akewDNMff59u2yG serialized_private_key: *id002 pending_request_ids: [] @@ -294,36 +294,36 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 55 + - 1 + - 100 last_sign_in_at: - username: bob153294cf + username: bob891c6e6f language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$oCmhQz1V7S1IcAdEc0CXvO + password_salt: $2a$10$PYen6rAKPmEcR7Exkqcy9u remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob154ba0a1@pivotallabs.com + email: bob906607dd@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:31 Z + created_at: 2010-11-22 03:47:14 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -331,49 +331,49 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 56 + - 1 + - 101 gender: diaspora_handle: birthday: - last_name: Grimm15e607f2 + last_name: Grimm9022a580 bio: - first_name: Robert15afecc0 - updated_at: 2010-11-21 20:59:31 Z + first_name: Robert90a17091 + updated_at: 2010-11-22 03:47:14 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 57 - url: http://google-15e4dcce.com/ + - 1 + - 102 + url: http://google-906f1a56.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id005 - diaspora_handle: bob153294cf@example.org + diaspora_handle: bob891c6e6f@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$N6JIFgfjViHJAcWtG2YQC.TOolkbrdO5Y2J3/PCj29bgjslLOrjwC + encrypted_password: $2a$10$pqsUJQNYI3ZQZMVjCeQxUujkEjM.SK/eycusqgldoI5Axy51.8VIO serialized_private_key: *id002 pending_request_ids: [] @@ -383,36 +383,36 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 58 + - 1 + - 103 last_sign_in_at: - username: bob1611da99 + username: bob9060af06 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$N6JIFgfjViHJAcWtG2YQC. + password_salt: $2a$10$pqsUJQNYI3ZQZMVjCeQxUu remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob1615e72d@pivotallabs.com + email: bob91f066ea@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:31 Z + created_at: 2010-11-22 03:47:14 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -420,49 +420,49 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 59 + - 1 + - 104 gender: diaspora_handle: birthday: - last_name: Grimm16e69a98 + last_name: Grimm91ba9e79 bio: - first_name: Robert164238f8 - updated_at: 2010-11-21 20:59:31 Z + first_name: Robert91f609c0 + updated_at: 2010-11-22 03:47:14 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 60 - url: http://google-1698244c.com/ + - 1 + - 105 + url: http://google-9118f021.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id006 - diaspora_handle: bob1611da99@example.org + diaspora_handle: bob9060af06@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$xDVDnzOFGdpQsoCmieXF/OVHWomTOVKsvfUKwz2FZpto5kGDiAhlG + encrypted_password: $2a$10$Aaxyu94Bz1tu5/cpeyirv.yzGQYvo5SBHkklFSSXSovTXRN2ewB3C serialized_private_key: *id002 pending_request_ids: [] @@ -472,36 +472,36 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 194 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 61 + - 1 + - 106 last_sign_in_at: - username: bob1711675c + username: bob91a00016 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$xDVDnzOFGdpQsoCmieXF/O + password_salt: $2a$10$Aaxyu94Bz1tu5/cpeyirv. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob17688084@pivotallabs.com + email: bob92c96fe3@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:31 Z + created_at: 2010-11-22 03:47:15 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -509,49 +509,49 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 62 + - 1 + - 107 gender: diaspora_handle: birthday: - last_name: Grimm1747be76 + last_name: Grimm92330aa8 bio: - first_name: Robert172f9dab - updated_at: 2010-11-21 20:59:31 Z + first_name: Robert92c217df + updated_at: 2010-11-22 03:47:15 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 63 - url: http://google-17251542.com/ + - 1 + - 108 + url: http://google-9215faa5.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id007 - diaspora_handle: bob1711675c@example.org + diaspora_handle: bob91a00016@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$GWLRsJBJ7.AKxwoViufIguuCJLdI4zWrrJlb.nDfUM9qO2BC0tAOK + encrypted_password: $2a$10$jaU4ODzu.lOQ9toYUsfubee.PsDSc3396baQOGO8pxobA9cX4bB5K serialized_private_key: *id002 pending_request_ids: [] @@ -561,36 +561,36 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 64 + - 1 + - 109 last_sign_in_at: - username: bob18b30703 + username: bob92c4057e language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$GWLRsJBJ7.AKxwoViufIgu + password_salt: $2a$10$jaU4ODzu.lOQ9toYUsfube remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob187c3fa8@pivotallabs.com + email: bob93c26ce7@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:31 Z + created_at: 2010-11-22 03:47:15 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -598,49 +598,49 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 65 + - 1 + - 110 gender: diaspora_handle: birthday: - last_name: Grimm189ec926 + last_name: Grimm939ae678 bio: - first_name: Robert18275060 - updated_at: 2010-11-21 20:59:31 Z + first_name: Robert93c20f26 + updated_at: 2010-11-22 03:47:15 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 66 - url: http://google-1824b64a.com/ + - 1 + - 111 + url: http://google-93028c79.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id008 - diaspora_handle: bob18b30703@example.org + diaspora_handle: bob92c4057e@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$Ws8sjGa9WfZrsOuPMoxZNevQaDvNyR.BEagnCx2kiE5CU.C8ANNby + encrypted_password: $2a$10$v7cE3lFbCnvPsLQaUaHw9OEgQl/rmQv7N1AnjRXAOASCQIb6tzBOC serialized_private_key: *id002 pending_request_ids: [] @@ -650,36 +650,36 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 67 + - 1 + - 112 last_sign_in_at: - username: bob19274a39 + username: bob93fc55c3 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$Ws8sjGa9WfZrsOuPMoxZNe + password_salt: $2a$10$v7cE3lFbCnvPsLQaUaHw9O remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob1941b436@pivotallabs.com + email: bob9442a56e@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:31 Z + created_at: 2010-11-22 03:47:15 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -687,49 +687,49 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 68 + - 1 + - 113 gender: diaspora_handle: birthday: - last_name: Grimm19294374 + last_name: Grimm945929b6 bio: - first_name: Robert1948b9dc - updated_at: 2010-11-21 20:59:31 Z + first_name: Robert94fd494d + updated_at: 2010-11-22 03:47:15 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 + - 0 + - 1 - 114 - - 136 - - 0 - - 0 - - 69 - url: http://google-193407c8.com/ + url: http://google-94c55db3.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id009 - diaspora_handle: bob19274a39@example.org + diaspora_handle: bob93fc55c3@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$HZyMwEmlq31m/cDktb690.VN/G69b.KIXioAEBuBZEi9lwRo/2lie + encrypted_password: $2a$10$kXrZnHd9fvJHZwXGH1t5s.iSskxa/3sObpmYbSC7r/UVl4VtPFQEi serialized_private_key: *id002 pending_request_ids: [] @@ -739,36 +739,36 @@ data: - 76 - 233 - - 136 - - 51 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 70 + - 1 + - 115 last_sign_in_at: - username: bob20db11e4 + username: bob94793fca language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$HZyMwEmlq31m/cDktb690. + password_salt: $2a$10$kXrZnHd9fvJHZwXGH1t5s. remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob205cfde2@pivotallabs.com + email: bob95e56c75@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:32 Z + created_at: 2010-11-22 03:47:15 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -776,49 +776,49 @@ data: - 76 - 233 - - 136 - - 52 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 71 + - 1 + - 116 gender: diaspora_handle: birthday: - last_name: Grimm2065ef26 + last_name: Grimm95ddf1a9 bio: - first_name: Robert2097b0f3 - updated_at: 2010-11-21 20:59:32 Z + first_name: Robert95a6b8e0 + updated_at: 2010-11-22 03:47:15 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 52 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 72 - url: http://google-20cdae78.com/ + - 1 + - 117 + url: http://google-95ee0209.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id010 - diaspora_handle: bob20db11e4@example.org + diaspora_handle: bob94793fca@example.org - :user: !map:ActiveSupport::HashWithIndifferentAccess - encrypted_password: $2a$10$dNCuwSFV2CXRQZgNGjAk/eOQIKkltC7S2CU0lbUUK6jcrIRPUbRvm + encrypted_password: $2a$10$hWug/r1Lawa3uda48rv8Recgbds9MbmJOheXReIU6uodKEx.XQGpu serialized_private_key: *id002 pending_request_ids: [] @@ -828,36 +828,36 @@ data: - 76 - 233 - - 136 - - 52 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 195 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 73 + - 1 + - 118 last_sign_in_at: - username: bob21220792 + username: bob95282ef6 language: en sign_in_count: 0 visible_person_ids: [] - password_salt: $2a$10$dNCuwSFV2CXRQZgNGjAk/e + password_salt: $2a$10$hWug/r1Lawa3uda48rv8Re remember_token: reset_password_token: current_sign_in_ip: remember_created_at: current_sign_in_at: invitation_sent_at: - email: bob21b4a0c4@pivotallabs.com + email: bob968d7231@pivotallabs.com invitation_token: visible_post_ids: [] getting_started: true :person: !map:ActiveSupport::HashWithIndifferentAccess - created_at: 2010-11-21 20:59:32 Z + created_at: 2010-11-22 03:47:16 Z profile: !map:ActiveSupport::HashWithIndifferentAccess searchable: true image_url: @@ -865,44 +865,44 @@ data: - 76 - 233 - - 136 - - 52 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 196 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 74 + - 1 + - 119 gender: diaspora_handle: birthday: - last_name: Grimm213837ed + last_name: Grimm961816cb bio: - first_name: Robert21b6b6b7 - updated_at: 2010-11-21 20:59:32 Z + first_name: Robert9672d3dd + updated_at: 2010-11-22 03:47:16 Z _id: !ruby/object:BSON::ObjectId data: - 76 - 233 - - 136 - - 52 - - 82 - - 222 - - 181 - - 114 - - 136 + - 231 + - 196 + - 35 + - 103 + - 188 + - 118 + - 219 - 0 - - 0 - - 75 - url: http://google-2198a596.com/ + - 1 + - 120 + url: http://google-962d56fe.com/ serialized_public_key: | -----BEGIN RSA PUBLIC KEY----- - MIGJAoGBALSZ3Y/j1TBayTKn33HRLZEg1E98ah7TTp6gRuUNnBdYdnQjsMGdkS2H - 4vSc2Rq4qXUFGGsxWdETRAzsuBgNBcLoAfNMb0BuvYoxyfC1SytzLxO8j52AKw8Q - qDXLYt8kRtTFxJk1H+jtC/1pd67JEUM0edXL5BcPCufzQ7FiMdWtAgMBAAE= + MIGJAoGBAKa40Wwc3BUcrCxAxuqqdKTJeuZd36IUOpg4xfRbFMZ6w8XovZS9nOrb + Wiaf3q/ofvTQ1FN+529fOdlrVzzaLvIm4OPhZ5jMrEeLFU9b69EcNsb471hAttip + TYbYiWZa0s1h/LfgyBL1pv9TgfOqyo+uHQPMVu6c1V4l4FuyEYDNAgMBAAE= -----END RSA PUBLIC KEY----- owner_id: *id011 - diaspora_handle: bob21220792@example.org + diaspora_handle: bob95282ef6@example.org diff --git a/spec/helpers/mobile_helper_spec.rb b/spec/helpers/mobile_helper_spec.rb new file mode 100644 index 000000000..beea646c1 --- /dev/null +++ b/spec/helpers/mobile_helper_spec.rb @@ -0,0 +1,19 @@ +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3 or later. See +# the COPYRIGHT file. + +require 'spec_helper' + +describe MobileHelper do + + describe "#aspect_select_options" do + it "adds an all option to the list of aspects" do + # options_from_collection_for_select(@aspects, "id", "name", @aspect.id) + + n = Factory(:aspect) + + options = aspect_select_options([n], n).split('\n') + options.first.should =~ /All/ + end + end +end \ No newline at end of file diff --git a/spec/javascripts/mobile-interface-spec.js b/spec/javascripts/mobile-interface-spec.js new file mode 100644 index 000000000..b8b39e4d0 --- /dev/null +++ b/spec/javascripts/mobile-interface-spec.js @@ -0,0 +1,24 @@ +describe("mobile interface", function() { + describe("initialize", function() { + it("attaches a change event to the select box", function() { + spyOn($.fn, 'change'); + Mobile.initialize(); + expect($.fn.change).toHaveBeenCalledWith(Mobile.changeAspect); + expect($.fn.change.mostRecentCall.object.selector).toEqual("#aspect_picker"); + }); + }); + + + describe("change", function() { + it("changes to the aspect show page", function() { + $('#jasmine_content').html( +''); + spyOn(Mobile, "windowLocation"); + $.proxy(Mobile.changeAspect, $('#aspect_picker > option').first())() + expect(Mobile.windowLocation).toHaveBeenCalledWith("/aspects/family-aspect-id"); + }); + }); +}); \ No newline at end of file diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 594846b2d..0b4956875 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -14,6 +14,7 @@ src_files: - public/javascripts/vendor/jquery144.js - public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js - public/javascripts/vendor/jquery.tipsy.js + - public/javascripts/mobile.js - public/javascripts/aspect-edit.js - public/javascripts/web-socket-receiver.js