diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js
index eb2ed07c9..1744b080f 100755
--- a/app/assets/javascripts/orbitdesktop.js
+++ b/app/assets/javascripts/orbitdesktop.js
@@ -178,7 +178,7 @@ var orbitDesktop = function(dom){
};
this.tempFunc = function(){
//o.notify("This is test notification!!","alert",2)
- $.post("/desktop/save_desktop_settings",{"id":o.desktopId,"theme":$("#change_theme").val()},function(){
+ $.post("/desktop/save_desktop_settings",{"id":o.desktopId,"theme":$('.theme_name').text()},function(){
o.notify("Settings Saved!!","success");
})
}
@@ -294,8 +294,17 @@ var orbitDesktop = function(dom){
var bindHandlers = function(){
$(".theme_list > li").click(function(){
o.changeTheme($(this).find('.theme_name').text());
- $(".theme_list > li").removeClass('thmc1').data('clicked',null);
- $(this).addClass('thmc1').data('clicked',true);
+ $(".theme_list > li")
+ .removeClass('thmc1')
+ .data('clicked',null)
+ .find('.theme_name')
+ .removeClass('thmtxt');
+ $(this)
+ .addClass('thmc1')
+ .data('clicked',true)
+ .find('.theme_name')
+ .addClass('thmtxt');
+ od.tempFunc();
});
$('.tinycanvas').each(function(){
@@ -332,6 +341,7 @@ var orbitDesktop = function(dom){
});
+ $('.theme_list li:first-child').data('clicked',true); // this line just for demo
$('.theme_list li').hover(function(){
$(this)
.addClass('thmc1')
diff --git a/app/assets/stylesheets/desktopmain.css b/app/assets/stylesheets/desktopmain.css
index 63fb12d1f..f862c7bd5 100644
--- a/app/assets/stylesheets/desktopmain.css
+++ b/app/assets/stylesheets/desktopmain.css
@@ -70,7 +70,7 @@ a:focus { outline: none; }
}
#side {
width: 156px;
- height: 540px;
+ height: 516px;
position: absolute;
top: 120px;
left: 0;
@@ -79,7 +79,7 @@ a:focus { outline: none; }
#holder {
/*overflow: hidden;
overflow-x: auto;*/
- height: 540px;
+ height: 516px;
width: auto;
position: relative;
}
@@ -176,7 +176,7 @@ a:focus { outline: none; }
z-index: 2;
padding-bottom: 12px;
}
-.holder_f {
+.holder_f .appholder {
position: absolute;
width: 100%;
height: 100%;
@@ -184,6 +184,7 @@ a:focus { outline: none; }
left: 0;
top: 0;
}
+.holder_f .appname { display: none; }
.dtitle {
font-size: 30px;
line-height: 60px;
diff --git a/app/views/desktop/desktop.html.erb b/app/views/desktop/desktop.html.erb
index 53d3db458..9b4fccd11 100755
--- a/app/views/desktop/desktop.html.erb
+++ b/app/views/desktop/desktop.html.erb
@@ -32,13 +32,13 @@
Weather
-
+
-
+
Clock
- test content
+ test content
diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb
index 8f0fda2eb..a973ce421 100644
--- a/app/views/desktop/settings.html.erb
+++ b/app/views/desktop/settings.html.erb
@@ -30,11 +30,11 @@
- - default
+ - default
- snake
- sexy
- vintage
- - Woodstock westwood allenwood
+ - natural
- chris
- Wood
- Wood
diff --git a/public/desktop_themes/natural/css/natural.css b/public/desktop_themes/natural/css/natural.css
new file mode 100755
index 000000000..84bdce6db
--- /dev/null
+++ b/public/desktop_themes/natural/css/natural.css
@@ -0,0 +1,45 @@
+/*
+Theme Color
+
+random apply to:
+.widget_fn - on hover status
+#search_app .submit
+.tile
+
+*/
+.thmc1 { background: #B6662C; }
+.thmc2 { background: #34520C; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#search_app
+
+*/
+.thmc3 { background: #FFFFFF; }
+
+/*
+sub1 Theme Color
+
+apply to:
+#rwidget
+
+*/
+.thmc4 { background: #5CA360; }
+
+
+/* Theme Text Color */
+.thmtxt, .thmtxt:hover { color: #fff; }
+.thmtxth { color: #fff; }
+
+/* Group Seprate Color */
+.g_sep { border-color: #fff; }
+
+/*
+theme bg image
+
+#thmbackground img - background
+#bgover - upon #thmbackground
+
+*/
\ No newline at end of file
diff --git a/public/desktop_themes/natural/images/background.jpg b/public/desktop_themes/natural/images/background.jpg
new file mode 100755
index 000000000..520df56c9
Binary files /dev/null and b/public/desktop_themes/natural/images/background.jpg differ
diff --git a/public/desktop_themes/natural/images/d_activities.png b/public/desktop_themes/natural/images/d_activities.png
new file mode 100755
index 000000000..b481e6768
Binary files /dev/null and b/public/desktop_themes/natural/images/d_activities.png differ
diff --git a/public/desktop_themes/natural/images/d_album.png b/public/desktop_themes/natural/images/d_album.png
new file mode 100755
index 000000000..6f0e4a171
Binary files /dev/null and b/public/desktop_themes/natural/images/d_album.png differ
diff --git a/public/desktop_themes/natural/images/d_app_manager.png b/public/desktop_themes/natural/images/d_app_manager.png
new file mode 100755
index 000000000..da09e5a4a
Binary files /dev/null and b/public/desktop_themes/natural/images/d_app_manager.png differ
diff --git a/public/desktop_themes/natural/images/d_appstore.png b/public/desktop_themes/natural/images/d_appstore.png
new file mode 100755
index 000000000..e82e745dc
Binary files /dev/null and b/public/desktop_themes/natural/images/d_appstore.png differ
diff --git a/public/desktop_themes/natural/images/d_blog.png b/public/desktop_themes/natural/images/d_blog.png
new file mode 100755
index 000000000..0bb552512
Binary files /dev/null and b/public/desktop_themes/natural/images/d_blog.png differ
diff --git a/public/desktop_themes/natural/images/d_books.png b/public/desktop_themes/natural/images/d_books.png
new file mode 100755
index 000000000..49ec0fba7
Binary files /dev/null and b/public/desktop_themes/natural/images/d_books.png differ
diff --git a/public/desktop_themes/natural/images/d_calendar.png b/public/desktop_themes/natural/images/d_calendar.png
new file mode 100755
index 000000000..26520f73a
Binary files /dev/null and b/public/desktop_themes/natural/images/d_calendar.png differ
diff --git a/public/desktop_themes/natural/images/d_certification.png b/public/desktop_themes/natural/images/d_certification.png
new file mode 100755
index 000000000..a695edce9
Binary files /dev/null and b/public/desktop_themes/natural/images/d_certification.png differ
diff --git a/public/desktop_themes/natural/images/d_clubs.png b/public/desktop_themes/natural/images/d_clubs.png
new file mode 100755
index 000000000..f22aa6dde
Binary files /dev/null and b/public/desktop_themes/natural/images/d_clubs.png differ
diff --git a/public/desktop_themes/natural/images/d_connection.png b/public/desktop_themes/natural/images/d_connection.png
new file mode 100755
index 000000000..ac6978eb3
Binary files /dev/null and b/public/desktop_themes/natural/images/d_connection.png differ
diff --git a/public/desktop_themes/natural/images/d_courses.png b/public/desktop_themes/natural/images/d_courses.png
new file mode 100755
index 000000000..3d521ddf5
Binary files /dev/null and b/public/desktop_themes/natural/images/d_courses.png differ
diff --git a/public/desktop_themes/natural/images/d_education.png b/public/desktop_themes/natural/images/d_education.png
new file mode 100755
index 000000000..fa366a174
Binary files /dev/null and b/public/desktop_themes/natural/images/d_education.png differ
diff --git a/public/desktop_themes/natural/images/d_experience.png b/public/desktop_themes/natural/images/d_experience.png
new file mode 100755
index 000000000..f182981bc
Binary files /dev/null and b/public/desktop_themes/natural/images/d_experience.png differ
diff --git a/public/desktop_themes/natural/images/d_files.png b/public/desktop_themes/natural/images/d_files.png
new file mode 100755
index 000000000..99299d80c
Binary files /dev/null and b/public/desktop_themes/natural/images/d_files.png differ
diff --git a/public/desktop_themes/natural/images/d_home.png b/public/desktop_themes/natural/images/d_home.png
new file mode 100755
index 000000000..67f4a2272
Binary files /dev/null and b/public/desktop_themes/natural/images/d_home.png differ
diff --git a/public/desktop_themes/natural/images/d_homework.png b/public/desktop_themes/natural/images/d_homework.png
new file mode 100755
index 000000000..28f1b2666
Binary files /dev/null and b/public/desktop_themes/natural/images/d_homework.png differ
diff --git a/public/desktop_themes/natural/images/d_honors.png b/public/desktop_themes/natural/images/d_honors.png
new file mode 100755
index 000000000..778cfa842
Binary files /dev/null and b/public/desktop_themes/natural/images/d_honors.png differ
diff --git a/public/desktop_themes/natural/images/d_journal_p.png b/public/desktop_themes/natural/images/d_journal_p.png
new file mode 100755
index 000000000..5f0e27576
Binary files /dev/null and b/public/desktop_themes/natural/images/d_journal_p.png differ
diff --git a/public/desktop_themes/natural/images/d_labs.png b/public/desktop_themes/natural/images/d_labs.png
new file mode 100755
index 000000000..fcb929e6b
Binary files /dev/null and b/public/desktop_themes/natural/images/d_labs.png differ
diff --git a/public/desktop_themes/natural/images/d_landt.png b/public/desktop_themes/natural/images/d_landt.png
new file mode 100755
index 000000000..c003ec8d5
Binary files /dev/null and b/public/desktop_themes/natural/images/d_landt.png differ
diff --git a/public/desktop_themes/natural/images/d_mypage.png b/public/desktop_themes/natural/images/d_mypage.png
new file mode 100755
index 000000000..9d466a959
Binary files /dev/null and b/public/desktop_themes/natural/images/d_mypage.png differ
diff --git a/public/desktop_themes/natural/images/d_orbit.png b/public/desktop_themes/natural/images/d_orbit.png
new file mode 100755
index 000000000..e5852979e
Binary files /dev/null and b/public/desktop_themes/natural/images/d_orbit.png differ
diff --git a/public/desktop_themes/natural/images/d_patents.png b/public/desktop_themes/natural/images/d_patents.png
new file mode 100755
index 000000000..5b08a5293
Binary files /dev/null and b/public/desktop_themes/natural/images/d_patents.png differ
diff --git a/public/desktop_themes/natural/images/d_personal.png b/public/desktop_themes/natural/images/d_personal.png
new file mode 100755
index 000000000..a0a2140bf
Binary files /dev/null and b/public/desktop_themes/natural/images/d_personal.png differ
diff --git a/public/desktop_themes/natural/images/d_publication.png b/public/desktop_themes/natural/images/d_publication.png
new file mode 100755
index 000000000..a3220b864
Binary files /dev/null and b/public/desktop_themes/natural/images/d_publication.png differ
diff --git a/public/desktop_themes/natural/images/d_research.png b/public/desktop_themes/natural/images/d_research.png
new file mode 100755
index 000000000..691ebe255
Binary files /dev/null and b/public/desktop_themes/natural/images/d_research.png differ
diff --git a/public/desktop_themes/natural/images/d_research_d.png b/public/desktop_themes/natural/images/d_research_d.png
new file mode 100755
index 000000000..4301e5731
Binary files /dev/null and b/public/desktop_themes/natural/images/d_research_d.png differ
diff --git a/public/desktop_themes/natural/images/d_research_p.png b/public/desktop_themes/natural/images/d_research_p.png
new file mode 100755
index 000000000..d3ba06cdb
Binary files /dev/null and b/public/desktop_themes/natural/images/d_research_p.png differ
diff --git a/public/desktop_themes/natural/images/d_sections.png b/public/desktop_themes/natural/images/d_sections.png
new file mode 100755
index 000000000..6832e3d0f
Binary files /dev/null and b/public/desktop_themes/natural/images/d_sections.png differ
diff --git a/public/desktop_themes/natural/images/d_seminar_p.png b/public/desktop_themes/natural/images/d_seminar_p.png
new file mode 100755
index 000000000..36cfb59ad
Binary files /dev/null and b/public/desktop_themes/natural/images/d_seminar_p.png differ
diff --git a/public/desktop_themes/natural/images/d_settings.png b/public/desktop_themes/natural/images/d_settings.png
new file mode 100755
index 000000000..0ca9b18de
Binary files /dev/null and b/public/desktop_themes/natural/images/d_settings.png differ
diff --git a/public/desktop_themes/natural/images/d_working.png b/public/desktop_themes/natural/images/d_working.png
new file mode 100755
index 000000000..9bc389819
Binary files /dev/null and b/public/desktop_themes/natural/images/d_working.png differ
diff --git a/public/desktop_themes/natural/settings/natural.json b/public/desktop_themes/natural/settings/natural.json
new file mode 100755
index 000000000..21c4eee1e
--- /dev/null
+++ b/public/desktop_themes/natural/settings/natural.json
@@ -0,0 +1,39 @@
+{
+ "css":"natural.css",
+ "background":"background.jpg",
+ "tilecolor":["thmc1","thmc2"],
+ "icons":{
+ "home":"d_home.png",
+ "app_manager":"d_app_manager.png",
+ "sections":"d_sections.png",
+ "settings":"d_settings.png",
+ "publication":"d_publication.png",
+ "journal_p":"d_journal_p.png",
+ "seminar_p":"d_seminar_p.png",
+ "books":"d_books.png",
+ "research":"d_research.png",
+ "research_d":"d_research_d.png",
+ "research_p":"d_research_p.png",
+ "patents":"d_patents.png",
+ "labs":"d_labs.png",
+ "experience":"d_experience.png",
+ "working":"d_working.png",
+ "education":"d_education.png",
+ "honors":"d_honors.png",
+ "activities":"d_activities.png",
+ "clubs":"d_clubs.png",
+ "landt":"d_landt.png",
+ "courses":"d_courses.png",
+ "homework":"d_homework.png",
+ "certification":"d_certification.png",
+ "personal":"d_personal.png",
+ "mypage":"d_mypage.png",
+ "blog":"d_blog.png",
+ "album":"d_album.png",
+ "calendar":"d_calendar.png",
+ "files":"d_files.png",
+ "orbit":"d_orbit.png",
+ "connection":"d_connection.png",
+ "appstore":"d_appstore.png"
+ }
+ }
\ No newline at end of file
diff --git a/public/desktop_widgets/clock/clock.css b/public/desktop_widgets/clock/clock.css
index 7bba2ba0b..8790b137b 100755
--- a/public/desktop_widgets/clock/clock.css
+++ b/public/desktop_widgets/clock/clock.css
@@ -1,6 +1,6 @@
.clock{
/* The .clock div. Created dynamically by jQuery */
- background-color:#252525;
+ /*background-color:#252525;*/
height:200px;
width:200px;
position:relative;
@@ -25,7 +25,7 @@
.clock .bg, .clock .front{
width:100px;
height:200px;
- background-color:#252525;
+ /*background-color:#252525;*/
position:absolute;
top:0;
}
diff --git a/public/desktop_widgets/clock/index.html.erb b/public/desktop_widgets/clock/index.html.erb
index 8fda567ae..d51d4fef7 100755
--- a/public/desktop_widgets/clock/index.html.erb
+++ b/public/desktop_widgets/clock/index.html.erb
@@ -1,7 +1,8 @@
+