aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_webpages.css9
-rw-r--r--view/theme/redbasic/css/style.css19
-rwxr-xr-xview/tpl/edpost_head.tpl13
-rwxr-xr-xview/tpl/jot-header.tpl2
-rwxr-xr-xview/tpl/jot.tpl15
-rw-r--r--view/tpl/webpagelist.tpl2
6 files changed, 26 insertions, 34 deletions
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index 7e4dbf569..075b789b8 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -30,12 +30,3 @@
.webpage-list-tool {
padding: 7px 10px;
}
-
-/* this forces collapsed jot to appear expanded */
-.jothidden {
- display: block !important;
-}
-
-#profile-jot-text {
- height: 200px;
-}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index b0614fcc4..df8d34066 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1586,11 +1586,14 @@ img.mail-list-sender-photo {
font-weight: bold;
}
-.jothidden >input, .jothidden >input {
- border: 1px solid #fff;
+.jothidden > input {
+ border: 1px solid $bgcolour;
+ background-color: $bgcolour;
}
-.jothidden >input:hover, .jothidden >input:focus {
+.jothidden > input:hover,
+.jothidden > input:focus {
border: 1px solid #cccccc;
+ background-color: #fff;
}
#profile-jot-text {
@@ -1723,7 +1726,8 @@ img.mail-list-sender-photo {
font-size: 0.833em;
}
-.wall-item-content {
+.wall-item-content,
+.page-body {
font-size: $font_size;
clear: both;
}
@@ -2210,8 +2214,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
/* Modified original CSS to match input in Redbasic */
.jothidden .bootstrap-tagsinput {
- border-color:#fff;
- background-color: #fff;
+ border-color: $bgcolour;
+ background-color: $bgcolour;
box-shadow: none;
display: inline-block;
border-radius: $radiuspx;
@@ -2225,7 +2229,8 @@ aside .nav > li > a:hover, aside .nav > li > a:focus {
}
.jothidden .bootstrap-tagsinput:hover, .jothidden .bootstrap-tagsinput:focus {
- border: 1px solid #cccccc;
+ border: 1px solid #ccc;
+ background-color: #fff;
}
/* Abusing theme-green is less work than makeing a new new one */
diff --git a/view/tpl/edpost_head.tpl b/view/tpl/edpost_head.tpl
index 890b746bf..20e597909 100755
--- a/view/tpl/edpost_head.tpl
+++ b/view/tpl/edpost_head.tpl
@@ -1 +1,12 @@
-<h2>{{$title}}</h2>
+<div class="section-title-wrapper">
+ {{if $delete}}
+ <div class="pull-right">
+ <a href="item/drop/{{$id}}" id="delete-btn" class="btn btn-xs btn-danger" onclick="return confirmDelete();"><i class="icon-trash"></i>&nbsp;{{$delete}}</a>
+ </div>
+ {{/if}}
+ <h2>{{$title}}</h2>
+ <div class="clear"></div>
+</div>
+<div id="webpage-editor" class="section-content-tools-wrapper">
+ {{$editor}}
+</div>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index f9ce65a86..4121882b7 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -108,8 +108,6 @@ function enableOnUser(){
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
- if($("#jot-attachment").val()) enableOnUser();
-
var upload_title = $('#wall-image-upload').attr('title');
var attach_title = $('#wall-file-upload').attr('title');
try {
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 24fea70f1..2fcd4d59b 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -176,20 +176,7 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
-<script type="text/javascript">
- $(function() {
- $('#datetimepicker1').datetimepicker({
- language: 'us',
- icons: {
- time: "icon-time",
- date: "icon-calendar",
- up: "icon-arrow-up",
- down: "icon-arrow-down"
- }
- });
- });
-</script>
-{{if $content}}
+{{if $content || $attachment || $expanded}}
<script>initEditor();</script>
{{/if}}
diff --git a/view/tpl/webpagelist.tpl b/view/tpl/webpagelist.tpl
index a3d42b0b4..2c79a496d 100644
--- a/view/tpl/webpagelist.tpl
+++ b/view/tpl/webpagelist.tpl
@@ -8,7 +8,7 @@
<div class="clear"></div>
</div>
{{if $editor}}
-<div id="webpage-editor" class="section-content-tools-wrapper form-group">
+<div id="webpage-editor" class="section-content-tools-wrapper">
{{$editor}}
</div>
{{/if}}