alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

joshuas update for groups

This commit is contained in:
rulingcom 2015-05-28 21:19:18 +08:00
parent 1f25dbdfec
commit 822a6932cd
11 changed files with 144 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/stylesheets/lib/group/_group-classes.scss
View File

@ -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;
}

9
app/assets/stylesheets/lib/group/_group-post.scss
View File

@ -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;

1
app/assets/stylesheets/lib/group/_group-show-post.scss
View File

@ -58,6 +58,7 @@
.group-show-post-image-wrap {
position: relative;
background: $black;
overflow: hidden;
&:hover {
.cycle-nav {
opacity: 1;

84
app/assets/stylesheets/lib/group/group-admin.scss
View File

@ -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;
}

2
app/views/admin/groups/_group_existing_member.html.erb
View File

@ -7,7 +7,7 @@
<img data-member-id="<%= em["id"] %>" class="existing-phone-avatar admin-avatar" src="<%= em["avatar"] %>" />
<% end %>
<% if i == existing_members_limit %>
<span class="existing-member-count"> &hellip; <%= (@existing_members.count - existing_members_limit).to_s %> more.</span>
<span class="existing-member-count button button-default gray"><%= (@existing_members.count - existing_members_limit).to_s %> more</span>
<% break
end %>
<% end %>

2
app/views/admin/groups/_group_form.html.erb
View File

@ -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}"
%>
<option value="<%= member["id"] %>" data-member="<%= member.to_json %>"><%= text %></option>
<% end %>

38
app/views/admin/groups/_post.html.erb
View File

@ -1,15 +1,15 @@
<div class="group-post-item card clearfix wow bounceInUp" data-post-id="<%= post.id.to_s %>">
<a href="/admin/posts/<%= post.to_param %>" class="group-post-link"></a>
<div class="group-post-actions tool-tip-parent">
<button class="group-post-dropdown-toggle">
<div class="group-post-actions tool-tip-parent action">
<button class="group-post-dropdown-toggle toggle">
<span class="caret"></span>
</button>
<ul class="group-post-dropdown">
<ul class="group-post-dropdown action-dropdown">
<% if post.author.to_s != current_user.id.to_s %>
<li class="group-post-dropdown-item">
<a href="#">
<i class="fa fa-flag-o"></i>
Flag inappropriate</a>
<i class="fa fa-flag-o"></i>
Flag inappropriate
</a>
</li>
<% else %>
@ -38,33 +38,6 @@
<% end %>
</div>
<div class="group-post-content-wrap">
<<<<<<< Updated upstream
<h3 class="group-post-title">
<%= post.title %>
</h3>
<div class="group-post-content">
<% content = strip_tags post.content %>
<%= content[0..250] %>
<%= "..." if content.length > 350 %>
</div>
<div class="group-post-meta-wrap">
<span class="group-post-author">
<%
user = User.find(post.author) rescue nil
if !user.nil?
author = (user.member_profile.name == nil ? user.user_name : user.member_profile.name rescue "")
%>
<i class="group-post-author-icon icon-user"></i> <%= author %>
<% end %>
</span>
<div class="group-post-sub-wrap">
<span class="group-post-postdate">
<% date = DateTime.parse(post.created_at.to_s).strftime("%d %B %H:%M") %>
<i class="group-post-postdate-icon icon-time"></i> <%= date %>
</span>
</div>
</div>
=======
<h3 class="group-post-title">
<a href="/admin/posts/<%= post.to_param %>" class="group-post-link">
<%= post.title %>
@ -92,6 +65,5 @@
</span>
</div>
</div>
>>>>>>> Stashed changes
</div>
</div>

31
app/views/admin/groups/_post_form.html.erb
View File

@ -34,12 +34,17 @@
<label class="control-label muted"><%= t(:images) %></label>
<div class="controls">
<% if params[:action] == "editpost" %>
<div>
<div class="group-admin-edit-image-wrap clearfix">
<% @grouppost.group_post_images.each do |gpi| %>
<span>
<img src="<%= gpi.image.thumb.url %>" style="width:120px;" />
<input type="checkbox" name="images_to_destroy[]" value="<%= gpi.id.to_s %>" /> Delete Image
</span>
<div class="group-admin-edit-image-item">
<div class="group-admin-edit-image-item-inner">
<div class="group-admin-edit-image-wrap">
<img src="<%= gpi.image.thumb.url %>">
</div>
<input class="group-admin-edit-image-checkbox" type="checkbox" name="images_to_destroy[]" value="<%= gpi.id.to_s %>" />
<label class="group-admin-edit-image-label">Delete Image</label>
</div>
</div>
<% end %>
</div>
<% end %>
@ -82,12 +87,17 @@
<label class="control-label muted"><%= t(:files) %></label>
<div class="controls">
<% if params[:action] == "editpost" %>
<div>
<div class="group-admin-edit-file-wrap clearfix">
<% @grouppost.group_post_files.each do |gpf| %>
<span>
<span><%= File.basename(gpf.file.path) %></span>
<input type="checkbox" name="files_to_destroy[]" value="<%= gpf.id.to_s %>" /> Delete File
</span>
<div class="group-admin-edit-file-item card">
<i class="fa fa-file-text"></i>
<span class="group-admin-edit-filename"><%= File.basename(gpf.file.path) %></span>
<span class="group-admin-edit-file-delete">
<input class="group-admin-edit-file-checkbox" type="checkbox" name="files_to_destroy[]" value="<%= gpf.id.to_s %>" />
Delete File
</span>
</div>
<% end %>
</div>
<% end %>
@ -100,7 +110,6 @@
</button>
</div>
<div id="file_ids">
</div>
</div>

14
app/views/admin/groups/edit.html.erb
View File

@ -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 @@
<h4 class="modal-title">Modify members</h4>
</div>
<div class="modal-body">
<table>
<table class="group-member-edit-table">
<% @existing_members.each do |em| %>
<tr>
<td><img class="group-edit-avatar" src="<%= em["avatar"] %>" /></td>
<td width="70%" <%= em["id"] != current_user.id.to_s ? "" : "colspan='3'" %>><h5><%= em["name"][I18n.locale.to_s] %></h5></td>
<td><img class="group-edit-avatar admin-avatar" src="<%= em["avatar"] %>" /></td>
<td <%= em["id"] != current_user.id.to_s ? "" : "colspan='3'" %>><h5><%= em["name"][I18n.locale.to_s] %></h5></td>
<% if em["id"] != current_user.id.to_s %>
<td><input type="checkbox" class="make-admin-checkbox" value="<%= em["id"] %>" <%= em["admin"] ? "checked='checked'" : ""%> /> Admin</td>
<td><a href="#" class="member-delete-btn" data-member="<%= em.to_json %>"><i class="icon-trash"></i></a></td>
<td>
<input type="checkbox" class="make-admin-checkbox" value="<%= em["id"] %>" <%= em["admin"] ? "checked='checked'" : ""%> />
<label class="group-member-permission">Admin</label>
</td>
<td><a href="#" class="member-delete-btn button button-default" data-member="<%= em.to_json %>"><i class="icon-trash"></i></a></td>
<% end %>
</tr>
<% end %>

6
app/views/admin/groups/show.html.erb
View File

@ -24,10 +24,10 @@
</div>
<div class="group-post-bar">
<h2 class="group-post-page-title"><%= @group.title %></h2>
<a class="group-post-join button button-primary" href="#">
<!-- <a class="group-post-join button button-primary" href="#"> -->
<i class="fa fa-user-plus"></i>
Join this group
</a>
<!-- </a> -->
<% if user_can_write? %>
<a class="group-post-new-post button button-primary" href="<%= admin_group_newpost_path(@group) %>"><i class="icon-plus"></i> New Post</a>
<% end %>
@ -68,7 +68,7 @@
<p>
<% number_of_members = @group.users.count %>
<% if number_of_members > 0 %>
<a class="group-post-member-count"> href="<%= admin_group_members_path(@group) %>">
<a class="group-post-member-count" href="<%= admin_group_members_path(@group) %>">
<i class="fa fa-user"></i>
<%= number_of_members.to_s %> member<%= number_of_members > 1 ? "s" : "" %>
</a>

3
app/views/admin/groups/showpost.html.erb
View File

@ -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| %>
<li class="group-show-post-image-item">
<img class="group-show-post-banner-image" src="<%= gpi.image.url %>" alt="<%= @post.title %>">
<img class="group-show-post-banner-image" src="<%= gpi.image.mobile.url %>" alt="<%= @post.title %>">
</li>
<% end %>
</ul>