family_gallery 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c0597e63e2ca90cba1d5f2078f52336b887ec2
-  data.tar.gz: bec42ea9a44ef8562eb5f5aabd7ce4f3d4ef20f8
+  metadata.gz: 601cdfd46f3c826e859d3e4c90b20c2627876409
+  data.tar.gz: 5e371952631a3cb511b4b3c404e3ee7b620835e0
 SHA512:
-  metadata.gz: dcdd1bd22b8199a3d71dad9f06da9ec2dd43ce8a5c75cd3bad57c0a93417b3c4f6cd770b6206316f2acc888c7d4ee7933c078ad432ec6e47e83d52981c09cc93
-  data.tar.gz: cf51968651566a62afb07959c27f0a14916fcd1913baf5c48495d6d8a80ae43361567890d394aa0aea2eb7bdb9452cbc8f8cbae4c740b060f1c8ba0084276735
+  metadata.gz: 8d245e72706ba199f5bdd8815906e7d5498e6288f3f72fac7ed3d58e3a79c218317598287e9e378551edf86397aca8a1aead73b683bf2b09a92c3673ab3196cf
+  data.tar.gz: 0c5fab8e0f6b39af552fa3836be2339d8c07ca18a045b29d5d3bffd45bce5223ee6567e50f991684835d7190645368f683efba6da7bfd8a140edf5060152142c

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

@@ -2,6 +2,7 @@ $ ->
   return if $("body.controller_pictures").length == 0
 
   if $("body.action_show").length > 0
+    # Makes the markers of the tagged users appear / disappear.
     $(".tagged-users-list .link-to-user").hover ->
       user_link = $(this)
       user_id = user_link.data("user-id")
@@ -14,3 +15,28 @@ $ ->
 
       tagged_user = $(".tagged-user-" + user_id)
       tagged_user.fadeOut("fast")
+
+    # Inits the Google Map for the location.
+    map_container = $("#map-canvas")
+
+    if map_container.length > 0
+      init_map = ->
+        latitude = parseFloat(map_container.data("latitude"))
+        longitude = parseFloat(map_container.data("longitude"))
+
+        position_latlng = new google.maps.LatLng(latitude, longitude)
+
+        map_options = {
+          zoom: 10,
+          center: position_latlng,
+          mapTypeId: google.maps.MapTypeId.ROADMAP
+        }
+
+        google_map = new google.maps.Map(document.getElementById('map-canvas'), map_options)
+
+        marker = new google.maps.Marker(
+          position: position_latlng,
+          map: google_map
+        )
+
+      google.maps.event.addDomListener(window, "load", init_map)

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

@@ -23,6 +23,11 @@ body.controller_pictures {
         text-align: right;
       }
     }
+
+    #map-canvas {
+      width: 100%;
+      height: 400px;
+    }
   }
 }
 

data/app/controllers/family_gallery/base_controller.rb

@@ -7,6 +7,8 @@ class FamilyGallery::BaseController < ActionController::Base
 private
 
   def set_locale
+    session[:locale] ||= I18n.default_locale
+
     if session[:locale]
       I18n.locale = session[:locale]
     end

data/app/controllers/family_gallery/multiple_pictures_controller.rb

@@ -0,0 +1,28 @@
+class FamilyGallery::MultiplePicturesController < FamilyGallery::BaseController
+  before_filter :set_group_and_auth
+
+  def new
+  end
+
+  def create
+    picture_params[:files].each do |file|
+      picture = FamilyGallery::Picture.new
+      picture.groups << @group
+      picture.image = file
+      picture.save!
+    end
+
+    redirect_to @group
+  end
+
+private
+
+  def set_group_and_auth
+    @group = FamilyGallery::Group.find(params[:group_id])
+    authorize! :create, FamilyGallery::Picture.new(groups: [@group])
+  end
+
+  def picture_params
+    params.require(:multiple_pictures).permit(files: [])
+  end
+end

data/app/controllers/family_gallery/resources_controller.rb

@@ -12,6 +12,9 @@ class FamilyGallery::ResourcesController < FamilyGallery::BaseController
 
   def index
     @ransack = resource_class.ransack(params[:q])
+
+    resources = @ransack.result.page(params[:page])
+    instance_variable_set("@#{resource_plural_name}", resources)
   end
 
   def new
@@ -71,6 +74,10 @@ private
     @resource_instance
   end
 
+  def resource_plural_name
+    resource_class.name.match(/::(.+?)$/)[1].tableize.pluralize
+  end
+
   def resource_extracted_params
     key_name = StringCases.camel_to_snake(resource_name)
     return params[key_name]

data/app/controllers/family_gallery/users_controller.rb

@@ -1,4 +1,10 @@
 class FamilyGallery::UsersController < FamilyGallery::ResourcesController
   def show
   end
+
+private
+
+  def resource_params
+    params.require(:user).permit(:first_name, :last_name, :email)
+  end
 end

data/app/helpers/family_gallery/users_helper.rb

@@ -1,5 +1,13 @@
 module FamilyGallery::UsersHelper
-  def link_to_user(user)
-    link_to user.name, user, class: "link-to-user", data: {user_id: user.id}
+  def link_to_user(user, args = {})
+    return "[#{t('.no_user')}]" unless user
+
+    if args[:title].present?
+      title = args[:title]
+    else
+      title = user.name
+    end
+
+    link_to title, user, class: "link-to-user", data: {user_id: user.id}
   end
 end

data/app/models/family_gallery/ability.rb

@@ -4,6 +4,8 @@ class FamilyGallery::Ability
   def initialize(user)
     @user = user
 
+    can :index, FamilyGallery::Group
+
     if @user
       @user.user_roles.each do |user_role|
         __send__(user_role.role)

data/app/models/family_gallery/picture.rb

@@ -45,6 +45,10 @@ class FamilyGallery::Picture < ActiveRecord::Base
       .first
   end
 
+  def location?
+    latitude? && longitude?
+  end
+
 private
 
   def parse_exif

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

@@ -1,6 +1,8 @@
 - content_for(:header_title) { FamilyGallery::Group.model_name.human(count: 2) }
 
-= link_to t("add_new"), new_group_path
+- if can? :new, FamilyGallery::Group
+  .actions
+    = link_to t("add_new"), new_group_path, class: "button"
 
 %table.list
   %thead

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

@@ -3,6 +3,7 @@
 .actions
   = link_to t(".edit_group"), edit_group_path(@group), class: "button" if can? :edit, @group
   = link_to t(".new_picture"), new_picture_path(group_id: @group.id), class: "button" if can? :new, FamilyGallery::Picture
+  = link_to t('.upload_multiple'), new_group_multiple_picture_path(@group), class: 'button' if can? :new, FamilyGallery::Picture
 
 %table.form
   %tbody

data/app/views/family_gallery/multiple_pictures/new.html.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.html.haml

@@ -2,7 +2,7 @@
   = 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.input :image, input_html: {multiple: true}
   = f.submit t("save"), class: "button"
 
   = link_to t("delete"), picture, class: "button-danger", method: :delete, data: {confirm: t("are_you_sure")}  unless picture.new_record?

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

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

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

@@ -13,6 +13,12 @@
       %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
@@ -45,3 +51,10 @@
       - 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/users/_form.html.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 t("save"), class: "button"

data/app/views/family_gallery/users/edit.html.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.html.haml

@@ -0,0 +1,22 @@
+- content_for(:header_title) { FamilyGallery::User.model_name.human(count: 2) }
+
+.actions
+  = link_to t("add_new"), new_user_path, class: "button" if can? :new, FamilyGallery::User
+
+%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.html.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

@@ -10,3 +10,6 @@
 %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")

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

@@ -10,6 +10,8 @@
     = javascript_include_tag "family_gallery/application"
 
     = csrf_meta_tags
+
+    = yield(:header_tag)
   %body{class: ["controller_#{controller_name}", "action_#{action_name}"]}
     %center
       %table.main
@@ -21,6 +23,7 @@
               = link_to t(".frontpage"), root_path
               = link_to FamilyGallery::Group.model_name.human(count: 2), groups_path if can? :index, FamilyGallery::Group
               = link_to t(".translations"), awesome_translations_path if Rails.env.development?
+              = link_to FamilyGallery::User.model_name.human(count: 2), users_path if can? :index, FamilyGallery::User
 
               - if signed_in?
                 = link_to t(".sign_out"), destroy_family_gallery_user_session_path, method: :delete

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

@@ -0,0 +1,6 @@
+---
+da:
+  controllers:
+    family_gallery:
+      user_taggings_controller:
+        tagging_was_saved: Tagging blev gemt

data/config/locales/awesome_translations/app/controllers/family_gallery/en.yml

@@ -0,0 +1,6 @@
+---
+en:
+  controllers:
+    family_gallery:
+      user_taggings_controller:
+        tagging_was_saved: Tagging was saved

data/config/locales/awesome_translations/app/views/family_gallery/groups/da.yml

@@ -6,5 +6,6 @@ da:
         show_group: Vis gruppe
         edit_group: Rediger gruppe
         new_picture: Nyt billede
+        upload_multiple: Upload flere
       new:
         new_group: Ny gruppe

data/config/locales/awesome_translations/app/views/family_gallery/groups/en.yml

@@ -6,5 +6,6 @@ en:
         show_group: Show group
         edit_group: Edit group
         new_picture: New picture
+        upload_multiple: Upload multiple
       new:
         new_group: New group

data/config/locales/awesome_translations/app/views/family_gallery/multiple_pictures/da.yml

@@ -0,0 +1,6 @@
+---
+da:
+  family_gallery:
+    multiple_pictures:
+      new:
+        upload_multiple_pictures: Upload flere billeder

data/config/locales/awesome_translations/app/views/family_gallery/multiple_pictures/de.yml

@@ -0,0 +1,5 @@
+---
+de:
+  family_gallery:
+    multiple_pictures:
+      new: {}

data/config/locales/awesome_translations/app/views/family_gallery/multiple_pictures/en.yml

@@ -0,0 +1,6 @@
+---
+en:
+  family_gallery:
+    multiple_pictures:
+      new:
+        upload_multiple_pictures: Upload multiple pictures

data/config/locales/awesome_translations/app/views/family_gallery/pictures/da.yml

@@ -10,3 +10,4 @@ da:
         next: Næste
         tagged_users: Taggede brugere
         no_users_was_tagged: Der er ikke blevet tagget nogle brugere
+        google_map: Google Map

data/config/locales/awesome_translations/app/views/family_gallery/pictures/en.yml

@@ -10,3 +10,4 @@ en:
         next: Next
         tagged_users: Tagged users
         no_users_was_tagged: No users have been tagged
+        google_map: Google Map

data/config/locales/awesome_translations/app/views/family_gallery/users/da.yml

@@ -3,8 +3,16 @@ da:
   family_gallery:
     users:
       show:
-        show_user: Vis bruger
+        show_user: 'Vis bruger: %{user_name}'
         tagged_on: Tagget på
         user_hasnt_been_tagged_on_any_pictures: Denne bruger er ikke blevet tagget
           på nogle billeder
         uploaded_pictures: Uploadede billeder
+        this_user_havent_uploaded_any_pictures: Denne bruger har ikke uploadet nogle
+          billeder
+      edit:
+        edit_user: 'Rediger bruger: %{name}'
+      new:
+        new_user: Ny bruger
+      index:
+        no_users_were_found: Der blev ikke fundet nogle brugere

data/config/locales/awesome_translations/app/views/family_gallery/users/en.yml

@@ -3,8 +3,15 @@ en:
   family_gallery:
     users:
       show:
-        show_user: Show user
+        show_user: 'Show user: %{user_name}'
         tagged_on: Tagged on
         user_hasnt_been_tagged_on_any_pictures: This user hasn't been tagged on any
           pictures
         uploaded_pictures: Uploaded pictures
+        this_user_havent_uploaded_any_pictures: This user haven't uploaded any pictures.
+      edit:
+        edit_user: 'Edit user: %{name}'
+      new:
+        new_user: New user
+      index:
+        no_users_were_found: No users were found

data/config/locales/awesome_translations/app/views/family_gallery/welcome/da.yml

@@ -5,3 +5,5 @@ da:
       index:
         welcome: Velkommen
         latest_updated_groups: Seneste opdaterede grupper
+        no_groups_has_been_created_yet: Der er ikke blevet oprettet nogle grupper
+          endnu

data/config/locales/awesome_translations/app/views/family_gallery/welcome/en.yml

@@ -5,3 +5,4 @@ en:
       index:
         welcome: Welcome
         latest_updated_groups: Latest updated groups
+        no_groups_has_been_created_yet: No groups has been created yet

data/config/locales/awesome_translations/models/family_gallery__group/da.yml

@@ -24,3 +24,4 @@ da:
         updated_at: Opdateret d.
         group_picture_links: Gruppebilledelinks
         pictures: Billeder
+        translations: Oversættelser

data/config/locales/awesome_translations/models/family_gallery__group/en.yml

@@ -24,3 +24,4 @@ en:
         updated_at: Updated at
         group_picture_links: Group picture links
         pictures: Pictures
+        translations: Translations

data/config/locales/awesome_translations/models/family_gallery__group_picture_link/da.yml

@@ -0,0 +1,16 @@
+---
+da:
+  activerecord:
+    models:
+      family_gallery/group_picture_link:
+        one: Guppebilledelink
+        other: Gruppebilledelinks
+    attributes:
+      family_gallery/group_picture_link:
+        id: ID
+        group_id: Gruppe ID
+        picture_id: Billede ID
+        created_at: Oprettet d.
+        updated_at: Opdateret d.
+        group: Gruppe
+        picture: Billede

data/config/locales/awesome_translations/models/family_gallery__group_picture_link/de.yml

@@ -0,0 +1,7 @@
+---
+de:
+  activerecord:
+    models:
+      family_gallery/group_picture_link: {}
+    attributes:
+      family_gallery/group_picture_link: {}

data/config/locales/awesome_translations/models/family_gallery__group_picture_link/en.yml

@@ -0,0 +1,16 @@
+---
+en:
+  activerecord:
+    models:
+      family_gallery/group_picture_link:
+        one: Group picture link
+        other: Group picture links
+    attributes:
+      family_gallery/group_picture_link:
+        id: ID
+        group_id: Group ID
+        picture_id: Picture ID
+        created_at: Created at
+        updated_at: Updated at
+        group: Group
+        picture: Picture

data/config/locales/awesome_translations/models/family_gallery__picture/da.yml

@@ -11,3 +11,21 @@ da:
         height: Højde
         created_at: Oprettet d.
         updated_at: Opdateret d.
+        id: ID
+        user_owner_id: Ejerbruger ID
+        user_uploaded_id: Bruger uploadet ID
+        taken_at: Taget d.
+        image_file_name: Billede filnavn
+        image_content_type: Billede indholdstype
+        image_file_size: Billede filstørrelse
+        image_updated_at: Billede opdateret d.
+        image: Billede
+        translations: Oversættelser
+        group_picture_links: Gruppebilledelinks
+        groups: Grupper
+        user_taggings: Brugertaggings
+        tagged_users: Taggede brugere
+        user_owner: Ejerbruger
+        user_uploaded: Bruger uploadet
+        latitude: Breddegrad
+        longitude: Længdegrad

data/config/locales/awesome_translations/models/family_gallery__picture/de.yml

@@ -0,0 +1,7 @@
+---
+de:
+  activerecord:
+    models:
+      family_gallery/picture: {}
+    attributes:
+      family_gallery/picture: {}

data/config/locales/awesome_translations/models/family_gallery__picture/en.yml

@@ -11,3 +11,21 @@ en:
         height: Height
         created_at: Created at
         updated_at: Updated at
+        id: ID
+        user_owner_id: User owner ID
+        user_uploaded_id: User uploaded ID
+        taken_at: Taken at
+        image_file_name: Picture file name
+        image_content_type: Picture content type
+        image_file_size: Picture file size
+        image_updated_at: Picture updated at
+        image: Image
+        translations: Translations
+        group_picture_links: Group picture links
+        groups: Groups
+        user_taggings: User taggings
+        tagged_users: Tagged users
+        user_owner: User owner
+        user_uploaded: User uploaded
+        latitude: Latitude
+        longitude: Longitude

data/config/locales/awesome_translations/models/family_gallery__user/da.yml

@@ -0,0 +1,18 @@
+---
+da:
+  activerecord:
+    models:
+      family_gallery/user:
+        one: Bruger
+        other: Brugere
+    attributes:
+      family_gallery/user:
+        first_name: Fornavn
+        last_name: Efternavn
+        email: Email
+        created_at: Oprettet d.
+        updated_at: Opdateret d.
+        owned_pictures: Ejedede billeder
+        pictures_tagged_on: Tagget på billeder
+        user_roles: Brugerroller
+        uploaded_pictures: Uploadede billeder

data/config/locales/awesome_translations/models/family_gallery__user/de.yml

@@ -0,0 +1,7 @@
+---
+de:
+  activerecord:
+    models:
+      family_gallery/user: {}
+    attributes:
+      family_gallery/user: {}

data/config/locales/awesome_translations/models/family_gallery__user/en.yml

@@ -0,0 +1,18 @@
+---
+en:
+  activerecord:
+    models:
+      family_gallery/user:
+        one: User
+        other: Users
+    attributes:
+      family_gallery/user:
+        first_name: First name
+        last_name: Last name
+        email: Email
+        created_at: Created at
+        updated_at: Updated at
+        owned_pictures: Owned pictures
+        pictures_tagged_on: Tagged on pictures
+        user_roles: User roles
+        uploaded_pictures: Uploaded pictures

data/config/locales/awesome_translations/models/family_gallery__user_role/da.yml

@@ -0,0 +1,15 @@
+---
+da:
+  activerecord:
+    models:
+      family_gallery/user_role:
+        one: Brugerrolle
+        other: Brugerroller
+    attributes:
+      family_gallery/user_role:
+        id: ID
+        user_id: Bruger ID
+        role: Rolle
+        created_at: Oprettet d.
+        updated_at: Opdateret d.
+        user: Bruger

data/config/locales/awesome_translations/models/family_gallery__user_role/de.yml

@@ -0,0 +1,7 @@
+---
+de:
+  activerecord:
+    models:
+      family_gallery/user_role: {}
+    attributes:
+      family_gallery/user_role: {}

data/config/locales/awesome_translations/models/family_gallery__user_role/en.yml

@@ -0,0 +1,15 @@
+---
+en:
+  activerecord:
+    models:
+      family_gallery/user_role:
+        one: User role
+        other: User roles
+    attributes:
+      family_gallery/user_role:
+        id: ID
+        user_id: User ID
+        role: Role
+        created_at: Created at
+        updated_at: Updated at
+        user: User

data/config/locales/awesome_translations/models/family_gallery__user_tagging/da.yml

@@ -12,3 +12,9 @@ da:
         user_id: Bruger ID
         picture: Billede
         user: Bruger
+        tagged_by_id: Tagget af ID
+        position_top: Position top
+        position_left: Position venstre
+        created_at: Oprettet d.
+        updated_at: Opdateret d.
+        tagged_by: Tagget af

data/config/locales/awesome_translations/models/family_gallery__user_tagging/de.yml

@@ -0,0 +1,7 @@
+---
+de:
+  activerecord:
+    models:
+      family_gallery/user_tagging: {}
+    attributes:
+      family_gallery/user_tagging: {}