Merge branch 'publication' of https://github.com/Rulingcom/orbit into publication

* 'publication' of https://github.com/Rulingcom/orbit:
  br fixed
  journal update

app/assets/javascripts/desktop/journal_pages.js.erb

@@ -262,7 +262,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
           main: '.tinycanvas',
           fill: '.s_grid_con'
         })
-        $("a.bt-edit").click(function(){
+         $("div[container=true]").unbind(".editcoauthor").on("click.editcoauthor", "a.bt-edit", function(){
           $.ajax({
               url : $(this).attr("href"),
               type : "get",
@@ -281,6 +281,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
             return false;
          })
         $("div[container=true]").unbind(".delete").on("click.delete","a.bt-delete",function(){
+
           var delurl = $(this).attr("href");
           var parent = $(this).parent().parent();
           o.confirm({
@@ -345,7 +346,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ //
   this.initializeJournalPapers.coauthorRelationForm = function(data){
     if(data.success){
         o.notify(data.msg,"success");
-        $("#co_author_relation_table tbody").prepend(data.newvalue);
+        $("#co_author_relation_table tbody").html(data.newvalue);
       }else{
         o.notify(data.msg,"alert");
     }

app/assets/javascripts/orbitdesktopAPI.js

@@ -26,7 +26,7 @@ var orbitDesktopAPI = function(){
 			break;
 		}
 		$notify.find("img#note_img").attr("src",o.notifyImgPath+img);
-		$notify.find(".note_message").text(msg);
+		$notify.find(".note_message").html(msg);
 		n_height = $notify.outerHeight();
 		if(!time)time=5000; else time=time*1000;
 		$notify

app/assets/stylesheets/desktopmain.css

@@ -736,6 +736,23 @@ a:focus { outline: none; }
 #paper_add .f_w { width: 336px; }
 #paper_add label { margin-right: 0; }
 
+/* Journal Journal list */
+#journal_list .g_col {
+	width: 416px;
+}
+#journal_list .g_col {
+	float: left;
+	height: 456px;
+	margin-left: 12px;
+	padding-left: 12px;
+	border-left: solid 1px #EEE;
+}
+#journal_list .g_col:first-child {
+	margin-left: 0;
+	padding-left: 0;
+	border: none;
+}
+
 /* App */
 .app_frame {
 	margin: 48px 96px 48px 156px;

app/assets/stylesheets/orbit-bar.css.erb

@@ -143,6 +143,7 @@
 	display: inline-block;
 	line-height: 22px;
 	padding: 0 10px;
+	vertical-align: top;
 }
 #orbit-bar .nav img.member-img {
 	display: inline-block;

app/views/desktop/journal_lists/index.html.erb

@@ -1,11 +1,25 @@
-<h1>journal_title -- journal_level</h1>
+<div class="toolbar hh2">
-<div class="tinycanvas">
+  <div class="hh2 hp sdm">
+    <div class="sdm_t hh2">Share</div>
+    <div class="admbg sdm_o">
+      <ul>
+        <li><a class="hp hh2 admtxt" href="">Friends</a></li>
+        <li><a class="hp hh2 admtxt" href="">Private</a></li>
+        <li><a class="hp hh2 admtxt" href="">Group</a></li>
+      </ul>
+    </div>
+  </div>
+  <div class="hh2 hp sdm">
+    <div class="sdm_t hh2"><span class="icon-question-sign"></span></div>
+  </div>
+</div>
+<div id="journal_list" class="tinycanvas vp">
   <div class="scrollbar sb_h vp"><div class="track"><div class="thumb thmc2"><div class="end"></div></div></div></div>
   <div class="viewport">
     <div class="overview">
         <% @journal_lists.each_with_index do |journal_list,i| %>
           <% if ( i % 8 ) == 0 %>
-            <div class="g_col w4">
+            <div class="g_col">
             <ul>
               <% end %>
               <li class="s_grid_row">

app/views/desktop/journal_pages/_form.html.erb

@@ -1,21 +1,20 @@
 <div class="toolbar hh2">
   <div class="fn_g hp">
-    <%= f.submit "Save", name: "commit", value: "Save", class: "ini_input hp hh2 thmc2 thmtxt" %>
+    <%= f.submit "Save", name: "commit", value: "Save", class: "fn_btn ini_input hp hh2 thmc2 thmtxt" %>
     <!-- class: bt-cancle can't be remove -->
     <% if not @writing_journal.new_record? %>
       <%= submit_tag "Cancel", :type => "button", class: "bt-cancel ini_input hp hh2 thmadm thmtxt" %>
     <% end %>
   </div>
-  <div class="hh2 hp sdm">
+  <!--<div class="hh2 hp sdm">
     <div class="sdm_t hh2">Entry Year</div>
     <div class="admbg sdm_o">
-      <!--<ul>
+      <ul>
         <li><a class="hp hh2 admtxt" href="">2012</a></li>
       </ul>
-      -->
     </div>
   </div>
-  <!--<div class="hh2 hp sdm">
+  <div class="hh2 hp sdm">
     <div class="sdm_t hh2">Language</div>
     <div class="admbg sdm_o">
       <ul>