aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_cal.css4
-rw-r--r--view/css/mod_events.css4
-rw-r--r--view/css/widgets.css1
-rw-r--r--view/js/main.js5
-rw-r--r--view/theme/redbasic/css/style.css17
-rw-r--r--view/tpl/dreport.tpl21
-rwxr-xr-xview/tpl/event_head.tpl8
-rwxr-xr-xview/tpl/jot-header.tpl2
-rwxr-xr-xview/tpl/register.tpl3
9 files changed, 53 insertions, 12 deletions
diff --git a/view/css/mod_cal.css b/view/css/mod_cal.css
index 184227a91..f0b5c0166 100644
--- a/view/css/mod_cal.css
+++ b/view/css/mod_cal.css
@@ -1,7 +1,3 @@
-.fc-scroller {
- overflow: hidden !important;
-}
-
/* fix borders */
.fc th:first-child,
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 184227a91..f0b5c0166 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -1,7 +1,3 @@
-.fc-scroller {
- overflow: hidden !important;
-}
-
/* fix borders */
.fc th:first-child,
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 38809896c..2a7c57f53 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -11,6 +11,7 @@
width: 100%;
border-top-right-radius: 0px;
border-bottom-right-radius: 0px;
+ border-right: 0px;
}
.tags {
diff --git a/view/js/main.js b/view/js/main.js
index f279417d9..2caf5a1dd 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -941,6 +941,11 @@ function dropItem(url, object) {
$('body').css('cursor', 'auto');
});
});
+ return true;
+
+ }
+ else {
+ return false;
}
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c9c85daa3..5768ccbd9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1136,18 +1136,31 @@ margin-right: 50px;
list-style-type: none;
}
+.generic-icons {
+ font-size: 1.2em;
+ color: $toolicon_colour;
+ margin-right: 7px;
+}
+
+.generic-icons:hover {
+ color: $toolicon_colour;
+}
+
.admin-icons {
font-size: 1.2em;
color: $toolicon_colour;
- margin-right: 10px;
+ margin-right: 7px;
}
+.drop-icons,
a .drop-icons {
color: $toolicon_colour;
font-size: 1.2em;
text-decoration: none;
+ cursor: pointer;
}
-
+
+.drop-icons:hover,
a .drop-icons:hover {
color: #FF0000;
}
diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl
new file mode 100644
index 000000000..7d5524a6a
--- /dev/null
+++ b/view/tpl/dreport.tpl
@@ -0,0 +1,21 @@
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ {{if $table == 'item'}}
+ <a href="dreport/push/{{$mid}}"><button class="btn btn-default btn-xs pull-right">{{$push}}</button></a>
+ {{/if}}
+ <h2>{{$title}}</h2>
+ </div>
+
+ <div>
+ <table>
+ {{if $entries}}
+ {{foreach $entries as $e}}
+ <tr>
+ <td width="40%">{{$e.name}}</td>
+ <td width="20%">{{$e.result}}</td>
+ <td width="20%">{{$e.time}}</td>
+ </tr>
+ {{/foreach}}
+ {{/if}}
+ </table>
+</div>
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index 762bdcbb8..4397c5c9d 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -34,7 +34,13 @@
$('#events-calendar').fullCalendar('option', 'height', 'auto');
}
else {
- $('#events-calendar').fullCalendar('option', 'height', '');
+ if($('main').hasClass('fullscreen')) {
+ $('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper
+
+ }
+ else {
+ $('#calendar').fullCalendar('option', 'height', '');
+ }
}
$('#title').text(view.title);
}
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index f3dd8cafe..9953875ef 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -7,6 +7,7 @@ var pretext = '{{$pretext}}';
function initEditor(cb){
if (editor==false){
$("#profile-jot-text-loading").spin('small').show();
+ {{$geotag}}
if(plaintext == 'none') {
$("#profile-jot-text-loading").spin(false).hide();
$("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' });
@@ -362,7 +363,6 @@ function enableOnUser(){
$('#profile-nolocation-wrapper').attr('disabled', true);
}
- {{$geotag}}
var initializeEmbedPhotoDialog = function () {
$('.embed-photo-selected-photo').each(function (index) {
diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl
index 4a827ca16..c84934626 100755
--- a/view/tpl/register.tpl
+++ b/view/tpl/register.tpl
@@ -54,5 +54,8 @@
<button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button>
<div id="register-submit-end" class="register-field-end"></div>
</form>
+ <br />
+ <div class="descriptive-text">{{$verify_note}}</div>
+
</div>
</div>