family_gallery 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8724caad748ce58f6c7dde4e0e79bc8c39d25303
-  data.tar.gz: 2c2270ccb9d673b54191697519dca7e0447e1960
+  metadata.gz: f54d51acc3c9818bb3952dc9a7533258cea306a8
+  data.tar.gz: d86cf21b39ad34da582bd1bd63d8958d1cbfd66f
 SHA512:
-  metadata.gz: ed25ed2d0f42742babbb0b183880e7dac7f24817ce4b089847bd2ce4a6fe13413f84de403c4d7c82fcf6c482e02903acec737e16347567dc5b67e24e5e33e54f
-  data.tar.gz: 6285dc6ede7d7d140f67669869e3effaab1c16346eb4ee23a8a767b5787f6cbfa0f24466d6b030edee39563fca0a4515ba86796a78d4376b0de849781dc4cc59
+  metadata.gz: fa8f8f65053d222864b5c2b87ec45bd5bd265e6aa3604c0aa16809ce81b5d7d668b1d3d889fe935c15c7e383e831c185d8373c39430452e7c65edd57846e6468
+  data.tar.gz: 158dfe4afbf4df466aa741f595dac7ef3360d951bf2d1802801460f9100a9e45eda73f26977b4abfd74d3ac572bacd67f73ea1413ecbdcb97e1166dedf359dc3

data/app/assets/javascripts/family_gallery/application_mobile.js.coffee

@@ -0,0 +1 @@
+#= require light_mobile/menu

data/app/assets/stylesheets/family_gallery/application_mobile.css.scss

@@ -0,0 +1,6 @@
+/*
+ *= require light_mobile/buttons
+ *= require light_mobile/menu
+ *= require light_mobile/simple_form
+ *= require light_mobile/tables
+*/

data/app/controllers/family_gallery/base_controller.rb

@@ -1,6 +1,9 @@
 class FamilyGallery::BaseController < ActionController::Base
   layout "family_gallery/application"
+
+  include AwesomeTranslations::ControllerTranslateFunctionality
   include FamilyGallery::BaseFamilyGalleryController
+  include LightMobile::DynamicRenderer
 
   before_filter :set_locale
 

data/app/controllers/family_gallery/locales_controller.rb

@@ -1,8 +1,14 @@
 class FamilyGallery::LocalesController < FamilyGallery::BaseController
+  def new
+  end
+
   def create
     I18n.locale = params[:locale]
     session[:locale] = I18n.locale
 
-    render json: {success: true}
+    respond_to do |format|
+      format.html { redirect_to root_url }
+      format.json { render json: {success: true} }
+    end
   end
 end

data/app/controllers/family_gallery/pictures_controller.rb

@@ -2,7 +2,12 @@ class FamilyGallery::PicturesController < FamilyGallery::ResourcesController
   before_filter :set_group
 
   def show
-    @width = 800
+    if view_context.agent_mobile?
+      @width = 400
+    else
+      @width = 800
+    end
+
     @height = @picture.height_for_width(@width)
 
     if @group

data/app/controllers/family_gallery/resources_controller.rb

@@ -25,7 +25,7 @@ class FamilyGallery::ResourcesController < FamilyGallery::BaseController
     assign_params_to_resource_instance
 
     if resource_instance.save
-      flash[:notice] = t(".resource_was_saved")
+      flash[:notice] = controller_t(".resource_was_saved")
       redirect_to resource_instance
     else
       render :new
@@ -43,7 +43,7 @@ class FamilyGallery::ResourcesController < FamilyGallery::BaseController
     assign_params_to_resource_instance
 
     if resource_instance.save
-      flash[:notice] = t(".resource_was_updated")
+      flash[:notice] = controller_t(".resource_was_updated")
       redirect_to resource_instance
     else
       render :edit
@@ -52,7 +52,7 @@ class FamilyGallery::ResourcesController < FamilyGallery::BaseController
 
   def destroy
     if resource_instance.destroy
-      flash[:notice] = t(".resource_was_deleted")
+      flash[:notice] = controller_t(".resource_was_deleted")
       redirect_to root_url
     else
       flash[:error] = resource_instance.errors.full_messages.join(". ")

data/app/controllers/family_gallery/user_taggings_controller.rb

@@ -26,8 +26,14 @@ private
 
   def set_picture
     @picture = FamilyGallery::Picture.find(params[:picture_id])
-    @width = 1000
-    @height = @picture.height_for_width(1000)
+
+    if view_context.agent_mobile?
+      @width = 300
+    else
+      @width = 1000
+    end
+
+    @height = @picture.height_for_width(@width)
 
     if action_name == "create"
       @user_tagging = @picture.user_taggings.new

data/app/helpers/family_gallery/layout_helper.rb

@@ -1,4 +1,6 @@
 module FamilyGallery::LayoutHelper
+  include LightMobile::ApplicationHelper
+
   def header_title
     @header_title ||= content_for(:header_title).to_s
   end

data/app/models/family_gallery/picture.rb

@@ -12,7 +12,7 @@ class FamilyGallery::Picture < ActiveRecord::Base
   has_attached_file :image, style: {medium: "900x900", thumb: "120x120"}
   validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/
 
-  validates_presence_of :user_owner
+  validates_presence_of :user_owner, :image
 
   after_create :parse_exif
 

data/app/views/family_gallery/groups/_form.mobile.haml

@@ -0,0 +1,4 @@
+= simple_form_for group do |f|
+  = f.input :name, autofocus: true
+  = f.input :description
+  = f.submit

data/app/views/family_gallery/groups/edit.mobile.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t(".edit_group", name: @group.name) }
+
+= render "form", group: @group

data/app/views/family_gallery/groups/index.mobile.haml

@@ -0,0 +1,16 @@
+- content_for(:header_title) { FamilyGallery::Group.model_name.human(count: 2) }
+
+- if can? :new, FamilyGallery::Group
+  - content_for(:header_right) { link_to t("add_new"), new_group_path, class: "mobile-button-header" }
+
+%table.mobile-table.list
+  %thead
+    %tr
+      %th= sort_link @ransack, :name
+  %tbody
+    - @groups.each do |group|
+      %tr
+        %td= link_to_group group
+    - unless @groups.any?
+      %tr
+        %td.error{colspan: 1}= t("no_results")

data/app/views/family_gallery/groups/new.mobile.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t(".new_group") }
+
+= render "form", group: @group

data/app/views/family_gallery/groups/show.mobile.haml

@@ -0,0 +1,28 @@
+- content_for(:header_title) { t(".show_group", name: @group.name) }
+
+- if can? :edit, @group
+  - content_for(:header_right) { link_to t("edit"), edit_group_path(@group), class: "mobile-button-header"  }
+
+.actions
+  = link_to t(".new_picture"), new_picture_path(group_id: @group.id), class: "mobile-button" if can? :new, FamilyGallery::Picture
+  = link_to t('.upload_multiple'), new_group_multiple_picture_path(@group), class: 'mobile-button' if can? :new, FamilyGallery::Picture
+
+%table.mobile-table.form
+  %tbody
+    %tr
+      %td= FamilyGallery::Group.human_attribute_name(:name)
+      %td= @group.name
+    %tr
+      %td= FamilyGallery::Group.human_attribute_name(:description)
+      %td= simple_format @group.description, nil, wrapper_tag: "div"
+
+%h2= FamilyGallery::Picture.model_name.human(count: 2)
+%table.mobile-table.list
+  %tbody
+    - groups_of_pictures do |pictures|
+      %tr
+        - pictures.each do |picture|
+          %td= picture_image_tag(picture, width: 100)
+    - unless @group.pictures.any?
+      %tr
+        %td{colspan: 1}= t("no_results")

data/app/views/family_gallery/locales/new.mobile.haml

@@ -0,0 +1,5 @@
+- content_for(:header_title) { t('.language') }
+
+= simple_form_for :locales, url: locales_path do |f|
+  = f.input :locale, collection: I18n.available_locales, label: t('.language'), selected: I18n.locale, input_html: {name: 'locale'}
+  = f.submit t('save')

data/app/views/family_gallery/multiple_pictures/new.mobile.haml

@@ -0,0 +1,5 @@
+- content_for(:header_title) { t(".upload_multiple_pictures") }
+
+= simple_form_for :multiple_pictures, url: group_multiple_pictures_path(@group) do |f|
+  = f.input :files, as: :file, input_html: {multiple: true}
+  = f.submit t("save"), class: "button"

data/app/views/family_gallery/pictures/_form.mobile.haml

@@ -0,0 +1,8 @@
+= simple_form_for picture do |f|
+  = hidden_field_tag :group_id, params[:group_id] if params[:group_id].present?
+  = f.input :title, autofocus: true
+  = f.input :description
+  = f.input :image
+  = f.submit
+
+  = link_to t("delete"), picture, class: "mobile-button-danger", method: :delete, data: {confirm: t("are_you_sure")}  unless picture.new_record?

data/app/views/family_gallery/pictures/new.mobile.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t(".add_new_picture") }
+
+= render "form", picture: @picture

data/app/views/family_gallery/pictures/show.mobile.haml

@@ -0,0 +1,62 @@
+- content_for(:header_title) { t(".show_picture", title: @picture.title) }
+
+- if can? :edit, @picture
+  - content_for(:header_right) { link_to t("edit"), edit_picture_path(@picture), class: "mobile-button-header" }
+
+.actions
+  = link_to t(".add_tagging"), new_picture_user_tagging_path(@picture), class: "mobile-button" if can? :new, FamilyGallery::UserTagging
+
+- if @picture.groups.any?
+  %table.mobile-table.list
+    %tbody
+      %tr
+        %td= FamilyGallery::Picture.human_attribute_name(:user_owner)
+        %td= link_to_user @picture.user_owner
+      %tr
+        %td= FamilyGallery::Picture.human_attribute_name(:user_uploaded)
+        %td= link_to_user @picture.user_uploaded
+
+      - if @picture.taken_at?
+        %tr
+          %td= FamilyGallery::Picture.human_attribute_name(:taken_at)
+          %td= l(@picture.taken_at, format: :long)
+
+      - @picture.groups.each do |group|
+        %tr
+          %td= FamilyGallery::Group.model_name.human
+          %td= link_to_group group
+
+%center
+  %table.navigation-links{width: "#{@width}px;"}
+    %tbody
+      %tr
+        %td.previous= link_to t(".previous"), [@group, @previous_picture] if @previous_picture
+        %td.next= link_to t(".next"), [@group, @next_picture] if @next_picture
+  .picture-container{style: "width: #{@width}px; height: #{@height}px; background-size: #{@width}px #{@picture.height_for_width(@width)}px; background-image: url('#{@picture.image.url}');"}
+    - @picture.user_taggings.joins(:user).each do |user_tagging|
+      .tagged-user{class: "tagged-user-#{user_tagging.user.id}", style: "left: #{user_tagging.left_for_width(@width) - 50}px; top: #{user_tagging.top_for_height(@height) - 50}px;"}
+
+%h2= t(".tagged_users")
+.tagged-users-list
+  %table.mobile-table.list
+    %thead
+      %tr
+        %th= FamilyGallery::UserTagging.human_attribute_name(:user)
+        %th= t("actions")
+    %tbody
+      - @picture.user_taggings.joins(:user).ordered.each do |user_tagging|
+        %tr
+          %td= link_to_user user_tagging.user
+          %td
+            = link_to t("remove"), picture_user_tagging_path(@picture, user_tagging), method: :delete, data: {confirm: t("are_you_sure")} if can? :destroy, user_tagging
+
+      - unless @picture.tagged_users.any?
+        %tr
+          %td{colspan: 2}= t(".no_users_was_tagged")
+
+- if @picture.location?
+  - content_for(:header_tag) do
+    %script{src: "https://maps.googleapis.com/maps/api/js?v=3.exp"}
+
+  %h1= t(".google_map")
+  #map-canvas{data: {latitude: @picture.latitude, longitude: @picture.longitude}}

data/app/views/family_gallery/user_roles/_form.mobile.haml

@@ -0,0 +1,3 @@
+= simple_form_for [user, user_role] do |f|
+  = f.input :role, collection: FamilyGallery::UserRole.role_options
+  = f.submit

data/app/views/family_gallery/user_roles/new.mobile.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t('.new_user_role_for', user_name: @user.name) }
+
+= render 'form', user: @user, user_role: @user_role

data/app/views/family_gallery/user_taggings/_form.mobile.haml

@@ -0,0 +1,9 @@
+= simple_form_for [@picture, @user_tagging] do |f|
+  = f.association :user, collection: FamilyGallery::User.order(:email)
+  = f.input :position_top, as: :hidden
+  = f.input :position_left, as: :hidden
+  = f.submit t("save"), class: "button"
+
+.picture-container
+  .tagging-marker
+  .picture{style: "background-image: url('#{@picture.image.url}'); width: #{@width}px; height: #{@height}px; background-size: #{@width}px #{@height}px;", data: {width: @width, height: @height}}

data/app/views/family_gallery/user_taggings/new.mobile.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t(".new_user_tagging") }
+
+= render "form", user_tagging: @user_tagging

data/app/views/family_gallery/users/_form.mobile.haml

@@ -0,0 +1,6 @@
+= simple_form_for user do |f|
+  = f.input :first_name, autofocus: true
+  = f.input :last_name
+  = f.input :email
+  = f.input :password
+  = f.submit

data/app/views/family_gallery/users/edit.mobile.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t(".edit_user", name: @user.name) }
+
+= render "form", user: @user

data/app/views/family_gallery/users/index.mobile.haml

@@ -0,0 +1,22 @@
+- content_for(:header_title) { FamilyGallery::User.model_name.human(count: 2) }
+
+- if can? :new, FamilyGallery::User
+  - content_for(:header_right) { link_to t("add_new"), new_user_path, class: "mobile-button-header" }
+
+%table.mobile-table.list
+  %thead
+    %tr
+      %th= sort_link @ransack, :first_name
+      %th= sort_link @ransack, :last_name
+      %th= sort_link @ransack, :email
+  %tbody
+    - @users.each do |user|
+      %tr
+        %td= link_to_user user, title: user.first_name
+        %td= link_to_user user, title: user.last_name
+        %td= mail_to user.email
+    - unless @users.any?
+      %tr
+        %td{colspan: 3}= t(".no_users_were_found")
+
+= will_paginate @users

data/app/views/family_gallery/users/new.mobile.haml

@@ -0,0 +1,3 @@
+- content_for(:header_title) { t(".new_user") }
+
+= render "form", user: @user

data/app/views/family_gallery/users/show.html.haml

@@ -1,5 +1,8 @@
 - content_for(:header_title) { t(".show_user", user_name: @user.name) }
 
+= link_to t('edit'), edit_user_path(@user), class: 'button' if can? :edit, @user
+= link_to t('delete'), user_path(@user), method: :delete, class: 'button-danger', data: {confirm: t('are_you_sure')} if can? :destroy, @user
+
 %h2= t(".tagged_on")
 - @user.pictures_tagged_on.each do |picture|
   = picture_image_tag picture

data/app/views/family_gallery/users/show.mobile.haml

@@ -0,0 +1,41 @@
+- content_for(:header_title) { t(".show_user", user_name: @user.name) }
+
+- if can? :edit, @user
+  - content_for(:header_right) { link_to t('edit'), edit_user_path(@user), class: 'mobile-button-header' }
+
+= link_to t('delete'), user_path(@user), method: :delete, class: 'mobile-button-danger', data: {confirm: t('are_you_sure')} if can? :destroy, @user
+
+%h2= t(".tagged_on")
+- @user.pictures_tagged_on.each do |picture|
+  = picture_image_tag picture
+
+- unless @user.pictures_tagged_on.any?
+  = t(".user_hasnt_been_tagged_on_any_pictures")
+
+%h2= t(".uploaded_pictures")
+- @user.uploaded_pictures.each do |picture|
+  = picture_image_tag picture
+
+- unless @user.uploaded_pictures.any?
+  = t(".this_user_havent_uploaded_any_pictures")
+
+%h2= FamilyGallery::UserRole.model_name.human(count: 2)
+= link_to t('add_new'), new_user_user_role_path(@user), class: 'mobile-button' if can?(:new, FamilyGallery::UserRole)
+
+%br
+%br
+
+%table.mobile-table
+  %thead
+    %tr
+      %th= FamilyGallery::UserRole.human_attribute_name(:role)
+      %th= t('actions')
+  %tbody
+    - @user.user_roles.each do |user_role|
+      %tr
+        %td= user_role.role
+        %td
+          = link_to t('delete'), user_user_role_path(@user, user_role), method: :delete, data: {confirm: t('are_you_sure')} if can?(:destroy, user_role)
+    - if @user.user_roles.empty?
+      %tr
+        %td{colspan: 1}= t('no_results')

data/app/views/family_gallery/welcome/index.mobile.haml

@@ -0,0 +1,10 @@
+- content_for(:header_title) { t(".welcome") }
+
+- if @groups.any?
+  %h2= t(".latest_updated_groups")
+  - @groups.each do |group|
+    %h3= link_to_group group
+    - group.pictures.order(:updated_at).reverse_order.each do |picture|
+      = picture_image_tag picture, group: group, width: 100
+- else
+  = t(".no_groups_has_been_created_yet")

data/app/views/layouts/family_gallery/application.mobile.haml

@@ -0,0 +1,17 @@
+- content_for :menu_items do
+  .menu_item= link_to t(".frontpage"), root_path
+  .menu_item= link_to FamilyGallery::Group.model_name.human(count: 2), groups_path if can? :index, FamilyGallery::Group
+  .menu_item= link_to t(".translations"), awesome_translations_path if Rails.env.development?
+  .menu_item= link_to FamilyGallery::User.model_name.human(count: 2), users_path if can? :index, FamilyGallery::User
+  .menu_item= link_to t(".language"), new_locale_path
+  .menu_item
+    - if signed_in?
+      = link_to t(".sign_out"), destroy_family_gallery_user_session_path, method: :delete
+    - else
+      = link_to t(".sign_in"), new_family_gallery_user_session_path
+
+- content_for :head do
+  = stylesheet_link_tag "family_gallery/application_mobile"
+  = javascript_include_tag "family_gallery/application_mobile"
+
+= render "layouts/light_mobile_basic_layout"

data/config/locales/awesome_translations/app/controllers/family_gallery/resources_controller/da.yml

@@ -0,0 +1,7 @@
+---
+da:
+  family_gallery:
+    resources:
+      resource_was_saved: Resource blev gemt
+      resource_was_updated: Resource blev opdateret
+      resource_was_deleted: Resource blev slettet