extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

pixelegg changes from last week

Browse Source
This commit is contained in:
Ralf Becker 2013-11-25 03:19:58 +00:00
parent 2925d10165
commit 5c7a290ac9
11 changed files with 747 additions and 814 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
calendar/templates/default/edit.xet
View File

@ -27,7 +27,7 @@
</row>
<row>
<description/>
<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search"/>
<buttononly statustext="Find free timeslots where the selected participants are availible for the given timespan" label="Freetime search" id="freetime" onclick="app.calendar.freetime_search" image="add" background_image="1"/>
</row>
<row class="row">
<description for="location" value="Location" width="0"/>
@ -92,7 +92,7 @@
<menulist>
<menupopup class="selectRole" id="role"/>
</menulist>
<button align="center" label="Add" id="add"/>
<button align="center" label="Add" id="add" image="add" background_image="1"/>
<description/>
</row>
<row class="th">
@ -201,7 +201,7 @@
</columns>
<rows>
<row class="th" disabled="@view">
<description value="Create new links" span="all"/>
<description value="Create new links" span="all" class="gray"/>
</row>
<row class="row" disabled="@view">
<link-to id="link_to" span="all"/>
@ -298,8 +298,8 @@
<vbox class="prompt">
<description value="Do you want to keep the series exceptions in your calendar?"/>
<hbox align="center">
<button statustext="All exceptions are converted into single events." label="Keep exceptions" id="button[delete_keep_exceptions]"/>
<button statustext="The exceptions are deleted together with the series." label="Delete exceptions" id="button[delete_exceptions]"/>
<button statustext="All exceptions are converted into single events." label="Keep exceptions" id="button[delete_keep_exceptions]" image="keep" background_image="1"/>
<button statustext="The exceptions are deleted together with the series." label="Delete exceptions" id="button[delete_exceptions]" image="delete" background_image="1"/>
<buttononly label="Cancel" onclick="jQuery(document.getElementById('calendar-edit_calendar-delete_series')).hide();"/>
</hbox>
</vbox>
@ -320,7 +320,7 @@
<description/>
<description/>
</row>
<row class="th" height="28">
<row class="th dialog-header" height="28">
<description value="Title"/>
<hbox needed="1" options="0,0" span="all">
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/>
@ -351,7 +351,7 @@
</tabpanels>
</tabbox>
</row>
<row disabled="!@owner">
<row disabled="!@owner" class="dialog-operators">
<description value="Owner"/>
<menulist>
<menupopup type="select-account" id="owner" readonly="true"/>
@ -361,17 +361,17 @@
<menupopup type="select-account" align="right" class="noBreak" label="by" id="modifier" readonly="true"/>
</menulist>
</row>
<row>
<row class="dialog-footer-toolbar">
<hbox span="3">
<button statustext="saves the changes made" label="Save" id="button[save]"/>
<button statustext="apply the changes" label="Apply" id="button[apply]"/>
<button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();"/>
<button statustext="saves the changes made" label="Save" id="button[save]" image="save" background_image="1"/>
<button statustext="apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"/>
<button statustext="Close the window" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
<menulist>
<menupopup statustext="Execute a further action for this entry" id="action" onchange="app.calendar.actions_change" options="Actions..."/>
</menulist>
<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
</hbox>
<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="return app.calendar.delete_btn($cont[query_delete_exceptions]);"/>
<button align="right" statustext="Delete this event" label="Delete" id="button[delete]" onclick="return app.calendar.delete_btn($cont[query_delete_exceptions]);" image="delete" background_image="1"/>
</row>
<row >
<template id="calendar.delete_series" span="all" />

6
calendar/templates/default/edit_series.xet
View File

@ -9,9 +9,9 @@
<vbox class="prompt" id="dialog-content">
<description value="Do you want to edit this event as an exception or the whole series?"/>
<hbox align="center">
<buttononly label="Edit exception" onclick="app.calendar.open_edit(false);"/>
<buttononly label="Edit series" onclick="app.calendar.open_edit(true);"/>
<buttononly label="Cancel" onclick="document.getElementById('edit_series').style.display = 'none';"/>
<buttononly label="Edit exception" onclick="app.calendar.open_edit(false);" image="edit" background_image="1"/>
<buttononly label="Edit series" onclick="app.calendar.open_edit(true);" image="edit" background_image="1"/>
<buttononly label="Cancel" onclick="document.getElementById('edit_series').style.display = 'none';" image="cancel" background_image="1"/>
</hbox>
</vbox>
</vbox>

2
calendar/templates/default/export.xet
View File

@ -31,7 +31,7 @@
</row>
<row>
<description/>
<button label="Download" id="download"/>
<button label="Download" id="download" image="download" background_image="1"/>
</row>
<row>
<description span="all"/>

12
calendar/templates/default/freetimesearch.xet
View File

@ -34,15 +34,15 @@
<column/>
</columns>
<rows>
<row>
<row class="dialog-header">
<description class="calendar_size120b" value="Freetime Search"/>
<description class="message" no_lang="1" id="msg"/>
</row>
<row>
<row class="dialog-operators high">
<description value="Startdate / -time"/>
<date-time id="start" statustext="Startdate and -time of the search"/>
</row>
<row>
<row class="dialog-operators">
<description value="Duration"/>
<hbox>
<menulist>
@ -51,7 +51,7 @@
<date-time id="end" statustext="Enddate / -time of the meeting, eg. for more then one day"/>
</hbox>
</row>
<row>
<row class="dialog-operators">
<description value="Timeframe"/>
<hbox>
<date-timeonly id="start_time" statustext="Timeframe to search"/>
@ -61,7 +61,7 @@
<listbox type="select-dow" rows="3" id="weekdays" statustext="Weekdays to use in search"/>
</hbox>
</row>
<row>
<row class="dialog-operators">
<button label="New search" id="search" statustext="new search with the above parameters"/>
<hbox>
<menulist>
@ -70,7 +70,7 @@
<button id="cancel" label="Cancel" statustext="Close the window" onclick="window.close();"/>
</hbox>
</row>
<row>
<row class="dialog-operators">
<template content="freetime" span="all" id="calendar.freetimesearch.rows"/>
</row>
</rows>

23
calendar/templates/pixelegg/app.css
View File

@ -108,7 +108,7 @@ div.calendar {
background-color: #ffffff;
color: #000;
border: 1px solid;
border-color: #808080;
border-color: #828282;
padding: 1px;
}
.calendar thead .active {
@ -268,9 +268,10 @@ div.calendar {
div#calendar-edit {
width: 870px;
padding: 5px;
/*###########################################*/
}
div#calendar-edit label.et2_label {
padding: 0 2px;
/*padding: 0 2px;*/
}
div#calendar-edit .chzn-container {
padding-top: 1em;
@ -293,14 +294,19 @@ div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid #calendar-
float: left;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid button#calendar-edit_freetime {
background-image: url('../images/search.png') !important;
background-image: url('images/add.png') !important;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_checkbox,
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid input#calendar-edit_whole_day {
margin-left: 5px important;
border-left: 10px solid red;
}
div#calendar-edit #calendar-edit_calendar-edit-general table.et2_grid .et2_date {
float: left;
}
div#calendar-edit #calendar-edit_calendar-edit-general #calendar-edit_category {
border: 1px solid;
border-color: #bfbfbf;
border-color: #b4b4b4;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
@ -337,6 +343,9 @@ div#calendar-edit #calendar-edit_calendar-edit-links tbody {
display: table;
width: 100%;
}
div#calendar-edit #calendar-edit_calendar-edit-links span.et2_label {
padding: 1em;
}
div#calendar-edit #calendar-edit_calendar-edit-alarms tbody {
display: table;
width: 100%;
@ -927,12 +936,6 @@ tr.prefRow > td {
right: 55%;
display: none;
width: 33%;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
background-color: #f0f0f0;
border-color: #808080;
cursor: pointer;
background-color: #ffc200;
}
tr.prefRow:hover .prefHelp {

40
calendar/templates/pixelegg/app.less
View File

@ -137,7 +137,7 @@ div.calendar { position: relative; }
.background-color-0-gray;
color: #000;
border: 1px solid;
.border-color-50-gray;
border-color: @gray-50;
padding: 1px;
}
@ -354,7 +354,7 @@ div#calendar-edit{
width: 870px;
padding: 5px;
label.et2_label{
padding: 0 2px;
/*padding: 0 2px;*/
}
.chzn-container {
padding-top: 1em;
@ -364,6 +364,7 @@ div#calendar-edit{
background-color: transparent;
}
/*###########################################*/
// Tab General
#calendar-edit_calendar-edit-general{
display: block;
@ -382,7 +383,12 @@ div#calendar-edit{
// Terminsuche
button#calendar-edit_freetime {background-image: url('../images/search.png') !important;}
button#calendar-edit_freetime {background-image: url('images/add.png') !important;}
// hole day
.et2_checkbox,
input#calendar-edit_whole_day {margin-left: 5px important; border-left: 10px solid red;}
.et2_date{
float: left;
@ -391,7 +397,7 @@ div#calendar-edit{
}
#calendar-edit_category{
border: 1px solid;
.border-color-25-gray;
border-color: @gray-30;
.border_radius_button_normal;
}
@ -463,8 +469,9 @@ div#calendar-edit{
tbody{
display: table;
width: 100%;
}
span.et2_label {padding: 1em;}
}
// Alarme
@ -473,18 +480,6 @@ div#calendar-edit{
tbody{
display: table;
width: 100%;
// hinzufügen
// button {
//
// .Complete_Button_add;
// height: 28px;
// padding: 0px !important;
// margin: 0px;
// &:hover {.Complete_Button_add_hover;}
//
// }
}
}
@ -1085,14 +1080,7 @@ tr.prefRow > td {
right: 55%;
display: none;
width: 33%;
// background-color: lightyellow;
.Complete_Button_text;
// border: 1px solid black;
// border-radius: 10px;
// padding: 5px;
// margin-top: 5px;
.background-color-Context-Help;
background-color: @color-hint;
}
tr.prefRow:hover .prefHelp {
@ -1116,4 +1104,4 @@ tr.prefRow:hover .prefHelp {
padding-bottom: 5px;
}
//
//

1362
etemplate/templates/default/etemplate2.css
View File

File diff suppressed because it is too large Load Diff

10
importexport/templates/default/export_dialog.xet
View File

@ -153,16 +153,16 @@
</tabpanels>
</tabbox>
</row>
<row class="save_definition">
<row class="save_definition dialog-operators high">
<checkbox label="Save as definition" id="save_as_definition"/>
</row>
<row>
<row class="dialog-footer-toolbar">
<hbox span="all">
<hbox>
<button label="Export" id="export"/>
<button label="Preview" id="preview" onclick="app.importexport.export_preview"/>
<button label="Export" id="export" image="export" background_image="1"/>
<button label="Preview" id="preview" onclick="app.importexport.export_preview" image="prieview" background_image="1"/>
</hbox>
<button align="right" label="Cancel" id="cancel" onclick="window.close(); return false;"/>
<button class="cancel" align="right" label="Cancel" id="cancel" onclick="window.close(); return false;" image="cancel" background_image="1"/>
</hbox>
</row>
<row>

51
importexport/templates/pixelegg/app.css Executable file
View File

@ -0,0 +1,51 @@
/**
* EGroupware: CSS with less preprocessor
*
* Please do NOT change app.css directly, instead change app.less and compile it!
* Dialog Import Export
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
* @package projectmanager
* @version $Id$
*/
div.preview {
position: absolute;
top: 0px;
left: 0px;
width: 97%;
height: 95%;
overflow: hidden;
background-color: white;
z-index: 999;
display: none;
border: 1px solid black;
margin: 1.5%;
}
div.preview .content {
overflow: auto;
max-height: 99%;
display: block;
}
.preview_box .header,
.preview .header {
font-size: 150%;
margin-bottom: 5px;
padding: 5px;
border-bottom: 1px outset;
}
.preview tr {
vertical-align: top;
}
.preview div[id$='buttons'] {
position: absolute;
bottom: 0px;
width: 100%;
margin-left: 50%;
}
/* Dialog Import Export */
#importexport-export_dialog {
margin: 1em;
}

22
importexport/templates/pixelegg/app.less Executable file
View File

@ -0,0 +1,22 @@
/**
* EGroupware: CSS with less preprocessor
*
* Please do NOT change app.css directly, instead change app.less and compile it!
* Dialog Import Export
*
* @link http://www.egroupware.org
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @author Stefan Reinhard <stefan.reinhard@pixelegg.de>
* @package projectmanager
* @version $Id$
*/
@import (reference) "../../../pixelegg/less/def_buttons.less";
@import (reference) "../../../pixelegg/less/def_design_pattern_color_font_shadow.less";
@import (less) "../default/app.css";
/* Dialog Import Export */
#importexport-export_dialog {margin: 1em;}

9
infolog/templates/default/edit.xet
View File

@ -181,7 +181,7 @@
<menupopup statustext="Type of the log-entry: Note, Phonecall or ToDo" id="info_type" no_lang="1" onchange="1"/>
</menulist>
</hbox>
<textbox type="integer" id="info_number" readonly="true" span="2" class="infolog_infoId"/>
<textbox type="integer" id="info_number" readonly="true" span="4" class="infolog_infoId"/>
</row>
<row class="row dialog-header" valign="top">
<description value="Contact" for="info_from"/>
@ -278,7 +278,7 @@
</vbox>
</row>
<row class="dialog-footer-toolbar">
<hbox span="3">
<hbox span="2">
<button statustext="Saves this entry" label="Save" id="button[save]" image="save" background_image="1"/>
<button statustext="Apply the changes" label="Apply" id="button[apply]" image="apply" background_image="1"/>
<button statustext="leave without saveing the entry" label="Cancel" id="button[cancel]" onclick="window.close();" image="cancel" background_image="1"/>
@ -287,8 +287,9 @@
</menulist>
</hbox>
<description/>
<hbox span="2">
<checkbox label="Do not notify of these changes" id="no_notifications" span="2"/>
<hbox span="3">
<checkbox label="Do not notify of these changes" id="no_notifications" span="3"/>
<button align="right" statustext="delete this entry" label="Delete" id="button[delete]" onclick="return $cont[info_anz_subs] || confirm('Delete this entry');" image="delete" background_image="1"/>
</hbox>
</row>