new icons

app/assets/javascripts/orbitdesktop.js

@@ -239,6 +239,35 @@ var orbitDesktop = function(dom){
 		$("#home_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.home);
 		$("#app_manager_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.app_manager);
 		$("#sections_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.sections);
+		$("#settings_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.settings);
+		$("#publication_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.publication);
+		$("#journal_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.journal_p);
+		$("#seminar_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.seminar_p);
+		$("#books_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.books);
+		$("#research_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research);
+		$("#research_d_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research_d);
+		$("#research_p_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.research_p);
+		$("#patents_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.patents);
+		$("#labs_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.labs);
+		$("#experience_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.experience);
+		$("#working_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.working);
+		$("#education_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.education);
+		$("#honors_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.honors);
+		$("#activities_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.activities);
+		$("#clubs_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.clubs);
+		$("#landt_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.landt);
+		$("#courses_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.courses);
+		$("#homework_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.homework);
+		$("#certification_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.certification);
+		$("#personal_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.personal);
+		$("#mypage_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.mypage);
+		$("#blog_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.blog);
+		$("#album_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.album);
+		$("#calendar_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.calendar);
+		$("#files_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.files);
+		$("#orbit_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.orbit);
+		$("#connection_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.connection);
+		$("#appstore_icon").attr("src","/"+o.themefolder+"/"+o.theme+"/images/"+o.themesettings.icons.appstore);
 	}
 	o.initialize();
 }

app/assets/stylesheets/desktop.css

@@ -2,9 +2,8 @@
  *This is a manifest file that'll automatically include all the stylesheets available in this directory
  *and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  *the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require reset
  *= require style
-*= require bootstrap
+ *= require bootstrap
  *= require bootstrap-orbit
  *= require desktopmain
 */

app/assets/stylesheets/desktopmain.css

@@ -1,5 +1,52 @@
 @import url(http://fonts.googleapis.com/css?family=Cuprum);
-@import url(reset.css);
+/* http://meyerweb.com/eric/tools/css/reset/ 
+   v2.0 | 20110126
+   License: none (public domain)
+*/
+
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed, 
+figure, figcaption, footer, header, hgroup, 
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	font-size: 100%;
+	font: inherit;
+	vertical-align: baseline;
+}
+/* HTML5 display-role reset for older browsers */
+article, aside, details, figcaption, figure, 
+footer, header, hgroup, menu, nav, section {
+	display: block;
+}
+body {
+	line-height: 1;
+}
+ol, ul {
+	list-style: none;
+}
+blockquote, q {
+	quotes: none;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: '';
+	content: none;
+}
+table {
+	border-collapse: collapse;
+	border-spacing: 0;
+}
 
 /* basic setting */
 body {
@@ -31,7 +78,6 @@ a { text-decoration: none; }
 	}
 #rwidget {
 	height: 516px;
-	overflow: hidden;
 	}
 .widget_fn {
 	display: block;
@@ -102,6 +148,7 @@ a { text-decoration: none; }
 .section_slc li:hover { background-color: #F0F0F0; }
 .admbg { background-color: #fff; }
 .admtxt { color: #666; }
+.admtxt:hover { color: #666; }
 .hfn {
 	font-size: 15px;
 	line-height: 36px;

app/views/desktop/index.html.erb

@@ -1,8 +1,60 @@
 <div id="side">
 	<div id="rwidget" class="wh3 thmc4">
-		<a href="desktop" class="widget_fn wh3 hh3" id='desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="home_icon" width="30" height="30"/></span></a>
+		<ul class="docklist">
-		<a href="app_manager" class="widget_fn wh3 hh3" id="app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="app_manager_icon" width="30" height="30"/></span></a>
+			<li><a href="desktop" class="widget_fn wh3 hh3" id='d_desktop' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="home_icon" width="30" height="30"/></span></a>
-		<a href="sections" class="widget_fn wh3 hh3" id="sections" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="sections_icon" width="30" height="30"/></span></a>
+				<ul>
+					<li><a href="app_manager" class="widget_fn wh3 hh3" id="d_app_manager" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="app_manager_icon" width="30" height="30"/></span></a></li>
+					<li><a href="sections" class="widget_fn wh3 hh3" id="d_sections" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="sections_icon" width="30" height="30"/></span></a></li>
+					<li><a href="settings" class="widget_fn wh3 hh3" id="d_settings" onclick="return false;"><span class="widget_icon"><img src="" alt="" id="settings_icon" width="30" height="30"/></span></a></li>
+				</ul>
+			</li>
+			<li><a href="publication" class="widget_fn wh3 hh3" id='d_publication' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="publication_icon" width="30" height="30"/></span></a>
+				<ul>
+					<li><a href="journal_p" class="widget_fn wh3 hh3" id='d_journal_p' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="journal_p_icon" width="30" height="30"/></span></a></li>
+					<li><a href="seminar_p" class="widget_fn wh3 hh3" id='d_seminar_p' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="seminar_p_icon" width="30" height="30"/></span></a></li>
+					<li><a href="books" class="widget_fn wh3 hh3" id='d_books' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="books_icon" width="30" height="30"/></span></a></li>
+				</ul>
+			</li>
+			<li><a href="research" class="widget_fn wh3 hh3" id='d_research' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="research_icon" width="30" height="30"/></span></a>
+				<ul>
+					<li><a href="research_d" class="widget_fn wh3 hh3" id='d_research_d' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="research_d_icon" width="30" height="30"/></span></a></li>
+					<li><a href="research_p" class="widget_fn wh3 hh3" id='d_research_p' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="research_p_icon" width="30" height="30"/></span></a></li>
+					<li><a href="patents" class="widget_fn wh3 hh3" id='d_patents' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="patents_icon" width="30" height="30"/></span></a></li>
+					<li><a href="labs" class="widget_fn wh3 hh3" id='d_labs' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="labs_icon" width="30" height="30"/></span></a></li>
+				</ul>
+			</li>
+			<li><a href="experience" class="widget_fn wh3 hh3" id='d_experience' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="experience_icon" width="30" height="30"/></span></a>
+				<ul>
+					<li><a href="working" class="widget_fn wh3 hh3" id='d_working' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="working_icon" width="30" height="30"/></span></a></li>
+					<li><a href="education" class="widget_fn wh3 hh3" id='d_education' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="education_icon" width="30" height="30"/></span></a></li>
+					<li><a href="honors" class="widget_fn wh3 hh3" id='d_honors' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="honors_icon" width="30" height="30"/></span></a></li>
+					<li><a href="activities" class="widget_fn wh3 hh3" id='d_activities' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="activities_icon" width="30" height="30"/></span></a></li>
+					<li><a href="clubs" class="widget_fn wh3 hh3" id='d_clubs' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="clubs_icon" width="30" height="30"/></span></a></li>
+				</ul>
+			</li>
+			<li><a href="landt" class="widget_fn wh3 hh3" id='d_landt' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="landt_icon" width="30" height="30"/></span></a>
+				<ul>
+					<li><a href="courses" class="widget_fn wh3 hh3" id='d_courses' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="courses_icon" width="30" height="30"/></span></a></li>
+					<li><a href="homework" class="widget_fn wh3 hh3" id='d_homework' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="homework_icon" width="30" height="30"/></span></a></li>
+					<li><a href="certification" class="widget_fn wh3 hh3" id='d_certification' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="certification_icon" width="30" height="30"/></span></a></li>
+				</ul>
+			</li>
+			<li><a href="personal" class="widget_fn wh3 hh3" id='d_personal' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="personal_icon" width="30" height="30"/></span></a>
+				<ul>
+					<li><a href="mypage" class="widget_fn wh3 hh3" id='d_mypage' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="mypage_icon" width="30" height="30"/></span></a></li>
+					<li><a href="blog" class="widget_fn wh3 hh3" id='d_blog' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="blog_icon" width="30" height="30"/></span></a></li>
+					<li><a href="album" class="widget_fn wh3 hh3" id='d_album' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="album_icon" width="30" height="30"/></span></a></li>
+					<li><a href="calendar" class="widget_fn wh3 hh3" id='d_calendar' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="calendar_icon" width="30" height="30"/></span></a></li>
+					<li><a href="files" class="widget_fn wh3 hh3" id='d_files' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="files_icon" width="30" height="30"/></span></a></li>
+				</ul>
+			</li>
+			<li><a href="orbit" class="widget_fn wh3 hh3" id='d_orbit' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="orbit_icon" width="30" height="30"/></span></a>
+				<ul>
+					<li><a href="connection" class="widget_fn wh3 hh3" id='d_connection' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="connection_icon" width="30" height="30"/></span></a></li>
+				</ul>
+			</li>
+			<li><a href="appstore" class="widget_fn wh3 hh3" id='d_appstore' onclick="return false;"><span class="widget_icon"><img src="" alt="" id="appstore_icon" width="30" height="30"/></span></a></li>
+		</ul>
 	</div>
 </div>
 <div id="container">

public/desktop_themes/default/settings/default.json

@@ -1 +1,39 @@
-{"css":"default.css","background":"background.jpg","tilecolor":["thmc1","thmc2"],"icons":{"home":"home.png","app_manager":"apps.png","sections":"sections.png"}}
+{
+	"css":"default.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"
+		}
+	}