Commit cddd92f6 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Добавил в меню выставление темы.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55955 954022d7-b5bf-4e40-9824-e11837661b57
parent c5a9bc0d
...@@ -1779,6 +1779,15 @@ Format ...@@ -1779,6 +1779,15 @@ Format
<div class="ToolbarDropDown dropdown" style="margin-top: 5px;margin-right: -3px;"></div> <div class="ToolbarDropDown dropdown" style="margin-top: 5px;margin-right: -3px;"></div>
</li> </li>
</ul> </ul>
<ul id="textMenu3">
<li id="themeSelect" class="item main textSelect textSelectBoard ToolbarIconOut" value="Office">
<span id="themeSelectVal">Office</span>
<ul style="width: 220px; height: 220px;overflow-y: scroll;">
<li id="Office" class="SubItem" value="Office">Office</li>
</ul>
<div class="ToolbarDropDown dropdown" style="margin-top: 5px;margin-right: -3px;"></div>
</li>
</ul>
</td> </td>
</tr> </tr>
</table> </table>
......
...@@ -520,6 +520,15 @@ ...@@ -520,6 +520,15 @@
} }
$("#cellStyleSelect ul").empty().append(cellStyleContent); $("#cellStyleSelect ul").empty().append(cellStyleContent);
}); });
api.asc_registerCallback("asc_onSendThemeColorSchemes", function (colorSchemes) {
var cellThemeContent = "";
var themeName;
for (var i = 0; i < colorSchemes.length; ++i) {
themeName = colorSchemes[i].get_name();
cellThemeContent += '<li id="'+themeName.replace(/\s/g,"")+'" class="SubItem cellStyleListElement" indexTheme="'+i+'">'+themeName+'</li>';
}
$("#themeSelect ul").empty().append(cellThemeContent);
});
api.asc_Init("../Fonts/"); api.asc_Init("../Fonts/");
//api.asc_setViewerMode(true); //api.asc_setViewerMode(true);
...@@ -674,14 +683,27 @@ ...@@ -674,14 +683,27 @@
$("#textMenu2").clickMenu({onClick:function(){ $("#textMenu2").clickMenu({onClick:function(){
$('#textMenu2').trigger('closemenu'); $('#textMenu2').trigger('closemenu');
if ($(this).hasClass("cellStyleListElement")){ if ($(this).hasClass("cellStyleListElement")){
$('#cellStyleSelectVal').text(this.innerHTML); var cellStyleSelectVal = $('#cellStyleSelectVal');
$('#cellStyleSelectVal').val(this.getAttribute("value")); cellStyleSelectVal.text(this.innerHTML);
$('#cellStyleSelectVal').change(); cellStyleSelectVal.val(this.getAttribute("value"));
cellStyleSelectVal.change();
api.asc_setCellStyle($(this).attr("nameStyle")); api.asc_setCellStyle($(this).attr("nameStyle"));
} }
return false; return false;
}}); }});
$("#textMenu3").clickMenu({onClick:function(){
$('#textMenu3').trigger('closemenu');
if ($(this).hasClass("cellStyleListElement")){
var themeSelectVal = $('#themeSelectVal');
themeSelectVal.text(this.innerHTML);
themeSelectVal.val(this.getAttribute("value"));
themeSelectVal.change();
api.asc_ChangeColorScheme($(this).attr("indexTheme"));
}
return false;
}});
$("#dialogRenameWS").dialog({ autoOpen: false, $("#dialogRenameWS").dialog({ autoOpen: false,
resizable: false, modal: true, closeOnEscape: false, dialogClass: 'dialogClass', resizable: false, modal: true, closeOnEscape: false, dialogClass: 'dialogClass',
buttons: [ buttons: [
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
} }
#textMenu, #shapeMenu, #AutoShapesMenu, #textMenu2 #textMenu, #shapeMenu, #AutoShapesMenu, #textMenu2, #textMenu3
{ {
background: none repeat scroll 0 0 #E3E9FF; background: none repeat scroll 0 0 #E3E9FF;
clear: both; clear: both;
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
text-align: left; text-align: left;
vertical-align: top; vertical-align: top;
} }
#textMenu3 {
margin-top: 3px;
}
#fontFormat #fontFormat
{ {
...@@ -47,7 +50,7 @@ ...@@ -47,7 +50,7 @@
height: 26px; height: 26px;
} }
#cellStyleSelect { #cellStyleSelect, #themeSelect {
min-width: 80px; min-width: 80px;
width: 80px; width: 80px;
height: 26px; height: 26px;
...@@ -556,7 +559,7 @@ li.SubItem.hover ...@@ -556,7 +559,7 @@ li.SubItem.hover
border-radius-topleft: 5px;*/ border-radius-topleft: 5px;*/
} }
#textMenu .item, #shapeMenu .item, #textMenu2 .item #textMenu .item, #shapeMenu .item, #textMenu2 .item, #textMenu3 .item
{ {
margin-left: 2px; margin-left: 2px;
vertical-align: top; vertical-align: top;
...@@ -575,7 +578,7 @@ li.SubItem.hover ...@@ -575,7 +578,7 @@ li.SubItem.hover
user-select: none; user-select: none;
min-width: 254px; min-width: 254px;
} }
#textMenu span, #AutoShapesMenu span, #shapeMenu span, #textMenu2 span #textMenu span, #AutoShapesMenu span, #shapeMenu span, #textMenu2 span, #textMenu3 span
{ {
border-top: 15px; border-top: 15px;
margin-top: 3px; margin-top: 3px;
...@@ -633,7 +636,7 @@ li.SubItem.hover ...@@ -633,7 +636,7 @@ li.SubItem.hover
border-bottom-color:#ACACAC !important; border-bottom-color:#ACACAC !important;
border-right-color: #ACACAC !important; border-right-color: #ACACAC !important;
} }
#textMenu .innerBox, #shapeMenu .innerBox, #AutoShapesMenu .innerBox, #textMenu2 .innerBox #textMenu .innerBox, #shapeMenu .innerBox, #AutoShapesMenu .innerBox, #textMenu2 .innerBox, #textMenu3 .innerBox
{ {
font:12px Arial,sans-serif; font:12px Arial,sans-serif;
background:none repeat scroll 0 0 #FFFFFF; background:none repeat scroll 0 0 #FFFFFF;
...@@ -680,7 +683,7 @@ li.SubItem.hover ...@@ -680,7 +683,7 @@ li.SubItem.hover
padding:4px 7em 4px 28px; padding:4px 7em 4px 28px;
} }
#textMenu .SubItem, #shapeMenu .SubItem, #AutoShapesMenu .SubItem, #textMenu2 .SubItem #textMenu .SubItem, #shapeMenu .SubItem, #AutoShapesMenu .SubItem, #textMenu2 .SubItem, #textMenu3 .SubItem
{ {
list-style:none outside none; list-style:none outside none;
margin:0 3px; margin:0 3px;
...@@ -823,7 +826,7 @@ li.SubItem.hover ...@@ -823,7 +826,7 @@ li.SubItem.hover
margin-top:6px; margin-top:6px;
} }
#textMenu ul, #shapeMenu ul, #AutoShapesMenu ul, #textMenu2 ul{min-width:15px !important; } #textMenu ul, #shapeMenu ul, #AutoShapesMenu ul, #textMenu2 ul, #textMenu3 ul{min-width:15px !important; }
a.big_button3 { a.big_button3 {
cursor: pointer; cursor: pointer;
display: block; display: block;
......
...@@ -278,7 +278,13 @@ table { ...@@ -278,7 +278,13 @@ table {
height:7px; height:7px;
margin:4px 0; margin:4px 0;
} }
#fontFormat, #fontSelect, #fontSizeSelect, #cellStyleSelect{ -moz-border-radius: 0px;-webkit-border-radius: 0px;-pie-border-radius: 0px; behavior: url(../js/PIE.htc);height:21px;background-color:#fff;} #fontFormat, #fontSelect, #fontSizeSelect, #cellStyleSelect, #themeSelect{
-moz-border-radius: 0px;
-webkit-border-radius: 0px;
-pie-border-radius: 0px;
behavior: url(../js/PIE.htc);
height:21px;background-color:#fff;
}
#fontSizeSelect .SubItem{text-align:center;} #fontSizeSelect .SubItem{text-align:center;}
#fontFormat .innerBox{width:120px;} #fontFormat .innerBox{width:120px;}
......
...@@ -173,7 +173,7 @@ p{ margin: 2px; padding: 2px; vertical-align:top;} ...@@ -173,7 +173,7 @@ p{ margin: 2px; padding: 2px; vertical-align:top;}
.shspFirst{padding-left: 2px;} .shspFirst{padding-left: 2px;}
.shspLast{padding-right: 2px;} .shspLast{padding-right: 2px;}
#fontSelect, #fontSizeSelect, #cellStyleSelect{-moz-border-radius: 0px;-webkit-border-radius: 0px;height:21px;background-color:#fff;} #fontSelect, #fontSizeSelect, #cellStyleSelect, #themeSelect{-moz-border-radius: 0px;-webkit-border-radius: 0px;height:21px;background-color:#fff;}
#addHyperlink_url {width:427px;} #addHyperlink_url {width:427px;}
#dialogAddHyperlink select{width:137px;} #dialogAddHyperlink select{width:137px;}
#addHyperlink_text{width: 280px;} #addHyperlink_text{width: 280px;}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment