aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/bootstrap-red.css3
-rw-r--r--view/css/mod_events.css36
-rw-r--r--view/pdl/mod_events.pdl1
-rw-r--r--view/theme/redbasic/css/style.css78
-rwxr-xr-xview/tpl/event_head.tpl4
-rwxr-xr-xview/tpl/events-js.tpl17
-rwxr-xr-xview/tpl/events_menu_side.tpl (renamed from view/tpl/events_side.tpl)0
-rwxr-xr-xview/tpl/events_tools_side.tpl15
8 files changed, 67 insertions, 87 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 19796679a..29164c7ad 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -57,7 +57,8 @@ nav .navbar-toggle {
/* nav overrides end */
-aside .nav-pills > li > a {
+aside .nav-pills > li > a,
+.response-list .nav-pills > li > a {
padding: 6px 10px;
}
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 5e0fc2bce..dc1dc902f 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -4,6 +4,21 @@
margin-bottom: -1px;
}
+.fc-unthemed th,
+.fc-unthemed td,
+.fc-unthemed thead,
+.fc-unthemed tbody,
+.fc-unthemed .fc-divider,
+.fc-unthemed .fc-row,
+.fc-unthemed .fc-popover {
+ border-color: #ccc !important;
+}
+
+#events-spinner .spinner {
+ margin-top: 9px;
+ margin-bottom: -9px;
+}
+
.bootstrap-tagsinput {
width: 100%;
padding: 6px 12px;
@@ -14,3 +29,24 @@
height: auto;
padding: 10px;
}
+
+.event-owner {
+ margin-bottom: 15px;
+}
+
+.event-owner img {
+ margin-right: 5px;
+}
+
+.event-buttons,
+.event-description {
+ margin-top: 10px;
+}
+
+#event-upload-form {
+ margin-top: 10px;
+}
+
+#event-upload-choose {
+ width: 100%;
+}
diff --git a/view/pdl/mod_events.pdl b/view/pdl/mod_events.pdl
index 5a71d88d9..a3bc0c019 100644
--- a/view/pdl/mod_events.pdl
+++ b/view/pdl/mod_events.pdl
@@ -1,4 +1,5 @@
[region=aside]
[widget=eventsmenu][/widget]
+[widget=eventstools][/widget]
[widget=tasklist][/widget]
[/region]
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fe6f10365..e392f00d9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -241,7 +241,8 @@ footer {
padding-right: 3em;
}
-.birthday-today, .event-today {
+.birthday-today,
+.event-today {
font-weight: bold;
}
@@ -847,68 +848,6 @@ nav .acpopup {
cursor: pointer;
}
-.fc-unthemed th,
-.fc-unthemed td,
-.fc-unthemed thead,
-.fc-unthemed tbody,
-.fc-unthemed .fc-divider,
-.fc-unthemed .fc-row,
-.fc-unthemed .fc-popover {
- border-color: #ccc !important;
-}
-
-.wall-event-item {
- padding: 10px;
- color: #fff;
- background-color: #3A87AD; /* should reflect calendar color */
- border-top-left-radius: $radiuspx;
- border-top-right-radius: $radiuspx;
-}
-
-.vevent .event-end {
- padding-bottom: 10px;
-}
-
-#event-summary-text {
- margin-top: 15px;
-}
-
-
-#new-event-link {
- margin-bottom: 10px;
-}
-
-.edit-event-link, .plink-event-link, .drop-event-link {
- float: left;
- margin-top: 4px;
- margin-right: 4px;
- margin-bottom: 15px;
-}
-
-.event-owner img {
- padding-bottom: 10px;
- padding-right: 10px;
-}
-
-.event-buttons {
- margin-top: 10px;
-}
-
-.event-list-date {
- margin-bottom: 10px;
-}
-
-.prevcal, .nextcal {
- float: left;
- margin-left: 32px;
- margin-right: 32px;
- margin-top: 64px;
-}
-.event-calendar-end {
- clear: both;
-}
-
-
#cboxOverlay {
z-index: 1050;
}
@@ -1562,8 +1501,12 @@ img.mail-conv-sender-photo {
padding: 0.5em 10px;
}
-.wall-photo-item {
- /*padding: 0.5em 10px;*/
+.wall-event-item {
+ padding: 10px;
+ color: #fff;
+ background-color: #3A87AD; /* should reflect calendar color */
+ border-top-left-radius: $radiuspx;
+ border-top-right-radius: $radiuspx;
}
.wall-photo-item img {
@@ -2252,8 +2195,3 @@ nav .badge.mail-update:hover {
.help-searchlist a {
font-size: 130%;
}
-
-.response-list ul {
- list-style-type: none;
-}
-
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 6a38057fd..dc98d14b3 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -55,7 +55,11 @@
showEvent(calEvent.id);
},
loading: function(isLoading, view) {
+ $('#events-spinner').spin('tiny');
+ $('#events-spinner > i').css('color', 'transparent');
if(!isLoading) {
+ $('#events-spinner').spin(false);
+ $('#events-spinner > i').css('color', '');
$('td.fc-day').dblclick(function() {
openMenu('form');
//window.location.href='/events/new?start='+$(this).data('date');
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index b2de90da1..08c8aa64a 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,12 +1,10 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper">
<div class="pull-right">
- <button class="btn btn-default btn-xs" onclick="openClose('event-tools'); closeMenu('form');"><i class="icon-cog"></i></button>
<button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button>
-
<div class="btn-group">
<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
- <button class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
+ <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
</div>
</div>
@@ -16,19 +14,6 @@
<div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}>
{{$form}}
</div>
- <div id="event-tools" class="section-content-tools-wrapper" style="display:none;">
- <div class="form-group">
- <button class="btn btn-primary btn-xs" onclick="exportDate(); return false;"><i class="icon-download"></i>&nbsp;{{$export.1}}</button>
- <button class="btn btn-primary btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
- </div>
- <div id="event-upload-form" style="display:none;">
- <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
- <button id="dbtn-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" >{{$submit}}</button>
- <input id="event-upload-choose" type="file" name="userfile" />
-
- </form>
- </div>
- </div>
<div class="clear"></div>
<div class="section-content-wrapper-np">
<div id="events-calendar"></div>
diff --git a/view/tpl/events_side.tpl b/view/tpl/events_menu_side.tpl
index b9a9062b1..b9a9062b1 100755
--- a/view/tpl/events_side.tpl
+++ b/view/tpl/events_menu_side.tpl
diff --git a/view/tpl/events_tools_side.tpl b/view/tpl/events_tools_side.tpl
new file mode 100755
index 000000000..5e20511fc
--- /dev/null
+++ b/view/tpl/events_tools_side.tpl
@@ -0,0 +1,15 @@
+<div class="widget">
+ <h3>{{$title}}</h3>
+ <ul class="nav nav-pills nav-stacked">
+ <li><a href="#" onclick="exportDate(); return false;"><i class="icon-download"></i>&nbsp;{{$export}}</a></li>
+ <li><a href="#" onclick="openClose('event-upload-form'); return false;"><i class="icon-upload"></i>&nbsp;{{$import}}</a></li>
+ </ul>
+ <div id="event-upload-form" style="display: none;">
+ <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
+ <div class="form-group">
+ <input id="event-upload-choose" type="file" name="userfile" />
+ </div>
+ <button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit" >{{$submit}}</button>
+ </form>
+ </div>
+</div>