'+tile.title+'
'+tile.title+'
'+tile.title+'
'+tile.title+'
'+app.title+'
'+app.title+'
'+app.title+'
"+account.email+"
")
- $ul.find("input[type=password]").replaceWith("••••••
");
- $ul.find("a[for=new]").text("Edit").attr("for","edit");
- $ul.find("a[for=delete]").show();
- $ul.find(".c_status").text("Connected").addClass("c_status_on");
- })
- bindHandlers();
- })
+ // $.getJSON("/otheraccounts/getaccounts",function(accounts){
+ // $.each(accounts,function(i,account){
+ // $ul = $("#"+account.type+"_connection");
+ // $ul.find("input[type=text]").replaceWith(""+account.email+"
")
+ // $ul.find("input[type=password]").replaceWith("••••••
");
+ // $ul.find("a[for=new]").text("Edit").attr("for","edit");
+ // $ul.find("a[for=delete]").show();
+ // $ul.find(".c_status").text("Connected").addClass("c_status_on");
+ // })
+ // bindHandlers();
+ // })
}
@@ -1582,6 +1486,7 @@ var orbitDesktop = function(dom){
}else{
li.find(".not_status").html("Install on "+o.sectionList[0].name+" "+o.sectionList[1].name+" "+o.sectionList[2].name+" "+o.sectionList[3].name)+"";
}
+ //console.log(section_names);
column.find("ul").append(li);
if(counter%4==0){
$("#apps_store #widget_list").append(column);
@@ -1609,9 +1514,9 @@ var orbitDesktop = function(dom){
this.loadWallpaper = function(wallpaper){ // this is to load new wallpaper
wallpapernm = (!wallpaper) ? o.themesettings.background : wallpaper;
if(!wallpaper){
- $("#thmbackground").css("background-image","url(/"+o.themefolder+"/"+o.theme+"/images/"+wallpapernm+")");
+ $("#thmbackground").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+wallpapernm);
} else {
- $("#thmbackground").css("background-image","url("+o.wallpaperPath+wallpaper+")");
+ $("#thmbackground").attr("src",o.wallpaperPath+wallpaper);
}
};
@@ -1627,11 +1532,11 @@ var orbitDesktop = function(dom){
loading = ' Loading
';
$.each(elements,function(){
var widget = $(this),
- widget_holder = $(this).find('.appholder'),
- widget_style = (widget.find('.widget_style').length > 0) ? '' : '';
+ widget_holder = $(this).find('.appholder')
+ // widget_style = (widget.find('.widget_style').length > 0) ? '' : '';
if(widget.attr("data-category")=="widget"){
var widgetname = widget.attr("data-content");
- widget_holder.before(widget_style).empty();
+ // widget_holder.before(widget_style).empty();
$.getScript(widget.attr("js-link")).done(function(){
// widget.find(".appholder").load(widget.attr("data-content"));
$.ajax({
@@ -1707,7 +1612,6 @@ var orbitDesktop = function(dom){
// ** not sure to update canvas here ( $.tinyscrollbar_update() )
var sw = 0,
$simple_layout = $('#content .overview[content-layout=simple]');
-
if($simple_layout.find(".s_column").length > 0){
$simple_layout.each(function(){
$(this).find(".s_column").filter(":visible").each(function(){
@@ -1716,6 +1620,9 @@ var orbitDesktop = function(dom){
$simple_layout.css('width',sw);
});
}
+ // if($simple_layout.find(".s_column").length > 0){
+ // $simple_layout.css('width',sw);
+ // }
};
this.simple_drop_down = function(){
// simple dropdown menu
@@ -1734,64 +1641,46 @@ var orbitDesktop = function(dom){
};
this.simple_tab = function(){
// tab
- var active = 'thmc2 thmtxt',
- normal = 'admtxt admbg';
+ var $anchor = $('.s_tab a[href*=#]'),
+ $tabcontent = $('.st_c');
- $('.s_tab').each(function(){
- var $anchor = $(this).find('a[href*=#]'),
- $current_tab = $anchor.filter('[data-active="true"]');
-
- // initialize
- $current_tab.switchClass(normal,active,300);
- $($current_tab.attr('href')).show();
-
- $anchor.each(function(){
- $(this).click(function(){
- var target = $(this).attr('href');
- $anchor.switchClass(active,normal,200);
- $(this)
- .switchClass(normal,active,200)
- .parents('.s_tab')
- .find('a[href*=#]').not('a[href*='+target+']')
- .switchClass(active,normal,200);
- $(target)
- .siblings('.st_c')
- .hide()
- .end()
- .show();
- if( $(target).parents('.tinycanvas').length > 0 ){
- $(target).parents('.tinycanvas').tinyscrollbar_update();
- }
- return false;
- });
+ $anchor.each(function(){
+ $(this).click(function(){
+ var target = $(this).attr('href');
+ $anchor.removeClass('thmc2 thmtxt admtxt admbg').addClass('admtxt admbg');
+ $(this).toggleClass('thmc2 thmtxt admtxt admbg');
+ $tabcontent.hide();
+ $(target).show();
+ if( $('.tinycanvas').length > 0 ){
+ $('.tinycanvas').tinyscrollbar_update();
+ }
+ return false;
});
});
};
this.simple_switch = function(func){
$('.s_switch').each(function(){
- var switcher = $(this).find('.s_switch_switcher'),
- checkbox = $(this).find('input[type=checkbox]'),
- status = $(this).find('.s_switch_status'),
+ var $switcher = $(this).find('.s_switch_switcher'),
+ $checkbox = $(this).find('input[type=checkbox]'),
+ $status = $(this).find('.s_switch_status'),
toggle = '',
- text_on = status.attr('status-on'),
- text_off = status.attr('status-off'),
- status_on = 'thmc2',
- status_off = 'admbg2',
+ status_on = $status.attr('status-on'),
+ status_off = $status.attr('status-off'),
ini, set;
- ini = switcher.hasClass(status_off) ? null : switcher.addClass(status_off);
- ini = switcher.find('.s_switch_toggle').length < 1 ? checkbox.after(toggle) : null;
- set = checkbox.is(':checked') ? status.text(text_on) : status.text(text_off);
- checkbox.unbind().change(function(){
+ ini = ($switcher.hasClass('admbg2')) ? null : $switcher.addClass('admbg2');
+ ini = ($switcher.find('.s_switch_toggle').length < 1) ? $checkbox.after(toggle) : null;
+ set = ($checkbox.is(':checked')) ? $status.text(status_on) : $status.text(status_off);
+ $checkbox.unbind().change(function(){
var v = $(this).attr('checked');
switch (v) {
case 'checked':
- switcher.switchClass(status_off,status_on);
- status.text(text_on);
+ $switcher.switchClass('admbg2','thmc2');
+ $status.text(status_on);
break;
case undefined:
- switcher.switchClass(status_on,status_off);
- status.text(text_off);
+ $switcher.switchClass('thmc2','admbg2');
+ $status.text(status_off);
break;
}
if(typeof func == "function"){
@@ -1886,17 +1775,19 @@ var orbitDesktop = function(dom){
fields = fields.replace("]","");
fields = fields.replace("[","");
fields = fields.split(",");
+
options.formatResult = function(data){
var markup = "";
var x = 0;
- for(i in fields){
- if(x > 0)markup += " " + seperator + " ";
- x++;
+ for(i = 0;i < fields.length; i++){
+
+ if(i > 0)markup += " " + seperator + " ";
if(data[fields[i]])
markup += data[fields[i]];
else
markup += fields[i] + " not available";
}
+
return markup;
}
}
diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb
index ea930cd52..8ecb4ae7c 100644
--- a/app/controllers/desktop_controller.rb
+++ b/app/controllers/desktop_controller.rb
@@ -42,6 +42,7 @@ class DesktopController< ApplicationController
end
def connections
+ @url = "http://fb.tp.rulingcom.com/login?callback=http://harry.tp.rulingcom.com/facebook/register_fb?user="+current_user.id.to_s
render "desktop/settings/connections", :layout => false
end
@@ -149,9 +150,11 @@ class DesktopController< ApplicationController
def widget_layout
widget = DesktopWidget.find(params[:id])
- # link = ''
+ # link = ''
+ css = widget.css_default.content;
+ css = ""
content = widget.widget_layout.body
- dhtml = content
+ dhtml = css + content
render :text => dhtml.html_safe
end
@@ -314,5 +317,7 @@ class DesktopController< ApplicationController
b = {"success"=>"true"}
render :json=>b.to_json
end
+
+
end
diff --git a/app/controllers/facebook_controller.rb b/app/controllers/facebook_controller.rb
new file mode 100644
index 000000000..c79ed811d
--- /dev/null
+++ b/app/controllers/facebook_controller.rb
@@ -0,0 +1,31 @@
+require "net/http"
+require "uri"
+require 'json'
+
+class FacebookController< ApplicationController
+
+ def register_fb
+ user = User.find(params[:user])
+ if !user.facebook
+ user.build_facebook(fb_identifier: params[:identifier],connected: true)
+ user.save!
+ end
+ render :json=>{"success"=>true,"user"=>user.facebook.fb_identifier}.to_json
+ end
+
+ def get_friends
+ @url = "http://fb.tp.rulingcom.com/get_friends?identifier=" + current_user.facebook.fb_identifier
+ uri = URI.parse(@url)
+ http = Net::HTTP.new(uri.host, uri.port)
+ request = Net::HTTP::Get.new(uri.request_uri)
+ response = http.request(request)
+ friends = response.body
+ friends = JSON.parse(friends)
+ output = Array.new
+ friends.each do |friend|
+ output << friend['name']
+ end
+ render :json=>{"count"=>friends.count,"friends"=>output}.to_json
+ end
+
+end
\ No newline at end of file
diff --git a/app/models/design/css_default.rb b/app/models/design/css_default.rb
index bd4baa8ca..eff8491e8 100644
--- a/app/models/design/css_default.rb
+++ b/app/models/design/css_default.rb
@@ -4,5 +4,8 @@ class CssDefault < Stylesheet
# belongs_to :desktop_widget
belongs_to :css, polymorphic: true
+ def content
+ self.file.read.force_encoding("UTF-8") rescue ''
+ end
end
diff --git a/app/models/desktop/facebook.rb b/app/models/desktop/facebook.rb
new file mode 100644
index 000000000..c8b6b4c8d
--- /dev/null
+++ b/app/models/desktop/facebook.rb
@@ -0,0 +1,9 @@
+class Facebook
+ include Mongoid::Document
+ include Mongoid::Timestamps
+
+ field :fb_identifier
+ field :connected, type: Boolean
+
+ belongs_to :user
+end
\ No newline at end of file
diff --git a/app/models/user/user.rb b/app/models/user/user.rb
index a5da959d4..0c547fd46 100644
--- a/app/models/user/user.rb
+++ b/app/models/user/user.rb
@@ -26,6 +26,7 @@ class User
has_many :managing_apps,:class_name => "AppManager", :dependent => :destroy
has_one :desktop, :autosave => true, :dependent => :destroy
+ has_one :facebook, :autosave => true, :dependent => :destroy
has_many :other_accounts, :autosave => true, :dependent => :destroy
# has_many :journals, :autosave => true, :dependent => :destroy
# has_many :papers, :autosave => true, :dependent => :destroy
diff --git a/app/views/desktop/index.html.erb b/app/views/desktop/index.html.erb
index 354e9049e..25bcb679a 100644
--- a/app/views/desktop/index.html.erb
+++ b/app/views/desktop/index.html.erb
@@ -4,7 +4,6 @@
-
-
+
+ Connect FaceBook
+
+ Get Friends
+
diff --git a/config/routes.rb b/config/routes.rb
index d511b89b1..303722484 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -289,6 +289,9 @@ Orbit::Application.routes.draw do
match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload'
match '/desktop_orbit/gettimelinespan' => 'desktop_orbit#gettimelinespan'
+ match "/facebook/register_fb" => "facebook#register_fb"
+ match "/facebook/get_friends" => "facebook#get_friends"
+
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#create_journal'
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
diff --git a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
index f9b24090c..5440d972d 100644
--- a/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
+++ b/vendor/built_in_modules/gallery/app/controllers/panel/gallery/back_end/albums_controller.rb
@@ -20,6 +20,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
@c = []
@ac = @c.inject(@categories,:<<)
@album_category = @albums.map { |a| @categories.include?(a.category_id) }
+
end
def show
@@ -45,6 +46,8 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
redirect_to panel_gallery_back_end_albums_path
end
+
+
def destroy
album = GalleryAlbum.find(params[:id])
album.destroy
@@ -58,7 +61,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
@images = @album.gallery_images.all
@album_name = @album.name_translations
@cover = @album.cover
- @tags = get_tags
+ @tags = GalleryTag.all
end
end
@@ -74,13 +77,21 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
output = Array.new
albums.each do |album|
- tag_names = Tag.find(album.tagged_ids).map{|t| t.name}
+ tag_names = Array.new
+ album.tag_ids.each do |tag|
+ tag_names << GalleryTag.find(tag)[I18n.locale]
+ end
+ if album.cover_path
+ cover_path = album.cover_path
+ else
+ cover_path = "/assets/gallery/default.jpg"
+ end
output << {
- album_cover_file: "http://#{request.host_with_port}#{album.cover_path}",
+ album_cover_file: "http://#{request.host_with_port}"+cover_path,
album_name: album.name,
album_tag_names: tag_names,
- album_link:"http://#{request.host_with_port}#{panel_gallery_back_end_album_get_imgs_json_path(album)}"
+ album_link:"http://#{request.host_with_port}#{panel_gallery_back_end_album_get_imgs_json_path(album)}",
}
end
@@ -93,7 +104,11 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
output = Array.new
images.each do |image|
- tags = Tag.find(image.tagged_ids).map{|t| t.name}
+ tags = Array.new
+
+ image.tag_ids.each do |tag|
+ tags << GalleryTag.find(tag)[I18n.locale]
+ end
output << {
image_title: image.title,
@@ -112,7 +127,10 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
@images = @album.gallery_images.all
@output = Array.new
@images.each do |values|
- tags = Tag.find(values.tagged_ids).map{|t| t.name}
+ tags = Array.new
+ values.tag_ids.each do |tag|
+ tags << GalleryTag.find(tag)[I18n.locale]
+ end
@output << { _id: values.id,
theater_link: panel_gallery_back_end_album_image_path(values),
description: values.description,
@@ -130,8 +148,8 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
if @authenticated
render :json=>{"images" => @output, "tags" => @album.tag_ids}.to_json
else
- @album.tagged_ids.each do |tag|
- @tag_names << Tag.find(tag).name
+ @album.tag_ids.each do |tag|
+ @tag_names << GalleryTag.find(tag)[I18n.locale]
end
render :json=>{"images" => @output, "tags" => @album.tag_ids, "tag_names" => @tag_names}.to_json
end
@@ -181,7 +199,7 @@ class Panel::Gallery::BackEnd::AlbumsController < OrbitBackendController
if params['delete_cover'] == "true"
@album.update_attributes(:cover=>"default")
end
- @tags = get_tags
+ @tags = GalleryTag.all
render :action => :show
end
end
diff --git a/vendor/built_in_modules/gallery/config/routes.rb b/vendor/built_in_modules/gallery/config/routes.rb
index dd204f208..22f6ce03e 100644
--- a/vendor/built_in_modules/gallery/config/routes.rb
+++ b/vendor/built_in_modules/gallery/config/routes.rb
@@ -4,6 +4,7 @@ Rails.application.routes.draw do
namespace :gallery do
namespace :back_end do
match "get_albums" => "albums#get_albums"
+
match "upload_image" => "albums#upload_image"
match "save_tags" => "tags#save_tags"
match "albums/save_tags" => "tags#save_tags"
diff --git a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
index 936a94ef6..3f3119ea7 100644
--- a/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
+++ b/vendor/built_in_modules/location/app/controllers/panel/location/back_end/locations_controller.rb
@@ -2,7 +2,7 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
include AdminHelper
before_filter :force_order_for_visitor,:only => [:index, :new, :edit, :create, :update, :delete]
- before_filter :force_order_for_user,:except => [:get_locations,:index]
+ before_filter :force_order_for_user,:except => [:get_locations,:index,:get_categories]
def index
@location_infos = LocationInfo.all
@@ -74,6 +74,14 @@ class Panel::Location::BackEnd::LocationsController < OrbitBackendController
description: location.description }
end
- render :json => JSON.pretty_generate({location: @data})
+ render :json => JSON.pretty_generate(@data)
+ end
+
+ def get_categories
+ @data = Array.new
+ @data << { name: "Department",
+ link: "http://#{request.host_with_port}"+"/panel/location/back_end/locations/get_locations?locale=en" }
+
+ render :json => JSON.pretty_generate(@data)
end
end
diff --git a/vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb b/vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
index 5ad721e6a..b5bc2edd7 100644
--- a/vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
+++ b/vendor/built_in_modules/location/app/controllers/panel/locations/back_end/locations_controller.rb
@@ -74,4 +74,11 @@ class Panel::Locations::BackEnd::LocationsController < OrbitBackendController
#render :json => {location: @data}.to_json
end
+ def get_categories
+ @data = Array.new
+ @data << { name: "Department",
+ link: "http://#{request.host_with_port}"+"/panel/location/back_end/location/get_locations" }
+
+ render :json => JSON.pretty_generate(@data)
+ end
end
diff --git a/vendor/built_in_modules/location/config/routes.rb b/vendor/built_in_modules/location/config/routes.rb
index f7332d21b..dac4a4237 100644
--- a/vendor/built_in_modules/location/config/routes.rb
+++ b/vendor/built_in_modules/location/config/routes.rb
@@ -4,6 +4,7 @@ Rails.application.routes.draw do
namespace :back_end do
match "locations/get_locations" => "locations#get_locations"
+ match "locations/get_categories" => "locations#get_categories"
resources :locations
end