Merge branch 'develop'

apps/documenteditor/main/app/template/ToolbarView.template

@@ -1,21 +1,7 @@
 <div class="toolbar">
     <div class="box-tabs">
         <div class="extra left"></div>
-        <section class="tabs">
+        <%= tabsmarkup %>
-            <a class="scroll left">
-                <i class="icon">&lt;</i>
-            </a>
-            <ul>
-                <% for(var i in tabs) { %>
-                    <li class="ribtab<% if (tabs[i].extcls) print(' ' + tabs[i].extcls) %>">
-                        <a data-tab="<%= tabs[i].action %>" data-title="<%= tabs[i].caption %>"><%= tabs[i].caption %></a>
-                    </li>
-                <% } %>
-            </ul>
-            <a class="scroll right">
-                <i class="icon">&gt;</i>
-            </a>
-        </section>
         <div class="extra right">
         </div>
     </div>

apps/presentationeditor/main/app/template/ToolbarView.template

@@ -1,21 +1,7 @@
 <div class="toolbar">
     <div class="box-tabs">
         <div class="extra left"></div>
-        <section class="tabs">
+        <%= tabsmarkup %>
-            <a class="scroll left">
-                <i class="icon">&lt;</i>
-            </a>
-            <ul>
-                <% for(var i in tabs) { %>
-                    <li class="ribtab<% if (tabs[i].extcls) print(' ' + tabs[i].extcls) %>">
-                        <a data-tab="<%= tabs[i].action %>" data-title="<%= tabs[i].caption %>"><%= tabs[i].caption %></a>
-                    </li>
-                <% } %>
-            </ul>
-            <a class="scroll right">
-                <i class="icon">&gt;</i>
-            </a>
-        </section>
         <div class="extra right">
         </div>
     </div>

apps/presentationeditor/main/app/view/Toolbar.js

@@ -43,7 +43,7 @@
 define([
     'backbone',
     'text!presentationeditor/main/app/template/Toolbar.template',
-    'text!documenteditor/main/app/template/ToolbarView.template',
+    'text!presentationeditor/main/app/template/ToolbarView.template',
     'common/main/lib/collection/Fonts',
     'common/main/lib/component/Button',
     'common/main/lib/component/ComboBox',

apps/spreadsheeteditor/main/app/template/ToolbarView.template

@@ -1,21 +1,7 @@
 <section class="toolbar">
     <section class="box-tabs">
         <div class="extra left"></div>
-        <section class="tabs">
+        <%= tabsmarkup %>
-            <a href="#" class="scroll left">
-                <i class="icon">&lt;</i>
-            </a>
-            <ul>
-                <% for(var i in tabs) { %>
-                <li class="ribtab<% if (tabs[i].extcls) print(' ' + tabs[i].extcls) %>">
-                    <a data-tab="<%= tabs[i].action %>" data-title="<%= tabs[i].caption %>"><%= tabs[i].caption %></a>
-                </li>
-                <% } %>
-            </ul>
-            <a href="#" class="scroll right">
-                <i class="icon">&gt;</i>
-            </a>
-        </section>
         <div class="extra right">
         </div>
     </section>