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

groups commit

This commit is contained in:
Harry Bomrah 2015-03-25 15:46:11 +08:00
parent e1c8d61195
commit b290d3653f
16 changed files with 566 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Gemfile
View File

@ -84,8 +84,11 @@ end
#ask
gem 'gotcha'
#desktop
gem 'angularjs-rails', '~> 1.2.20'
gem 'angular-ui-bootstrap-rails', '~> 0.11.0'
gem 'jquery_mousewheel_rails', '~> 3.1.11.3'
#caching
gem 'mongoid-observers'
#desktop
# gem 'angularjs-rails', '~> 1.2.20'
# gem 'angular-ui-bootstrap-rails', '~> 0.11.0'
# gem 'jquery_mousewheel_rails', '~> 3.1.11.3'

249
app/assets/stylesheets/group_page.css Normal file
View File

@ -0,0 +1,249 @@
@charset "utf-8";
body {
background: #f3f3f3;
}
#main-wrap {
padding-top: 0;
}
*,
*:before,
*:after {
box-sizing: border-box;
}
.group-page {}
.group-page-banner-image-wrap {
position: relative;
max-height: 280px;
overflow: hidden;
}
.group-page-view-switch {
position: absolute;
right: 2rem;
top: 2rem;
}
.group-page-banner-image {
max-width: 100%;
width: 100%;
height: auto;
}
.group-page-bar {
overflow: hidden;
background: #171717;
padding: 20px 2rem;
text-align: center;
}
.group-page-title {
padding: 6px 0;
color: #fff;
margin-bottom: 12px;
}
.group-page-setion {
padding: 30px 2rem;
overflow: hidden;
max-width: 1350px;
margin: auto;
}
.gorup-page-info-wrap {
display: block;
font-size: .9rem;
float: right;
padding: 5px .5rem;
border: 2px solid #cdcdcd;
cursor: pointer;
}
.group-page-description-wrap {
clear: both;
}
.gorup-page-info-wrap {
text-align: right;
margin-bottom: 10px;
}
.group-page-status-wrap {
float: right;
font-size: 0.75rem;
color: #fff;
background: #1d9e20;
padding: 2px .4rem;
border-radius: .2rem;
margin-bottom: 10px;
}
.group-page-status-wrap.close-eye{
background: #c71932;
margin-left: 5px;
}
.group-page-description-wrap {
padding: 16px 1.2rem 16px;
margin-bottom: 15px;
box-shadow: inset 0 0 8px #aaa;
border-radius: .2rem;
}
.group-page-description {
clear: both;
text-align: justify;
}
.group-page-post {
clear: both;
text-align: center;
overflow: hidden;
margin-bottom: 40px;
background: #fff;
padding: 28px 1.5rem;
border-radius: .2rem;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .2);
}
.group-page-post-link{
text-decoration: none;
color: #000;
}
.group-page-post:hover {
box-shadow: 0 1px 25px 0 rgba(0, 0, 0, .2);
}
.group-page-post-link:hover {
color: #000;
text-decoration: none;
}
.group-page-post-image-wrap {
display: inline-block;
margin-bottom: 12px;
}
.group-page-post-image {
max-width: 100%;
width: 100%;
margin-top: 12px;
/*border-radius: 50%;*/
height: auto;
}
.group-page-post-content {
margin-bottom: .5rem;
}
.group-page-post-title {
font-weight: normal;
font-size: 1.5rem;
line-height: 1;
margin-bottom: 12px;
}
.group-page-post-meta-wrap {
color: #aaa;
}
.group-page-post-author,
.group-page-post-postdate {
margin-right: .5rem;
}
/* scroll view */
.group-page.scroll {
padding-top: 7rem;
}
.group-page.scroll .group-page-banner-image-wrap {
height: 70px;
overflow: hidden;
position: fixed;
top: 0;
}
.group-page.scroll .group-page-title {
margin-bottom: 0;
}
.group-page.scroll .group-page-title {
font-size: 18px;
}
.group-page.scroll .group-page-new-post {
margin-top: 6px;
}
.group-page.scroll .group-page-new-post {
display: inline-block;
vertical-align: top;
}
.group-page.scroll .group-page-view-switch {
position: static;
display: inline-block;
margin: 6px .5rem 0 0;
}
.group-page.scroll .btn {
padding: 2px 5px;
}
.group-page li a {
text-decoration: none;
}
.group-page .group-page-feed-view .active {
color: #fff;
}
/* 600px */
@media screen and (min-width: 37.5rem) {
.group-page-post {
text-align: left;
margin-bottom: 15px;
}
.group-page-post-image-wrap {
float: left;
width: 12%;
margin-right: 4%;
min-width: 100px;
}
.group-page-post-content-wrap {
float: left;
width: 72%;
}
.group-page.scroll .group-page-view-switch {
margin: 6px .5rem 0 0;
}
.group-page.scroll .group-page-bar {
padding: 0 5rem 0 2rem;
position: fixed;
top: 70px;
width: 100%;
}
}
/* 760px */
@media screen and (min-width: 47.5rem) {
.group-page-post-content-wrap {
width: 80%;
}
.group-page-bar {
text-align: left;
}
.group-page-title {
float: left;
margin: 0;
padding: 0;
}
.group-page-new-post {
float: right;
}
.group-page-view-switch {
float: right;
}
}

39
app/controllers/admin/groups_controller.rb
View File

@ -1,13 +1,44 @@
class Admin::GroupsController < OrbitMemberController
def index
@groups = Group.all
@groups = current_user.groups
end
def public_groups
@groups = Group.open
end
def categories
@categories = GroupCategory.all
end
def newpost
@no_breadcrumb = true
uid = params[:group_id].split("-").last
@group = Group.find_by(:uid => uid)
@grouppost = GroupPost.new
end
def createpost
uid = params[:group_id].split("-").last
group = Group.find_by(:uid => uid)
gp = GroupPost.new(post_params)
gp.group = group
gp.save
redirect_to admin_group_path(group)
end
def showpost
end
def show
@no_breadcrumb = true
@no_filter = true
uid = params[:id].split("-").last
@group = Group.find_by(:uid => uid)
end
def create_category
gc = GroupCategory.new(category_params)
gc.save
@ -45,6 +76,12 @@ class Admin::GroupsController < OrbitMemberController
params.require(:category).permit!
end
def post_params
p = params.require(:group_post).permit!
p["author"] = current_user.id
p
end
def group_params
p = params.require(:group).permit!
p["user_ids"] << current_user.id.to_s

6
app/models/group.rb
View File

@ -11,6 +11,10 @@ class Group
belongs_to :group_category
has_and_belongs_to_many :users
has_many :group_posts
scope :closed, ->{ where(privacy: "closed") }
scope :open, ->{ where(privacy: "open") }
end

14
app/models/group_post.rb Normal file
View File

@ -0,0 +1,14 @@
class GroupPost
include Mongoid::Document
include Mongoid::Timestamps
include Slug
field :title, as: :slug_title, type: String
field :content
field :read_by, type: Array, default: []
field :author, type: BSON::ObjectId
mount_uploader :image, ImageUploader
belongs_to :group
end

17
app/views/admin/groups/_group.html.erb
View File

@ -1,15 +1,22 @@
<% current_user_is_group_admin = group.admins.include?(current_user.id.to_s) ? true : false %>
<%
current_user_is_group_admin = group.admins.include?(current_user.id.to_s) ? true : false
if !current_user_is_group_admin
current_user_is_group_member = group.users.include?(current_user) ? true : false
else
current_user_is_group_member = true
end
%>
<li>
<div class="member-avatar">
<p class="<%= current_user_is_group_admin ? "gender-man" : "gender-none" %>"></p>
<p class="<%= current_user_is_group_admin ? "gender-man" : (current_user_is_group_member ? "gender-woman" : "gender-none") %>"></p>
<div class="action">
<%= link_to(content_tag(:i, nil, :class => 'icon-edit'),"#",:class=>"edit" ) if current_user_is_group_admin %>
</div>
<%= image_tag(group.image) %>
</div>
<div class="member-info">
<h4 class="member-name"><%= link_to group.title, "#" %></h4>
<h4 class="member-name"><%= link_to group.title, admin_group_path(group) %></h4>
<%
author = ""
group.admins.each_with_index do |admin,i|
@ -23,6 +30,10 @@
<div class="member-mail muted">Admin : <%= author %></div>
<hr>
<ul class="member-roles">
<li>
<span class="member-staturs muted">Privacy : </i>
<span class="label <%= group.privacy == 'closed' ? "label-important" : "label-success" %>"><%= group.privacy %></span>
</li>
<li>
<%= group.description %>
</li>

0
app/views/admin/groups/_create_group_form.html.erb → app/views/admin/groups/_group_form.html.erb
View File

36
app/views/admin/groups/_post.html.erb Normal file
View File

@ -0,0 +1,36 @@
<a href="/admin/posts/<%= post.to_param %>" class="group-page-post-link">
<div class="group-page-post">
<div class="group-page-post-image-wrap">
<% if !post.image.nil? %>
<img class="group-page-post-image" src="<%= post.image.url %>" alt="<%= post.title %>">
<% else %>
<img class="group-page-post-image" src="/assets/member-pic.png" alt="Post image">
<% end %>
</div>
<div class="group-page-post-content-wrap">
<h3 class="group-page-post-title">
<%= post.title %>
</h3>
<div class="group-page-post-content">
<% content = strip_tags post.content %>
<%= content[0..250] %>
<%= "..." if content.length > 350 %>
</div>
<div class="group-page-post-meta-wrap">
<span class="group-page-post-author">
<%
user = User.find(post.author) rescue nil
if !user.nil?
author = (user.member_profile.name == "" ? user.user_name : user.member_profile.name rescue "")
%>
<i class="group-page-post-author-icon icon-user"></i> <%= author %>
<% end %>
</span>
<span class="group-page-post-postdate">
<% date = DateTime.parse(post.created_at.to_s).strftime("%d %B") %>
<i class="group-page-post-postdate-icon icon-time"></i> <%= date %>
</span>
</div>
</div>
</div>
</a>

81
app/views/admin/groups/_post_form.html.erb Normal file
View File

@ -0,0 +1,81 @@
<% content_for :page_specific_css do %>
<%= stylesheet_link_tag "lib/main-forms" %>
<%= stylesheet_link_tag "lib/fileupload" %>
<%= stylesheet_link_tag "lib/main-list" %>
<% end %>
<% content_for :page_specific_javascript do %>
<%= javascript_include_tag "lib/bootstrap-fileupload" %>
<%= javascript_include_tag "lib/file-type" %>
<%= javascript_include_tag "lib/module-area" %>
<% end %>
<div class="input-area">
<!-- Module Tabs -->
<ul class="nav nav-pills module-nav">
<li class="active"><a href="#basic" data-toggle="tab"><%= t(:basic) %></a></li>
</ul>
<!-- Module -->
<div class="tab-content module-area">
<!-- Basic Module -->
<div class="tab-pane fade in active" id="basic">
<!-- group banner image -->
<div class="control-group">
<label class="control-label muted"><%= t(:image) %></label>
<div class="controls">
<div class="fileupload fileupload-new clearfix <%= 'fileupload-edit' if @grouppost.image.file %>" data-provides="fileupload">
<div class="fileupload-new thumbnail pull-left">
<% if @grouppost.image.file %>
<%= image_tag @grouppost.image %>
<% else %>
<img src="http://www.placehold.it/50x50/EFEFEF/AAAAAA" />
<% end %>
</div>
<div class="fileupload-preview fileupload-exists thumbnail pull-left"></div>
<span class="btn btn-file">
<span class="fileupload-new"><%= t(:select_image) %></span>
<span class="fileupload-exists"><%= t(:change) %></span>
<%= f.file_field :image %>
</span>
<a href="#" class="btn fileupload-exists" data-dismiss="fileupload"><%= t(:cancel) %></a>
<div class="controls" data-toggle="buttons-checkbox">
<label class="checkbox inline btn btn-danger fileupload-remove">
<%= f.check_box :remove_image %><%= t(:remove) %>
</label>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- Language -->
<div class="tab-content language-area">
<!-- Title-->
<div class="control-group input-title">
<label class="control-label muted"><%= t(:title) %></label>
<div class="controls">
<%= f.text_field :title, class: "input-block-level", placeholder: t(:title), value: (@grouppost.title rescue nil) %>
</div>
</div>
<!-- Sub Title -->
<div class="control-group input-subtitle">
<label class="control-label muted"><%= t(:content) %></label>
<div class="controls">
<div class="textarea">
<%= f.cktext_area :content, rows: 2, class: "input-block-level", value: (@grouppost.content rescue nil) %>
</div>
</div>
</div>
</div>
</div>
<!-- Form Actions -->
<div class="form-actions">
<%= f.submit t('submit'), class: 'btn btn-primary' %>
<%= link_to t('cancel'), admin_groups_path, :class=>"btn" %>
</div>

5
app/views/admin/groups/newpost.html.erb Normal file
View File

@ -0,0 +1,5 @@
<%= form_for @grouppost, :url => admin_group_createpost_path(@group), :html => { :multipart => true , :class=>"form-horizontal main-forms"} do |f| %>
<fieldset>
<%= render :partial => "post_form", locals: {f: f} %>
</fieldset>
<% end %>

15
app/views/admin/groups/public_groups.html.erb Normal file
View File

@ -0,0 +1,15 @@
<% content_for :page_specific_css do -%>
<%= stylesheet_link_tag "lib/wrap-nav" %>
<%= stylesheet_link_tag "lib/main-list" %>
<%= stylesheet_link_tag "lib/filter" %>
<%= stylesheet_link_tag "lib/member" %>
<% end -%>
<% content_for :page_specific_javascript do -%>
<%= javascript_include_tag "lib/jquery.lite.image.resize.js" %>
<%= javascript_include_tag "lib/member/list-view.js" %>
<% end -%>
<div id="list-view">
<ul id="member-abstract" class="clearfix">
<%= render :partial=>"group",:collection=> @groups %>
</ul>
</div>

75
app/views/admin/groups/show.html.erb Normal file
View File

@ -0,0 +1,75 @@
<% content_for :page_specific_css do -%>
<%= stylesheet_link_tag "group_page" %>
<% end -%>
<div class="group-page scroll">
<div class="group-page-banner-image-wrap">
<img class="group-page-banner-image" src="<%= @group.image.url %>" alt="<%= @group.title %>">
<ul class="group-page-view-switch btn-group">
<li class="group-page-feed-view btn btn-success"><a href="#" title="Feed" class="active"><i class="icon-list-ul"></i></a></li>
<li class="group-page-grid-view btn"><a href="#" title="Grid"><i class="icon-th"></i></a></li>
</ul>
</div>
<div class="group-page-bar">
<h2 class="group-page-title"><%= @group.title %></h2>
<a class="group-page-new-post btn btn-large btn-primary" href="<%= admin_group_newpost_path(@group) %>"><i class="icon-plus"></i> New Post</a>
</div>
<div class="group-page-setion">
<div class="group-page-detail">
<span class="gorup-page-info-wrap" id="group_info_button">
<i class="group-page-info-icon icon-info-sign muted"></i> <span class="muted">Info</span>
</span>
<div class="group-page-description-wrap" id="group_info_area" style="display:none;">
<% if @group.privacy == "closed" %>
<span class="group-page-status-wrap close-eye">
<i class="group-page-status icon-eye-open"></i> Closed
</span>
<% else %>
<span class="group-page-status-wrap open-eye">
<i class="group-page-status icon-eye-open"></i> Open
</span>
<% end %>
<h4 class="muted">Group Description</h4>
<p class="group-page-description"><%= @group.description %></p>
</div>
</div>
<%= render :partial => "post", :collection => @group.group_posts.desc(:created_at) %>
</div>
</div>
<script>
(function($) {
$( document ).ready( function() {
var doc = document,
viewSwitch = doc.querySelector( ".group-page-view-switch" ),
bar = doc.querySelector( ".group-page-bar" );
if( $( ".group-page" ).hasClass( "scroll" ) ) {
$( ".group-page-new-post" ).removeClass( "btn-large" );
bar.appendChild( viewSwitch );
}
});
var group_info_area = $("#group_info_area"),
orbit_bar = $("#orbit-bar");
$("#group_info_button").on("click",function(){
if(!group_info_area.hasClass("expanded")){
group_info_area.slideDown();
group_info_area.addClass("expanded");
}else{
group_info_area.slideUp();
group_info_area.removeClass("expanded");
}
})
$(document).on("scroll",function(){
orbit_bar.slideUp();
})
}(jQuery));
</script>

1
app/views/admin/groups/showpost.html.erb Normal file
View File

@ -0,0 +1 @@
this is post for <%= params[:id] %>

26
app/views/admin/members/_side_bar.html.erb
View File

@ -9,6 +9,9 @@
<%= content_tag :li, :class => active_for_controllers('members','roles','member_infos') do -%>
<%= link_to( ( content_tag(:span, content_tag(:i, nil, :class => 'icons-user'))), admin_members_path) %>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('groups') do -%>
<%= link_to( ( content_tag(:span, content_tag(:i, nil, :class => 'icons-layout'))), admin_groups_path) %>
<% end -%>
<% if (current_user.is_admin? rescue false) %>
<%= content_tag :li, :class => active_for_controllers('plugins') do -%>
<%= link_to( ( content_tag(:span, content_tag(:i, nil, :class => 'icons-graduation'))),admin_personal_plugins_path) %>
@ -16,10 +19,8 @@
<%= content_tag :li, :class => active_for_controllers('plugins') do -%>
<%= link_to( ( content_tag(:span, content_tag(:i, nil, :class => 'icons-pie'))), '#') %>
<% end -%>
<%= content_tag :li, :class => active_for_controllers('groups') do -%>
<%= link_to( ( content_tag(:span, content_tag(:i, nil, :class => 'icons-layout'))), admin_groups_path) %>
<% end -%>
<% end -%>
<% end -%>
<% end -%>
</div>
<div class="sub-nav-arrow"></div>
@ -36,6 +37,15 @@
<%= content_tag :li, link_to((content_tag(:span, t(:unapproved_members) + " (" + User.unapproved.count.to_s + ")")), admin_members_unapproved_members_path), :class => active_for_action('members', 'unapproved_members') if (current_user.is_admin? rescue nil) %>
<% end -%>
</div>
<div class="sub-nav-block" data-icons="&#xe070;">
<h4><%= t(:groups) %></h4>
<%= content_tag :ul, :class => ("nav nav-list ") do -%>
<%= content_tag :li, link_to((content_tag(:span, "My Groups")), admin_groups_path), :class => active_for_action('groups', 'index') %>
<%= content_tag :li, link_to((content_tag(:span, "Public Groups")), admin_groups_public_path), :class => active_for_action('groups','public_groups') %>
<%= content_tag :li, link_to((content_tag(:span, "Create New Group")), new_admin_group_path), :class => active_for_action('groups','new') %>
<%= content_tag :li, link_to((content_tag(:span, "Categories")), admin_groups_categories_path), :class => active_for_action('groups','categories') if current_user.is_admin? %>
<% end -%>
</div>
<div class="sub-nav-block" data-icons="&#xe070;">
<h4><%= t(:academic_info) %></h4>
<%= content_tag :ul, :class => ("nav nav-list ") do -%>
@ -47,14 +57,6 @@
<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('members', 'roles','member_infos')) do -%>
<% end -%>
</div>
<div class="sub-nav-block" data-icons="&#xe070;">
<h4><%= t(:groups) %></h4>
<%= content_tag :ul, :class => ("nav nav-list ") do -%>
<%= content_tag :li, link_to((content_tag(:span, "My Groups")), admin_groups_path), :class => active_for_action('groups', 'index') %>
<%= content_tag :li, link_to((content_tag(:span, "Categories")), admin_groups_categories_path), :class => active_for_action('groups','categories') %>
<%= content_tag :li, link_to((content_tag(:span, "Create New Group")), new_admin_group_path), :class => active_for_action('groups','new') %>
<% end -%>
</div>
</div>
</nav>

8
app/views/layouts/member.html.erb
View File

@ -15,8 +15,12 @@
<%= render_orbit_bar unless @no_orbit_bar %>
<%= render :partial => 'admin/members/side_bar' unless @no_side_bar %>
<section id="main-wrap">
<% unless @no_filter && @no_breadcrumb %>
<div class="wrap-inner">
<div id="filter" class="topnav clearfix">
<% unless @no_filter %>
<div id="filter" class="topnav clearfix">
<% end %>
<% unless @no_breadcrumb %>
<ul class="breadcrumb text-info pull-left">
<% if !@role.blank? %>
<li><%= link_to( t("role"), admin_roles_path ) %> <span class="divider">/</span></li>
@ -29,8 +33,10 @@
<li class="active">All</li>
<% end %>
</ul>
<% end %>
<%= yield :right_nav %>
</div>
<% end %>
<%= yield %>
<%= javascript_include_tag "lib/pageslide.js" %>
</div>

7
config/routes.rb
View File

@ -123,9 +123,12 @@ Orbit::Application.routes.draw do
# GROUPS START HERE
get "groups/categories" => 'groups#categories'
post "groups/create_category" => 'groups#create_category'
get "groups/public" => 'groups#public_groups'
get "posts/:id" => 'groups#showpost'
resources :groups do
resources :groups do
get "newpost" => 'groups#newpost'
post "createpost" => 'groups#createpost'
end