diff --git a/app/assets/stylesheets/lib/group/_group-classes.scss b/app/assets/stylesheets/lib/group/_group-classes.scss index c5966fb..e739184 100644 --- a/app/assets/stylesheets/lib/group/_group-classes.scss +++ b/app/assets/stylesheets/lib/group/_group-classes.scss @@ -41,6 +41,15 @@ color: $white; background-color: $blue; } + + &.gray { + color: $dark-gray; + border: 2px solid $dark-gray; + &:hover { + color: $white; + background-color: $dark-gray; + } + } } .button-activated { @@ -245,6 +254,7 @@ .admin-avatar { width: 60px; height: 60px; + max-width: none; border-radius: $round; } diff --git a/app/assets/stylesheets/lib/group/_group-post.scss b/app/assets/stylesheets/lib/group/_group-post.scss index fc5dd26..96b9943 100644 --- a/app/assets/stylesheets/lib/group/_group-post.scss +++ b/app/assets/stylesheets/lib/group/_group-post.scss @@ -32,6 +32,12 @@ width: auto; max-width: 100%; height: auto; + position: absolute; + top: 0; + right: 0; + bottom: 0; + left: 0; + margin: auto; } .group-post-bar { @@ -121,7 +127,8 @@ text-align: justify; } -.group-post-member-count { +.group-post-member-count, +.group-post-no-member { background: $blue; color: $white; padding: 6px 0.625rem; diff --git a/app/assets/stylesheets/lib/group/_group-show-post.scss b/app/assets/stylesheets/lib/group/_group-show-post.scss index 24f1c05..cf14b35 100644 --- a/app/assets/stylesheets/lib/group/_group-show-post.scss +++ b/app/assets/stylesheets/lib/group/_group-show-post.scss @@ -58,6 +58,7 @@ .group-show-post-image-wrap { position: relative; background: $black; + overflow: hidden; &:hover { .cycle-nav { opacity: 1; diff --git a/app/assets/stylesheets/lib/group/group-admin.scss b/app/assets/stylesheets/lib/group/group-admin.scss index 7892700..65653c5 100644 --- a/app/assets/stylesheets/lib/group/group-admin.scss +++ b/app/assets/stylesheets/lib/group/group-admin.scss @@ -119,6 +119,21 @@ body { // members page +.existing-phone-avatar { + vertical-align: top; + margin: 0 0.5rem 0.5rem 0; +} +.existing-member-count { + width: 60px; + height: 60px; + display: inline-block; + box-sizing: border-box; + line-height: 40px; + text-align: center; + white-space: nowrap; + padding: 8px 0.45rem; + font-size: 0.8125rem; +} .group-edit-button { box-sizing: border-box; vertical-align: top; @@ -128,4 +143,73 @@ body { display: inline-block; text-align: center; font-size: 0.8125rem; +} + +.group-edit-avatar { + width: 60; +} + +.group-member-edit-table { + width: 100%; + tr { + border-bottom: 1px solid $gray; + } + td { + padding: 8px 0.75rem; + &:first-child { + width: 60px; + } + } + .make-admin-checkbox { + display: inline-block; + vertical-align: top; + margin-right: 0.3125rem; + } + .group-member-permission { + display: inline-block; + vertical-align: text-top; + } + +} +.group-admin-edit-image-wrap { + margin-bottom: 16px; +} + +.group-admin-edit-image-item { + margin-bottom: 16px; +} +.group-admin-edit-image-checkbox { + display: inline-block; + vertical-align: top; +} +.group-admin-edit-image-label { + display: inline-block; + vertical-align: text-top; + font-size: 0.75rem; +} +.group-admin-edit-image-item-inner { + padding: 16px 0.625rem; + margin-right: 1rem; + background: $white; + border-radius: $general; +} +.group-admin-edit-file-wrap { + margin-bottom: 16px; +} +.group-admin-edit-file-item { + padding: 10px 16px; + float: left; + margin: 0 8px 0.5rem 0; + font-size: 0.8125rem; + .group-admin-edit-file-checkbox { + margin: 0; + } +} +.group-admin-edit-filename { + margin-right: 0.3125rem; +} +.group-admin-edit-file-delete { + padding-bottom: 4px; + border-bottom: 1px dotted $red; + vertical-align: top; } \ No newline at end of file diff --git a/app/views/admin/groups/_group_existing_member.html.erb b/app/views/admin/groups/_group_existing_member.html.erb index 97932ff..f326cf4 100644 --- a/app/views/admin/groups/_group_existing_member.html.erb +++ b/app/views/admin/groups/_group_existing_member.html.erb @@ -7,7 +7,7 @@ " class="existing-phone-avatar admin-avatar" src="<%= em["avatar"] %>" /> <% end %> <% if i == existing_members_limit %> - … <%= (@existing_members.count - existing_members_limit).to_s %> more. + <%= (@existing_members.count - existing_members_limit).to_s %> more <% break end %> <% end %> diff --git a/app/views/admin/groups/_group_form.html.erb b/app/views/admin/groups/_group_form.html.erb index cb3d71f..a65361d 100644 --- a/app/views/admin/groups/_group_form.html.erb +++ b/app/views/admin/groups/_group_form.html.erb @@ -95,7 +95,7 @@ name = member["name"][I18n.locale.to_s] == "" ? member["name"]["zh_tw"] : member["name"][I18n.locale.to_s] name = "" if name.nil? user_name = "(#{member["user_name"]})" - text = "#{name} #{user_name}" + text = " #{name} #{user_name}" %> <% end %> diff --git a/app/views/admin/groups/_post.html.erb b/app/views/admin/groups/_post.html.erb index 22cb99e..7d77c0f 100644 --- a/app/views/admin/groups/_post.html.erb +++ b/app/views/admin/groups/_post.html.erb @@ -1,15 +1,15 @@
-
- -
-<<<<<<< Updated upstream -

- <%= post.title %> -

-
- <% content = strip_tags post.content %> - <%= content[0..250] %> - <%= "..." if content.length > 350 %> -
-
- - <% - user = User.find(post.author) rescue nil - if !user.nil? - author = (user.member_profile.name == nil ? user.user_name : user.member_profile.name rescue "") - %> - <%= author %> - <% end %> - -
- - <% date = DateTime.parse(post.created_at.to_s).strftime("%d %B %H:%M") %> - <%= date %> - -
-
-=======

<%= post.title %> @@ -92,6 +65,5 @@

->>>>>>> Stashed changes diff --git a/app/views/admin/groups/_post_form.html.erb b/app/views/admin/groups/_post_form.html.erb index 768be7a..4eb2e04 100644 --- a/app/views/admin/groups/_post_form.html.erb +++ b/app/views/admin/groups/_post_form.html.erb @@ -34,12 +34,17 @@
<% if params[:action] == "editpost" %> -
+
<% @grouppost.group_post_images.each do |gpi| %> - - - Delete Image - +
+
+
+ +
+ + +
+
<% end %>
<% end %> @@ -82,12 +87,17 @@
<% if params[:action] == "editpost" %> -
+
<% @grouppost.group_post_files.each do |gpf| %> - - <%= File.basename(gpf.file.path) %> - Delete File - +
+ + <%= File.basename(gpf.file.path) %> + + + + Delete File + +
<% end %>
<% end %> @@ -100,7 +110,6 @@
-
diff --git a/app/views/admin/groups/edit.html.erb b/app/views/admin/groups/edit.html.erb index e299ffe..187a33c 100644 --- a/app/views/admin/groups/edit.html.erb +++ b/app/views/admin/groups/edit.html.erb @@ -1,5 +1,6 @@ <% content_for :page_specific_css do -%> <%= stylesheet_link_tag "//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" %> + <%= stylesheet_link_tag "lib/group/group-admin" %> <% end -%> <%= form_for @group, :url => admin_group_path(@group.id), :html => { :multipart => true , :class=>"form-horizontal main-forms"} do |f| %> @@ -16,14 +17,17 @@

Modify members

- +
<% @existing_members.each do |em| %> - - + + <% if em["id"] != current_user.id.to_s %> - - + + <% end %> <% end %> diff --git a/app/views/admin/groups/show.html.erb b/app/views/admin/groups/show.html.erb index bf291b0..031d6e3 100644 --- a/app/views/admin/groups/show.html.erb +++ b/app/views/admin/groups/show.html.erb @@ -24,10 +24,10 @@

<%= @group.title %>

- + Join this group - + <% if user_can_write? %> New Post <% end %> @@ -68,7 +68,7 @@

<% number_of_members = @group.users.count %> <% if number_of_members > 0 %> - href="<%= admin_group_members_path(@group) %>"> + <%= number_of_members.to_s %> member<%= number_of_members > 1 ? "s" : "" %> diff --git a/app/views/admin/groups/showpost.html.erb b/app/views/admin/groups/showpost.html.erb index 44f703e..37c64e3 100644 --- a/app/views/admin/groups/showpost.html.erb +++ b/app/views/admin/groups/showpost.html.erb @@ -51,10 +51,11 @@ data-cycle-log="false" data-cycle-center-horz=true data-cycle-center-vert=true + data-cycle-auto-height="calc" > <% @post.group_post_images.each do |gpi| %>

  • - <%= @post.title %> + <%= @post.title %>
    • <% end %>
    " />>
    <%= em["name"][I18n.locale.to_s] %>
    		" />>
    <%= em["name"][I18n.locale.to_s] %>
    		" <%= em["admin"] ? "checked='checked'" : ""%> /> Admin + " <%= em["admin"] ? "checked='checked'" : ""%> /> + +