Merge branch 'master' of https://github.com/inverse-inc/sogo
commit
cebaed9059
1
NEWS
1
NEWS
|
@ -5,6 +5,7 @@ New features
|
|||
- creation and modification of mail labels
|
||||
|
||||
Enhancements
|
||||
- the color picker is no longer a popup window
|
||||
|
||||
Bug fixes
|
||||
|
||||
|
|
|
@ -15,7 +15,6 @@ SchedulerUI_OBJC_FILES = \
|
|||
\
|
||||
UIxCalMainView.m \
|
||||
UIxCalendarProperties.m \
|
||||
UIxColorPicker.m \
|
||||
\
|
||||
UIxCalFilterPanel.m \
|
||||
UIxCalDayTable.m \
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
/* UIxColorPicker.h - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2008 Inverse inc.
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#ifndef UIXCOLORPICKER_H
|
||||
#define UIXCOLORPICKER_H
|
||||
|
||||
#import <SOGoUI/UIxComponent.h>
|
||||
|
||||
@interface UIxColorPicker : UIxComponent
|
||||
@end
|
||||
|
||||
#endif /* UIXCOLORPICKER_H */
|
|
@ -1,29 +0,0 @@
|
|||
/* UIxColorPicker.m - this file is part of SOGo
|
||||
*
|
||||
* Copyright (C) 2008 Inverse inc.
|
||||
*
|
||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
*
|
||||
* This file is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2, or (at your option)
|
||||
* any later version.
|
||||
*
|
||||
* This file is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; see the file COPYING. If not, write to
|
||||
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
* Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
|
||||
#import "UIxColorPicker.h"
|
||||
|
||||
#warning this module should probably be moved into a "Utility" product
|
||||
|
||||
@implementation UIxColorPicker
|
||||
|
||||
@end
|
|
@ -131,10 +131,6 @@
|
|||
protectedBy = "View";
|
||||
pageName = "UIxReminderEditor";
|
||||
};
|
||||
colorPicker = {
|
||||
protectedBy = "View";
|
||||
pageName = "UIxColorPicker";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -16,6 +16,82 @@
|
|||
<script type="text/javascript">
|
||||
var localeCode = '<var:string value="localeCode"/>';
|
||||
</script>
|
||||
|
||||
<div id="colorPickerDialog" style="display: none;" class="dialog right bottom">
|
||||
<div>
|
||||
<span class="blc-FFFFFF"><!-- --></span>
|
||||
<span class="blc-330033"><!-- --></span>
|
||||
<span class="blc-C0C0C0"><!-- --></span>
|
||||
<span class="blc-999999"><!-- --></span>
|
||||
<span class="blc-666666"><!-- --></span>
|
||||
<span class="blc-333333"><!-- --></span>
|
||||
<span class="blc-000000"><!-- --></span>
|
||||
<span class="blc-FFCCCC"><!-- --></span>
|
||||
<span class="blc-FF6666"><!-- --></span>
|
||||
<span class="blc-FF0000"><!-- --></span>
|
||||
<span class="blc-CC0000"><!-- --></span>
|
||||
<span class="blc-990000"><!-- --></span>
|
||||
<span class="blc-660000"><!-- --></span>
|
||||
<span class="blc-330000"><!-- --></span>
|
||||
<span class="blc-FFCC99"><!-- --></span>
|
||||
<span class="blc-FF9966"><!-- --></span>
|
||||
<span class="blc-FF9900"><!-- --></span>
|
||||
<span class="blc-FF6600"><!-- --></span>
|
||||
<span class="blc-CC6600"><!-- --></span>
|
||||
<span class="blc-993300"><!-- --></span>
|
||||
<span class="blc-663300"><!-- --></span>
|
||||
<span class="blc-FFFF99"><!-- --></span>
|
||||
<span class="blc-FFFF66"><!-- --></span>
|
||||
<span class="blc-FFCC66"><!-- --></span>
|
||||
<span class="blc-FFCC33"><!-- --></span>
|
||||
<span class="blc-CC9933"><!-- --></span>
|
||||
<span class="blc-996633"><!-- --></span>
|
||||
<span class="blc-663333"><!-- --></span>
|
||||
<span class="blc-FFFFCC"><!-- --></span>
|
||||
<span class="blc-FFFF33"><!-- --></span>
|
||||
<span class="blc-FFFF00"><!-- --></span>
|
||||
<span class="blc-FFCC00"><!-- --></span>
|
||||
<span class="blc-999900"><!-- --></span>
|
||||
<span class="blc-666600"><!-- --></span>
|
||||
<span class="blc-333300"><!-- --></span>
|
||||
<span class="blc-CCCCCC"><!-- --></span>
|
||||
<span class="blc-66FF99"><!-- --></span>
|
||||
<span class="blc-33FF33"><!-- --></span>
|
||||
<span class="blc-33CC00"><!-- --></span>
|
||||
<span class="blc-009900"><!-- --></span>
|
||||
<span class="blc-006600"><!-- --></span>
|
||||
<span class="blc-003300"><!-- --></span>
|
||||
<span class="blc-99FFFF"><!-- --></span>
|
||||
<span class="blc-33FFFF"><!-- --></span>
|
||||
<span class="blc-66CCCC"><!-- --></span>
|
||||
<span class="blc-00CCCC"><!-- --></span>
|
||||
<span class="blc-339999"><!-- --></span>
|
||||
<span class="blc-336666"><!-- --></span>
|
||||
<span class="blc-003333"><!-- --></span>
|
||||
<span class="blc-CCFFFF"><!-- --></span>
|
||||
<span class="blc-66FFFF"><!-- --></span>
|
||||
<span class="blc-33CCFF"><!-- --></span>
|
||||
<span class="blc-3366FF"><!-- --></span>
|
||||
<span class="blc-3333FF"><!-- --></span>
|
||||
<span class="blc-000099"><!-- --></span>
|
||||
<span class="blc-000066"><!-- --></span>
|
||||
<span class="blc-CCCCFF"><!-- --></span>
|
||||
<span class="blc-9999FF"><!-- --></span>
|
||||
<span class="blc-6666CC"><!-- --></span>
|
||||
<span class="blc-6633FF"><!-- --></span>
|
||||
<span class="blc-6600CC"><!-- --></span>
|
||||
<span class="blc-333399"><!-- --></span>
|
||||
<span class="blc-330099"><!-- --></span>
|
||||
<span class="blc-FFCCFF"><!-- --></span>
|
||||
<span class="blc-FF99FF"><!-- --></span>
|
||||
<span class="blc-CC66CC"><!-- --></span>
|
||||
<span class="blc-CC33CC"><!-- --></span>
|
||||
<span class="blc-993399"><!-- --></span>
|
||||
<span class="blc-663366"><!-- --></span>
|
||||
<span class="blc-99FF99"><!-- --></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form id="mainForm" var:href="ownPath">
|
||||
<div class="tabsContainer" id="preferencesTabs">
|
||||
<ul>
|
||||
|
@ -147,8 +223,7 @@
|
|||
><td const:class="categoryListCell"
|
||||
><var:string var:value="category"/></td
|
||||
><td const:class="categoryListCell"
|
||||
><div const:class="colorBox"><var:string var:value="categoryColor"
|
||||
/></div></td
|
||||
><div const:class="colorBox" var:data-color="categoryColor"><entity name="nbsp"/></div></td
|
||||
></tr>
|
||||
</var:foreach>
|
||||
</tbody>
|
||||
|
@ -309,8 +384,7 @@
|
|||
<td const:class="labelListCell"
|
||||
><var:string var:value="label.label"/></td>
|
||||
<td const:class="labelListCell">
|
||||
<div const:class="colorBox"><var:string var:value="label.color"
|
||||
/></div>
|
||||
<div const:class="colorBox" var:data-color="label.color"><entity name="nbsp"/></div>
|
||||
</td>
|
||||
</tr>
|
||||
</var:foreach>
|
||||
|
|
|
@ -10,6 +10,82 @@
|
|||
const:toolbar="none"
|
||||
const:popup="YES"
|
||||
title="title">
|
||||
|
||||
<div id="colorPickerDialog" style="display: none;" class="dialog left">
|
||||
<div>
|
||||
<span class="blc-FFFFFF"><!-- --></span>
|
||||
<span class="blc-330033"><!-- --></span>
|
||||
<span class="blc-C0C0C0"><!-- --></span>
|
||||
<span class="blc-999999"><!-- --></span>
|
||||
<span class="blc-666666"><!-- --></span>
|
||||
<span class="blc-333333"><!-- --></span>
|
||||
<span class="blc-000000"><!-- --></span>
|
||||
<span class="blc-FFCCCC"><!-- --></span>
|
||||
<span class="blc-FF6666"><!-- --></span>
|
||||
<span class="blc-FF0000"><!-- --></span>
|
||||
<span class="blc-CC0000"><!-- --></span>
|
||||
<span class="blc-990000"><!-- --></span>
|
||||
<span class="blc-660000"><!-- --></span>
|
||||
<span class="blc-330000"><!-- --></span>
|
||||
<span class="blc-FFCC99"><!-- --></span>
|
||||
<span class="blc-FF9966"><!-- --></span>
|
||||
<span class="blc-FF9900"><!-- --></span>
|
||||
<span class="blc-FF6600"><!-- --></span>
|
||||
<span class="blc-CC6600"><!-- --></span>
|
||||
<span class="blc-993300"><!-- --></span>
|
||||
<span class="blc-663300"><!-- --></span>
|
||||
<span class="blc-FFFF99"><!-- --></span>
|
||||
<span class="blc-FFFF66"><!-- --></span>
|
||||
<span class="blc-FFCC66"><!-- --></span>
|
||||
<span class="blc-FFCC33"><!-- --></span>
|
||||
<span class="blc-CC9933"><!-- --></span>
|
||||
<span class="blc-996633"><!-- --></span>
|
||||
<span class="blc-663333"><!-- --></span>
|
||||
<span class="blc-FFFFCC"><!-- --></span>
|
||||
<span class="blc-FFFF33"><!-- --></span>
|
||||
<span class="blc-FFFF00"><!-- --></span>
|
||||
<span class="blc-FFCC00"><!-- --></span>
|
||||
<span class="blc-999900"><!-- --></span>
|
||||
<span class="blc-666600"><!-- --></span>
|
||||
<span class="blc-333300"><!-- --></span>
|
||||
<span class="blc-CCCCCC"><!-- --></span>
|
||||
<span class="blc-66FF99"><!-- --></span>
|
||||
<span class="blc-33FF33"><!-- --></span>
|
||||
<span class="blc-33CC00"><!-- --></span>
|
||||
<span class="blc-009900"><!-- --></span>
|
||||
<span class="blc-006600"><!-- --></span>
|
||||
<span class="blc-003300"><!-- --></span>
|
||||
<span class="blc-99FFFF"><!-- --></span>
|
||||
<span class="blc-33FFFF"><!-- --></span>
|
||||
<span class="blc-66CCCC"><!-- --></span>
|
||||
<span class="blc-00CCCC"><!-- --></span>
|
||||
<span class="blc-339999"><!-- --></span>
|
||||
<span class="blc-336666"><!-- --></span>
|
||||
<span class="blc-003333"><!-- --></span>
|
||||
<span class="blc-CCFFFF"><!-- --></span>
|
||||
<span class="blc-66FFFF"><!-- --></span>
|
||||
<span class="blc-33CCFF"><!-- --></span>
|
||||
<span class="blc-3366FF"><!-- --></span>
|
||||
<span class="blc-3333FF"><!-- --></span>
|
||||
<span class="blc-000099"><!-- --></span>
|
||||
<span class="blc-000066"><!-- --></span>
|
||||
<span class="blc-CCCCFF"><!-- --></span>
|
||||
<span class="blc-9999FF"><!-- --></span>
|
||||
<span class="blc-6666CC"><!-- --></span>
|
||||
<span class="blc-6633FF"><!-- --></span>
|
||||
<span class="blc-6600CC"><!-- --></span>
|
||||
<span class="blc-333399"><!-- --></span>
|
||||
<span class="blc-330099"><!-- --></span>
|
||||
<span class="blc-FFCCFF"><!-- --></span>
|
||||
<span class="blc-FF99FF"><!-- --></span>
|
||||
<span class="blc-CC66CC"><!-- --></span>
|
||||
<span class="blc-CC33CC"><!-- --></span>
|
||||
<span class="blc-993399"><!-- --></span>
|
||||
<span class="blc-663366"><!-- --></span>
|
||||
<span class="blc-99FF99"><!-- --></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form const:href="saveProperties" name="propertiesform" id="propertiesform">
|
||||
<input type="hidden" const:name="calendarID" const:id="calendarID"
|
||||
var:value="calendarID"/>
|
||||
|
@ -32,14 +108,10 @@
|
|||
class="textField"
|
||||
var:value="calendarName"
|
||||
/></span></div>
|
||||
<div><span class="label"><var:string
|
||||
label:value="Color:"
|
||||
/></span><span class="content"
|
||||
><button id="colorButton"><!-- space --></button
|
||||
><input type="hidden"
|
||||
name="calendarColor"
|
||||
id="calendarColor"
|
||||
var:value="calendarColor"
|
||||
<div><span class="label"><var:string label:value="Color:"/></span
|
||||
><span class="content"
|
||||
><div id="colorButton" class="colorBox" var:data-color="calendarColor"><!-- space --></div
|
||||
><input type="hidden" name="calendarColor" id="calendarColor" var:value="calendarColor"
|
||||
/></span></div>
|
||||
<var:if condition="userIsOwner"
|
||||
><div
|
||||
|
|
|
@ -699,7 +699,6 @@ function onViewEventCallback(http) {
|
|||
var cellDimensions = cell.getDimensions();
|
||||
var div = $("eventDialog");
|
||||
var divDimensions = div.getDimensions();
|
||||
var viewPosition = $("calendarView").cumulativeOffset();
|
||||
var view;
|
||||
var left;
|
||||
var top = cellPosition[1] - 5;
|
||||
|
|
|
@ -31,13 +31,19 @@ SPAN.content
|
|||
SPAN.content INPUT.textField
|
||||
{ width: 160px; }
|
||||
|
||||
BUTTON#colorButton
|
||||
{ display: none;
|
||||
border: 1px solid #FFFFFF;
|
||||
border-top: 1px solid #909090;
|
||||
border-left: 1px solid #909090;
|
||||
width: 3em;
|
||||
height: 18px; }
|
||||
DIV.colorBox
|
||||
{ margin: 5px 0;
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
border: 2px solid #eee; }
|
||||
|
||||
DIV.colorBox:hover
|
||||
{ border-color: #fff; }
|
||||
|
||||
#colorPickerDialog
|
||||
{ width: 146px;
|
||||
height: 191px; }
|
||||
|
||||
DIV#buttons
|
||||
{ position: absolute;
|
||||
|
|
|
@ -7,9 +7,12 @@ function onLoadCalendarProperties() {
|
|||
|
||||
var colorButton = $("colorButton");
|
||||
var calendarColor = $("calendarColor");
|
||||
colorButton.setStyle({ "backgroundColor": calendarColor.value, display: "inline" });
|
||||
colorButton.setStyle({ "backgroundColor": colorButton.readAttribute('data-color') });
|
||||
colorButton.observe("click", onColorClick);
|
||||
|
||||
$('colorPickerDialog').on('click', 'span', onColorPickerChoice);
|
||||
$(document.body).on("click", onBodyClickHandler);
|
||||
|
||||
var cancelButton = $("cancelButton");
|
||||
cancelButton.observe("click", onCancelClick);
|
||||
|
||||
|
@ -74,22 +77,31 @@ function onOKClick(event) {
|
|||
Event.stop(event);
|
||||
}
|
||||
|
||||
function onBodyClickHandler(event) {
|
||||
var target = getTarget(event);
|
||||
if (!target.hasClassName('colorBox'))
|
||||
$("colorPickerDialog").hide();
|
||||
}
|
||||
|
||||
function onColorClick(event) {
|
||||
var cPicker = window.open(ApplicationBaseURL + "colorPicker", "colorPicker",
|
||||
"width=250,height=200,resizable=0,scrollbars=0"
|
||||
+ "toolbar=0,location=0,directories=0,status=0,"
|
||||
+ "menubar=0,copyhistory=0", "test"
|
||||
);
|
||||
cPicker.focus();
|
||||
var cellPosition = this.cumulativeOffset();
|
||||
var cellDimensions = this.getDimensions();
|
||||
var div = $('colorPickerDialog');
|
||||
var divDimensions = div.getDimensions();
|
||||
var left = cellPosition[0] + cellDimensions["width"] + 4;
|
||||
var top = cellPosition[1] - 5;
|
||||
div.setStyle({ left: left + "px", top: top + "px" });
|
||||
div.show();
|
||||
|
||||
preventDefault(event);
|
||||
}
|
||||
|
||||
function onColorPickerChoice(newColor) {
|
||||
function onColorPickerChoice(event) {
|
||||
var span = getTarget(event);
|
||||
var newColor = "#" + span.className.substr(4);
|
||||
var colorButton = $("colorButton");
|
||||
colorButton.setStyle({ "backgroundColor": newColor });
|
||||
var calendarColor = $("calendarColor");
|
||||
calendarColor.value = newColor;
|
||||
$("calendarColor").value = newColor;
|
||||
}
|
||||
|
||||
document.observe("dom:loaded", onLoadCalendarProperties);
|
||||
|
|
|
@ -231,3 +231,19 @@ P.infoMessage#passwordError
|
|||
|
||||
#receiptOptions
|
||||
{ text-align: right; }
|
||||
|
||||
#colorPickerDialog
|
||||
{ width: 146px;
|
||||
height: 191px; }
|
||||
|
||||
#colorPickerDialog.dialog.right > DIV
|
||||
{ padding-left: 10px; }
|
||||
|
||||
.dialog.bottom > DIV:before {
|
||||
top: auto;
|
||||
bottom: 12px;
|
||||
}
|
||||
.dialog.bottom > DIV:after {
|
||||
top: auto;
|
||||
bottom: 13px;
|
||||
}
|
||||
|
|
|
@ -148,6 +148,12 @@ function _setupEvents() {
|
|||
}
|
||||
}
|
||||
|
||||
function onBodyClickHandler(event) {
|
||||
var target = getTarget(event);
|
||||
if (!target.hasClassName('colorBox'))
|
||||
$("colorPickerDialog").hide();
|
||||
}
|
||||
|
||||
function onChoiceChanged(event) {
|
||||
var hasChanged = $("hasChanged");
|
||||
hasChanged.value = "1";
|
||||
|
@ -189,6 +195,9 @@ function initPreferences() {
|
|||
if (typeof (initAdditionalPreferences) != "undefined")
|
||||
initAdditionalPreferences();
|
||||
|
||||
$('colorPickerDialog').on('click', 'span', onColorPickerChoice);
|
||||
$(document.body).on("click", onBodyClickHandler);
|
||||
|
||||
// Calender categories
|
||||
var wrapper = $("calendarCategoriesListWrapper");
|
||||
if (wrapper) {
|
||||
|
@ -201,6 +210,7 @@ function initPreferences() {
|
|||
resetCalendarTableActions();
|
||||
$("calendarCategoryAdd").observe("click", onCalendarCategoryAdd);
|
||||
$("calendarCategoryDelete").observe("click", onCalendarCategoryDelete);
|
||||
wrapper.observe("scroll", onBodyClickHandler);
|
||||
}
|
||||
|
||||
// Mail labels/tags
|
||||
|
@ -882,48 +892,43 @@ function compactMailAccounts() {
|
|||
}
|
||||
|
||||
/* common function between calendar categories and mail labels */
|
||||
function onColorEdit(e, type) {
|
||||
var r;
|
||||
|
||||
if (type == "calendar")
|
||||
r = $$("#calendarCategoriesListWrapper div.colorEditing");
|
||||
else
|
||||
r = $$("#mailLabelsListWrapper div.colorEditing");
|
||||
|
||||
for (var i=0; i<r.length; i++)
|
||||
r[i].removeClassName("colorEditing");
|
||||
function onColorEdit(e, target) {
|
||||
var view = $(target);
|
||||
|
||||
view.select('div.colorEditing').each(function(box) {
|
||||
box.removeClassName('colorEditing');
|
||||
});
|
||||
this.addClassName("colorEditing");
|
||||
var cPicker = window.open(ApplicationBaseURL + "../" + UserLogin
|
||||
+ "/Calendar/colorPicker", "colorPicker",
|
||||
"width=250,height=200,resizable=0,scrollbars=0"
|
||||
+ "toolbar=0,location=0,directories=0,status=0,"
|
||||
+ "menubar=0,copyhistory=0", "test"
|
||||
);
|
||||
cPicker.focus();
|
||||
cPicker.type = type;
|
||||
|
||||
preventDefault(e);
|
||||
var cellPosition = this.cumulativeOffset();
|
||||
var cellDimensions = this.getDimensions();
|
||||
var div = $('colorPickerDialog');
|
||||
var divDimensions = div.getDimensions();
|
||||
var left = cellPosition[0] - divDimensions["width"];
|
||||
var top = cellPosition[1] - 165 - view.scrollTop;
|
||||
div.setStyle({ left: left + "px", top: top + "px" });
|
||||
div.writeAttribute('data-target', target);
|
||||
div.show();
|
||||
}
|
||||
|
||||
function onColorPickerChoice(newColor, type) {
|
||||
var div;
|
||||
function onColorPickerChoice(event) {
|
||||
var span = getTarget(event);
|
||||
var dialog = span.up('.dialog');
|
||||
var target = dialog.readAttribute('data-target');
|
||||
var newColor = "#" + span.className.substr(4);
|
||||
|
||||
if (type == "calendar")
|
||||
div = $$("#calendarCategoriesListWrapper div.colorEditing").first();
|
||||
else
|
||||
div = $$("#mailLabelsListWrapper div.colorEditing").first();
|
||||
var wrapper = $(target);
|
||||
var div = wrapper.select("div.colorEditing").first();
|
||||
|
||||
// div.removeClassName("colorEditing");
|
||||
div.showColor = newColor;
|
||||
div.writeAttribute('data-color', newColor);
|
||||
div.style.background = newColor;
|
||||
if (parseInt($("hasChanged").value) == 0) {
|
||||
var hasChanged = $("hasChanged");
|
||||
hasChanged.value = "1";
|
||||
}
|
||||
}
|
||||
/* /common function between calendar categories and mail labels */
|
||||
|
||||
dialog.hide();
|
||||
}
|
||||
|
||||
/* calendar categories */
|
||||
function resetCalendarTableActions() {
|
||||
|
@ -940,23 +945,21 @@ function resetCalendarTableActions() {
|
|||
|
||||
function onCalendarColorEdit(e) {
|
||||
var onCCE = onColorEdit.bind(this);
|
||||
onCCE(e, "calendar");
|
||||
onCCE(e, "calendarCategoriesListWrapper");
|
||||
}
|
||||
|
||||
function onCalendarCategoryAdd(e) {
|
||||
var row = new Element("tr");
|
||||
var nametd = new Element("td").update("");
|
||||
var colortd = new Element("td");
|
||||
var colordiv = new Element("div", {"class": "colorBox"});
|
||||
var colordiv = new Element("div", {"class": "colorBox", dataColor: "#F0F0F0"});
|
||||
|
||||
row.identify();
|
||||
row.addClassName("categoryListRow");
|
||||
|
||||
nametd.addClassName("categoryListCell");
|
||||
colortd.addClassName("categoryListCell");
|
||||
colordiv.innerHTML = " ";
|
||||
colordiv.showColor = "#F0F0F0";
|
||||
colordiv.style.background = colordiv.showColor;
|
||||
colordiv.setStyle({backgroundColor: "#F0F0F0"});
|
||||
|
||||
colortd.appendChild(colordiv);
|
||||
row.appendChild(nametd);
|
||||
|
@ -985,7 +988,7 @@ function serializeCalendarCategories() {
|
|||
for (var i = 0; i < r.length; i++) {
|
||||
var tds = r[i].childElements();
|
||||
var name = $(tds.first()).innerHTML;
|
||||
var color = $(tds.last().childElements().first()).showColor;
|
||||
var color = $(tds.last().childElements().first()).readAttribute('data-color');
|
||||
values.push("\"" + name + "\": \"" + color + "\"");
|
||||
}
|
||||
|
||||
|
@ -996,11 +999,9 @@ function resetCalendarCategoriesColors(e) {
|
|||
var divs = $$("#calendarCategoriesListWrapper DIV.colorBox");
|
||||
for (var i = 0; i < divs.length; i++) {
|
||||
var d = divs[i];
|
||||
var color = d.innerHTML;
|
||||
d.showColor = color;
|
||||
var color = d.readAttribute("data-color");
|
||||
if (color != "undefined")
|
||||
d.setStyle({ backgroundColor: color });
|
||||
d.update(" ");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1021,23 +1022,21 @@ function resetMailTableActions() {
|
|||
|
||||
function onMailColorEdit(e) {
|
||||
var onMCE = onColorEdit.bind(this);
|
||||
onMCE(e, "mail");
|
||||
onMCE(e, "mailLabelsListWrapper");
|
||||
}
|
||||
|
||||
function onMailLabelAdd(e) {
|
||||
var row = new Element("tr");
|
||||
var nametd = new Element("td").update("");
|
||||
var colortd = new Element("td");
|
||||
var colordiv = new Element("div", {"class": "colorBox"});
|
||||
var colordiv = new Element("div", {"class": "colorBox", dataColor: "#F0F0F0"});
|
||||
|
||||
row.identify();
|
||||
row.addClassName("labelListRow");
|
||||
|
||||
nametd.addClassName("labelListCell");
|
||||
colortd.addClassName("labelListCell");
|
||||
colordiv.innerHTML = " ";
|
||||
colordiv.showColor = "#F0F0F0";
|
||||
colordiv.style.background = colordiv.showColor;
|
||||
colordiv.setStyle({backgroundColor: "#F0F0F0"});
|
||||
|
||||
colortd.appendChild(colordiv);
|
||||
row.appendChild(nametd);
|
||||
|
@ -1063,11 +1062,9 @@ function resetMailLabelsColors(e) {
|
|||
var divs = $$("#mailLabelsListWrapper DIV.colorBox");
|
||||
for (var i = 0; i < divs.length; i++) {
|
||||
var d = divs[i];
|
||||
var color = d.innerHTML;
|
||||
d.showColor = color;
|
||||
var color = d.readAttribute('data-color');
|
||||
if (color != "undefined")
|
||||
d.setStyle({ backgroundColor: color });
|
||||
d.update(" ");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1079,7 +1076,7 @@ function serializeMailLabels() {
|
|||
var tds = r[i].childElements();
|
||||
var name = r[i].readAttribute("data-name");
|
||||
var label = $(tds.first()).innerHTML;
|
||||
var color = $(tds.last().childElements().first()).showColor;
|
||||
var color = $(tds.last().childElements().first()).readAttribute('data-color');
|
||||
|
||||
/* if name is null, that's because we've just added a new tag */
|
||||
if (!name) {
|
||||
|
|
|
@ -1153,7 +1153,8 @@ DIV.bottomToolbar A.bottomButton SPAN:active
|
|||
left: 0px; }
|
||||
|
||||
/* color box */
|
||||
DIV.colorBox
|
||||
DIV.colorBox,
|
||||
#colorPickerDialog SPAN
|
||||
{ cursor: pointer;
|
||||
margin: 0 3px 0 0;
|
||||
height: 12px;
|
||||
|
@ -1164,6 +1165,225 @@ DIV.colorBox
|
|||
border-radius: 2px;
|
||||
border: 0px; }
|
||||
|
||||
#colorPickerDialog SPAN
|
||||
{ float: left;
|
||||
margin: 3px; }
|
||||
|
||||
#colorPickerDialog SPAN:hover
|
||||
{ border: 2px solid transparent;
|
||||
margin: 1px; }
|
||||
|
||||
.blc-FFFFFF {
|
||||
background-color: #FFFFFF;
|
||||
}
|
||||
.blc-CCCCCC {
|
||||
background-color: #CCCCCC;
|
||||
}
|
||||
.blc-C0C0C0 {
|
||||
background-color: #C0C0C0;
|
||||
}
|
||||
.blc-999999 {
|
||||
background-color: #999999;
|
||||
}
|
||||
.blc-666666 {
|
||||
background-color: #666666;
|
||||
}
|
||||
.blc-333333 {
|
||||
background-color: #333333;
|
||||
}
|
||||
.blc-000000 {
|
||||
background-color: #000000;
|
||||
}
|
||||
.blc-FFCCCC {
|
||||
background-color: #FFCCCC;
|
||||
}
|
||||
.blc-FF6666 {
|
||||
background-color: #FF6666;
|
||||
}
|
||||
.blc-FF0000 {
|
||||
background-color: #FF0000;
|
||||
}
|
||||
.blc-CC0000 {
|
||||
background-color: #CC0000;
|
||||
}
|
||||
.blc-990000 {
|
||||
background-color: #990000;
|
||||
}
|
||||
.blc-660000 {
|
||||
background-color: #660000;
|
||||
}
|
||||
.blc-330000 {
|
||||
background-color: #330000;
|
||||
}
|
||||
.blc-FFCC99 {
|
||||
background-color: #FFCC99;
|
||||
}
|
||||
.blc-FF9966 {
|
||||
background-color: #FF9966;
|
||||
}
|
||||
.blc-FF9900 {
|
||||
background-color: #FF9900;
|
||||
}
|
||||
.blc-FF6600 {
|
||||
background-color: #FF6600;
|
||||
}
|
||||
.blc-CC6600 {
|
||||
background-color: #CC6600;
|
||||
}
|
||||
.blc-993300 {
|
||||
background-color: #993300;
|
||||
}
|
||||
.blc-663300 {
|
||||
background-color: #663300;
|
||||
}
|
||||
.blc-FFFF99 {
|
||||
background-color: #FFFF99;
|
||||
}
|
||||
.blc-FFFF66 {
|
||||
background-color: #FFFF66;
|
||||
}
|
||||
.blc-FFCC66 {
|
||||
background-color: #FFCC66;
|
||||
}
|
||||
.blc-FFCC33 {
|
||||
background-color: #FFCC33;
|
||||
}
|
||||
.blc-CC9933 {
|
||||
background-color: #CC9933;
|
||||
}
|
||||
.blc-996633 {
|
||||
background-color: #996633;
|
||||
}
|
||||
.blc-663333 {
|
||||
background-color: #663333;
|
||||
}
|
||||
.blc-FFFFCC {
|
||||
background-color: #FFFFCC;
|
||||
}
|
||||
.blc-FFFF33 {
|
||||
background-color: #FFFF33;
|
||||
}
|
||||
.blc-FFFF00 {
|
||||
background-color: #FFFF00;
|
||||
}
|
||||
.blc-FFCC00 {
|
||||
background-color: #FFCC00;
|
||||
}
|
||||
.blc-999900 {
|
||||
background-color: #999900;
|
||||
}
|
||||
.blc-666600 {
|
||||
background-color: #666600;
|
||||
}
|
||||
.blc-333300 {
|
||||
background-color: #333300;
|
||||
}
|
||||
.blc-99FF99 {
|
||||
background-color: #99FF99;
|
||||
}
|
||||
.blc-66FF99 {
|
||||
background-color: #66FF99;
|
||||
}
|
||||
.blc-33FF33 {
|
||||
background-color: #33FF33;
|
||||
}
|
||||
.blc-33CC00 {
|
||||
background-color: #33CC00;
|
||||
}
|
||||
.blc-009900 {
|
||||
background-color: #009900;
|
||||
}
|
||||
.blc-006600 {
|
||||
background-color: #006600;
|
||||
}
|
||||
.blc-003300 {
|
||||
background-color: #003300;
|
||||
}
|
||||
.blc-99FFFF {
|
||||
background-color: #99FFFF;
|
||||
}
|
||||
.blc-33FFFF {
|
||||
background-color: #33FFFF;
|
||||
}
|
||||
.blc-66CCCC {
|
||||
background-color: #66CCCC;
|
||||
}
|
||||
.blc-00CCCC {
|
||||
background-color: #00CCCC;
|
||||
}
|
||||
.blc-339999 {
|
||||
background-color: #339999;
|
||||
}
|
||||
.blc-336666 {
|
||||
background-color: #336666;
|
||||
}
|
||||
.blc-003333 {
|
||||
background-color: #003333;
|
||||
}
|
||||
.blc-CCFFFF {
|
||||
background-color: #CCFFFF;
|
||||
}
|
||||
.blc-66FFFF {
|
||||
background-color: #66FFFF;
|
||||
}
|
||||
.blc-33CCFF {
|
||||
background-color: #33CCFF;
|
||||
}
|
||||
.blc-3366FF {
|
||||
background-color: #3366FF;
|
||||
}
|
||||
.blc-3333FF {
|
||||
background-color: #3333FF;
|
||||
}
|
||||
.blc-000099 {
|
||||
background-color: #000099;
|
||||
}
|
||||
.blc-000066 {
|
||||
background-color: #000066;
|
||||
}
|
||||
.blc-CCCCFF {
|
||||
background-color: #CCCCFF;
|
||||
}
|
||||
.blc-9999FF {
|
||||
background-color: #9999FF;
|
||||
}
|
||||
.blc-6666CC {
|
||||
background-color: #6666CC;
|
||||
}
|
||||
.blc-6633FF {
|
||||
background-color: #6633FF;
|
||||
}
|
||||
.blc-6600CC {
|
||||
background-color: #6600CC;
|
||||
}
|
||||
.blc-333399 {
|
||||
background-color: #333399;
|
||||
}
|
||||
.blc-330099 {
|
||||
background-color: #330099;
|
||||
}
|
||||
.blc-FFCCFF {
|
||||
background-color: #FFCCFF;
|
||||
}
|
||||
.blc-FF99FF {
|
||||
background-color: #FF99FF;
|
||||
}
|
||||
.blc-CC66CC {
|
||||
background-color: #CC66CC;
|
||||
}
|
||||
.blc-CC33CC {
|
||||
background-color: #CC33CC;
|
||||
}
|
||||
.blc-993399 {
|
||||
background-color: #993399;
|
||||
}
|
||||
.blc-663366 {
|
||||
background-color: #663366;
|
||||
}
|
||||
.blc-330033 {
|
||||
background-color: #330033;
|
||||
}
|
||||
|
||||
/* ckeditor */
|
||||
span.cke_skin_kama
|
||||
{ padding: 0px !important; }
|
||||
|
|
|
@ -1,191 +0,0 @@
|
|||
#dhtmlgoodies_colorPicker{
|
||||
position:absolute;
|
||||
width:250px;
|
||||
padding-bottom:1px;
|
||||
background-color:#FFF;
|
||||
border:1px solid #317082;
|
||||
|
||||
width: 252px; /* IE 5.x */
|
||||
width/* */:/**/250px; /* Other browsers */
|
||||
width: /**/250px;
|
||||
|
||||
}
|
||||
|
||||
#dhtmlgoodies_colorPicker .colorPicker_topRow{
|
||||
padding-bottom:1px;
|
||||
border-bottom:3px double #317082;
|
||||
background-color:#E2EBED;
|
||||
padding-left:2px;
|
||||
|
||||
width: 250px; /* IE 5.x */
|
||||
width/* */:/**/248px; /* Other browsers */
|
||||
width: /**/248px;
|
||||
|
||||
height: 20px; /* IE 5.x */
|
||||
height/* */:/**/16px; /* Other browsers */
|
||||
height: /**/16px;
|
||||
|
||||
}
|
||||
|
||||
#dhtmlgoodies_colorPicker .colorPicker_statusBar{
|
||||
height:13px;
|
||||
padding-bottom:2px;
|
||||
width:248px;
|
||||
border-top:3px double #317082;
|
||||
background-color:#E2EBED;
|
||||
padding-left:2px;
|
||||
clear:both;
|
||||
|
||||
width: 250px; /* IE 5.x */
|
||||
width/* */:/**/248px; /* Other browsers */
|
||||
width: /**/248px;
|
||||
|
||||
height: 18px; /* IE 5.x */
|
||||
height/* */:/**/13px; /* Other browsers */
|
||||
height: /**/13px;
|
||||
|
||||
}
|
||||
|
||||
#dhtmlgoodies_colorPicker .colorSquare{
|
||||
margin-left:1px;
|
||||
margin-bottom:1px;
|
||||
float:left;
|
||||
border:1px solid #000;
|
||||
cursor:pointer;
|
||||
|
||||
width: 12px; /* IE 5.x */
|
||||
width/* */:/**/10px; /* Other browsers */
|
||||
width: /**/10px;
|
||||
|
||||
height: 12px; /* IE 5.x */
|
||||
height/* */:/**/10px; /* Other browsers */
|
||||
height: /**/10px;
|
||||
|
||||
}
|
||||
|
||||
.colorPickerTab_inactive,.colorPickerTab_active{
|
||||
|
||||
height:17px;
|
||||
padding-left:4px;
|
||||
cursor:pointer;
|
||||
|
||||
|
||||
}
|
||||
.colorPickerTab_inactive span{
|
||||
background-image:url('tab_left_inactive.gif');
|
||||
}
|
||||
|
||||
.colorPickerTab_active span{
|
||||
background-image:url('tab_left_active.gif');
|
||||
|
||||
}
|
||||
.colorPickerTab_inactive span, .colorPickerTab_active span{
|
||||
line-height:16px;
|
||||
font-weight:bold;
|
||||
font-family:arial;
|
||||
font-size:11px;
|
||||
padding-top:1px;
|
||||
vertical-align:middle;
|
||||
background-position:top left;
|
||||
background-repeat: no-repeat;
|
||||
float:left;
|
||||
padding-left:6px;
|
||||
-moz-user-select:no;
|
||||
}
|
||||
.colorPickerTab_inactive img,.colorPickerTab_active img{
|
||||
float:left;
|
||||
}
|
||||
.colorPickerCloseButton{
|
||||
width:11px;
|
||||
height:11px;
|
||||
text-align:center;
|
||||
line-height:10px;
|
||||
border:1px solid #317082;
|
||||
position:absolute;
|
||||
right:1px;
|
||||
font-size:12px;
|
||||
font-weight:bold;
|
||||
top:1px;
|
||||
padding:1px;
|
||||
cursor:pointer;
|
||||
|
||||
width: 15px; /* IE 5.x */
|
||||
width/* */:/**/11px; /* Other browsers */
|
||||
width: /**/11px;
|
||||
|
||||
height: 15px; /* IE 5.x */
|
||||
height/* */:/**/11px; /* Other browsers */
|
||||
height: /**/11px;
|
||||
|
||||
|
||||
}
|
||||
#colorPicker_statusBarTxt{
|
||||
font-size:11px;
|
||||
font-family:arial;
|
||||
vertical-align:top;
|
||||
line-height:13px;
|
||||
|
||||
}
|
||||
form{
|
||||
padding-left:5px;
|
||||
}
|
||||
|
||||
.form_widget_amount_slider{
|
||||
border-top:1px solid #9d9c99;
|
||||
border-left:1px solid #9d9c99;
|
||||
border-bottom:1px solid #eee;
|
||||
border-right:1px solid #eee;
|
||||
background-color:#f0ede0;
|
||||
position:absolute;
|
||||
bottom:0px;
|
||||
|
||||
width: 5px; /* IE 5.x */
|
||||
width/* */:/**/3px; /* Other browsers */
|
||||
width: /**/3px;
|
||||
|
||||
height: 5px; /* IE 5.x */
|
||||
height/* */:/**/3px; /* Other browsers */
|
||||
height: /**/3px;
|
||||
|
||||
}
|
||||
.colorSliderLabel{
|
||||
width:15px;
|
||||
height:20px;
|
||||
float:left;
|
||||
font-size:11px;
|
||||
font-weight:bold;
|
||||
}
|
||||
.colorSlider{
|
||||
width:175px;
|
||||
height:20px;
|
||||
float:left;
|
||||
}
|
||||
.colorInput{
|
||||
width:45px;
|
||||
height:20px;
|
||||
float:left;
|
||||
}
|
||||
.colorPreviewDiv{
|
||||
width:186px;
|
||||
margin-right:2px;
|
||||
margin-top:1px;
|
||||
border:1px solid #CCC;
|
||||
height:20px;
|
||||
float:left;
|
||||
cursor:pointer;
|
||||
|
||||
width: 188px; /* IE 5.x */
|
||||
width/* */:/**/186px; /* Other browsers */
|
||||
width: /**/186px;
|
||||
|
||||
height: 22px; /* IE 5.x */
|
||||
height/* */:/**/20px; /* Other browsers */
|
||||
height: /**/20px;
|
||||
|
||||
|
||||
}
|
||||
.colorCodeDiv{
|
||||
width:50px;
|
||||
height:20px;
|
||||
float:left;
|
||||
}
|
Loading…
Reference in New Issue