summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2012-01-21 16:24:58 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2012-01-21 16:24:58 (GMT)
commitb6cabf81006af154999ee8aa5dd7929d89d0c156 (patch)
treed170901e0eaee1a4f9f55f27ef90fc85d1a596a7
parent646195a0c4c6a6ed98d5c2a5e200dc4804cc3940 (diff)
downloadroundcubemail-plugins-kolab-b6cabf81006af154999ee8aa5dd7929d89d0c156.tar.gz
Adapt styles for Larry
-rw-r--r--plugins/calendar/calendar.php6
-rw-r--r--plugins/calendar/calendar_ui.js13
-rw-r--r--plugins/calendar/skins/larry/calendar.css84
-rw-r--r--plugins/calendar/skins/larry/templates/calendar.html6
-rw-r--r--plugins/calendar/skins/larry/templates/eventedit.html4
5 files changed, 69 insertions, 44 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 4a1ee3d..57da403 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1117,6 +1117,10 @@ class calendar extends rcube_plugin
if ($event['recurrence'])
$event['recurrence_text'] = $this->_recurrence_text($event['recurrence']);
+ foreach ((array)$event['attachments'] as $k => $attachment) {
+ $event['attachments'][$k]['classname'] = rcmail_filetype2classname($attachment['mimetype'], $attachment['name']);
+ }
+
return array(
'start' => gmdate('c', $this->fromGMT($event['start'])), // client treats date strings as they were in users's timezone
'end' => gmdate('c', $this->fromGMT($event['end'])), // so shift timestamps to users's timezone and render a date string
@@ -1438,6 +1442,7 @@ class calendar extends rcube_plugin
$content = html::a(array(
'href' => "#delete",
+ 'class' => 'delete',
'onclick' => sprintf("return %s.remove_from_attachment_list('rcmfile%s')", JS_OBJECT_NAME, $id),
'title' => rcube_label('delete'),
), $button);
@@ -1448,6 +1453,7 @@ class calendar extends rcube_plugin
'html' => $content,
'name' => $attachment['name'],
'mimetype' => $attachment['mimetype'],
+ 'classname' => rcmail_filetype2classname($attachment['mimetype'], $attachment['name']),
'complete' => true), $uploadid);
}
else { // upload failed
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 5fc5a20..2e50d43 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -276,10 +276,12 @@ function rcube_calendar_ui(settings)
{
var i, id, len, img, content, li, elem,
ul = document.createElement('UL');
+ ul.className = 'attachmentslist';
for (i=0, len=list.length; i<len; i++) {
- li = document.createElement('LI');
elem = list[i];
+ li = document.createElement('LI');
+ li.className = elem.classname;
if (edit) {
rcmail.env.attachments[elem.id] = elem;
@@ -287,6 +289,7 @@ function rcube_calendar_ui(settings)
content = document.createElement('A');
content.href = '#delete';
content.title = rcmail.gettext('delete');
+ content.className = 'delete';
$(content).click({id: elem.id}, function(e) { remove_attachment(this, e.data.id); return false; });
if (!rcmail.env.deleteicon)
@@ -303,7 +306,8 @@ function rcube_calendar_ui(settings)
// name/link
content = document.createElement('A');
- content.innerHTML = list[i].name;
+ content.innerHTML = elem.name;
+ content.className = 'file';
content.href = '#load';
$(content).click({event: event, att: elem}, function(e) {
load_attachment(e.data.event, e.data.att); return false; });
@@ -343,7 +347,8 @@ function rcube_calendar_ui(settings)
$('#event-description').show().children('.event-text').html(text2html(event.description, 300, 6));
// render from-to in a nice human-readable way
- $('#event-date').html(Q(me.event_date_text(event))).show();
+ // -> now shown in dialog title
+ // $('#event-date').html(Q(me.event_date_text(event))).show();
if (event.recurrence && event.recurrence_text)
$('#event-repeat').show().children('.event-text').html(Q(event.recurrence_text));
@@ -432,7 +437,7 @@ function rcube_calendar_ui(settings)
modal: false,
resizable: !bw.ie6,
closeOnEscape: (!bw.ie6 && !bw.ie7), // disable for performance reasons
- title: null,
+ title: Q(me.event_date_text(event)),
close: function() {
$dialog.dialog('destroy').hide();
},
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 42a6212..3b819bd 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -57,6 +57,7 @@ body.calendarmain #mainscreen {
background: -o-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
background: -ms-linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
background: linear-gradient(top, #d9f1fb 0%, #c5e3ee 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d9f1fb', endColorstr='#c5e3ee', GradientType=0);
}
#datepicker .ui-datepicker-activerange a.ui-state-active {
@@ -67,6 +68,17 @@ body.calendarmain #mainscreen {
background: -o-linear-gradient(top, #00acd4 0%, #008fc7 100%);
background: -ms-linear-gradient(top, #00acd4 0%, #008fc7 100%);
background: linear-gradient(top, #00acd4 0%, #008fc7 100%);
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00acd4', endColorstr='#008fc7', GradientType=0);
+}
+
+.ie9 #datepicker .ui-datepicker-activerange a {
+ filter: none;
+ background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20preserveAspectRatio%3D%22none%22%20version%3D%221.0%22%20width%3D%22100%25%22%20height%3D%22100%25%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%22mLG1%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%20spreadMethod%3D%22pad%22%3E%3Cstop%20offset%3D%220%25%22%20stop-color%3D%22%23d9f1fb%22%20stop-opacity%3D%221%22/%3E%3Cstop%20offset%3D%22100%25%22%20stop-color%3D%22%23c5e3ee%22%20stop-opacity%3D%221%22/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20style%3D%22fill%3Aurl%28%23mLG1%29%3B%22/%3E%3C/svg%3E) !important;
+}
+
+.ie9 #datepicker .ui-datepicker-activerange a.ui-state-active {
+ filter: none;
+ background-image: url(data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20preserveAspectRatio%3D%22none%22%20version%3D%221.0%22%20width%3D%22100%25%22%20height%3D%22100%25%22%3E%3Cdefs%3E%3ClinearGradient%20id%3D%22mLG1%22%20x1%3D%220%25%22%20y1%3D%220%25%22%20x2%3D%220%25%22%20y2%3D%22100%25%22%20spreadMethod%3D%22pad%22%3E%3Cstop%20offset%3D%220%25%22%20stop-color%3D%22%2300acd4%22%20stop-opacity%3D%221%22/%3E%3Cstop%20offset%3D%22100%25%22%20stop-color%3D%22%23008fc7%22%20stop-opacity%3D%221%22/%3E%3C/linearGradient%3E%3C/defs%3E%3Crect%20width%3D%22100%25%22%20height%3D%22100%25%22%20style%3D%22fill%3Aurl%28%23mLG1%29%3B%22/%3E%3C/svg%3E) !important;
}
#datepicker td.ui-datepicker-week-col {
@@ -142,6 +154,7 @@ pre {
cursor: default;
background: url(images/calendars.png) 0 -2px no-repeat;
padding-left: 22px;
+ padding-bottom: 2px;
color: #004458;
}
@@ -245,6 +258,10 @@ pre {
right: 4px;
}
+body.calendarmain #searchmenulink {
+ width: 15px;
+}
+
div.uidialog {
display: none;
}
@@ -306,44 +323,39 @@ a.miniColors-trigger {
font-weight: bold;
}
-.attachments-list ul {
- margin: 0px;
- padding: 0px;
- list-style-image: none;
- list-style-type: none;
+#edit-attachments {
+ margin-top: 0.6em;
}
-.attachments-list ul li {
- height: 18px;
- font-size: 12px;
- padding-top: 2px;
- padding-right: 8px;
+#edit-attachments ul li {
+ display: block;
+ color: #333;
+ font-weight: bold;
+ padding: 8px 4px 3px 30px;
+ text-shadow: 0px 1px 1px #fff;
+ text-decoration: none;
white-space: nowrap;
}
-.attachments-list ul li img {
- padding-right: 2px;
- vertical-align: middle;
+#edit-attachments ul li a.file {
+ padding: 0;
}
-.attachments-list ul li a {
- text-decoration: none;
+#edit-attachments-form {
+ padding-top: 1.2em;
}
-.attachments-list ul li a:hover {
- text-decoration: underline;
+#edit-attachments-form .buttons {
+ margin: 0.5em 0;
}
-#eventshow .attachments-list ul li {
+#event-attachments .attachmentslist li {
float: left;
+ margin-right: 1em;
}
-#edit-attachments-form {
- padding-top: 1.2em;
-}
-
-#edit-attachments-form .buttons {
- margin: 0.5em 0;
+#event-attachments .attachmentslist li a {
+ outline: none;
}
#event-attendees span.attendee {
@@ -991,11 +1003,6 @@ span.spacer {
/* fullcalendar style overrides */
.rcube-fc-content {
- position: absolute !important;
- top: 37px;
- left: 0;
- right: 0;
- bottom: 28px;
overflow: hidden;
border: 0;
border-radius: 4px 4px 0 0;
@@ -1003,6 +1010,14 @@ span.spacer {
-o-box-shadow: 0 0 2px #999;
-webkit-box-shadow: 0 0 2px #999;
-moz-box-shadow: 0 0 2px #999;
+}
+
+.fc-content {
+ position: absolute !important;
+ top: 37px;
+ left: 0;
+ right: 0;
+ bottom: 28px;
background: #fff;
}
@@ -1159,8 +1174,8 @@ div.calendar-invitebox {
min-height: 20px;
margin: 5px 8px;
padding: 3px 6px 6px 34px;
- border: 1px solid #C2D071;
- background: url(images/calendar.png) 6px 5px no-repeat #F7FDCB;
+ border: 1px solid #ffdf0e;
+ background: url(images/calendar.png) 6px 5px no-repeat #fef893;
}
div.calendar-invitebox td.ititle {
@@ -1180,14 +1195,13 @@ div.calendar-invitebox .rsvp-buttons {
}
#event-rsvp input.button,
-div.calendar-invitebox input.button,
-div.calendar-invitebox select {
- font-size: 11px;
+div.calendar-invitebox input.button {
+ font-weight: bold;
margin-right: 0.5em;
}
div.calendar-invitebox .calendar-select {
- font-size: 11px;
+ font-weight: 10px;
margin-left: 1em;
}
diff --git a/plugins/calendar/skins/larry/templates/calendar.html b/plugins/calendar/skins/larry/templates/calendar.html
index ec41f7c..9e3fbe6 100644
--- a/plugins/calendar/skins/larry/templates/calendar.html
+++ b/plugins/calendar/skins/larry/templates/calendar.html
@@ -5,7 +5,7 @@
<roundcube:include file="/includes/links.html" />
<!--[if lte IE 7]><link rel="stylesheet" type="text/css" href="./plugins/calendar/skins/default/iehacks.css" /><![endif]-->
</head>
-<body class="calendarmain">
+<body class="calendarmain noscroll">
<roundcube:include file="/includes/header.html" />
@@ -13,7 +13,7 @@
<div id="sidebar">
<div id="quicksearchbar">
<roundcube:object name="plugin.searchform" id="quicksearchbox" />
- <roundcube:button name="searchmenulink" id="searchmenulink" class="iconbutton searchoptions" onclick="return false" title="searchmod" content=" " />
+ <a id="searchmenulink" class="iconbutton searchoptions" > </a>
<roundcube:button command="reset-search" id="searchreset" class="iconbutton reset" title="resetsearch" content=" " />
</div>
@@ -98,7 +98,7 @@
</div>
<div class="event-section" id="event-attachments">
<label><roundcube:label name="attachments" /></label>
- <div class="event-text attachments-list"></div>
+ <div class="event-text"></div>
</div>
<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" style="display:none" />
diff --git a/plugins/calendar/skins/larry/templates/eventedit.html b/plugins/calendar/skins/larry/templates/eventedit.html
index 07afc17..a3f58e8 100644
--- a/plugins/calendar/skins/larry/templates/eventedit.html
+++ b/plugins/calendar/skins/larry/templates/eventedit.html
@@ -85,8 +85,8 @@
</div>
<!-- attachments list (with upload form) -->
<div id="event-tab-4">
- <div id="edit-attachments" class="attachment-list">
- <roundcube:object name="plugin.attachments_list" id="attachment-list" deleteIcon="/images/icons/delete.png" cancelIcon="/images/icons/delete.png" loadingIcon="/images/display/loading_blue.gif" />
+ <div id="edit-attachments">
+ <roundcube:object name="plugin.attachments_list" id="attachment-list" class="attachmentslist" cancelIcon="/images/0.gif" />
</div>
<div id="edit-attachments-form">
<roundcube:object name="plugin.attachments_form" id="calendar-attachment-form" attachmentFieldSize="30" />