aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-01 19:20:09 -0700
committerredmatrix <git@macgirvin.com>2016-05-01 19:20:09 -0700
commit23bb4e8e1546a8f8b3319e39172cf2fd17cb4139 (patch)
tree15b7ba8f607da56f7f84ab4d1039c4768069095d /view
parentcd518625bf561f1ed42db0b78030b74c32435136 (diff)
parentb4bf71dd0642e58fab6151e1df3c071d05650492 (diff)
downloadvolse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.gz
volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.tar.bz2
volse-hubzilla-23bb4e8e1546a8f8b3319e39172cf2fd17cb4139.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view')
-rw-r--r--view/js/autocomplete.js16
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/tpl/cloud_directory.tpl2
-rwxr-xr-xview/tpl/jot.tpl8
4 files changed, 18 insertions, 10 deletions
diff --git a/view/js/autocomplete.js b/view/js/autocomplete.js
index 41077d427..33d825b55 100644
--- a/view/js/autocomplete.js
+++ b/view/js/autocomplete.js
@@ -143,8 +143,11 @@ function listNewLineAutocomplete(id) {
if (word != null) {
var textBefore = text.value.substring(0, caretPos);
var textAfter = text.value.substring(caretPos, text.length);
- $('#' + id).val(textBefore + '\r\n[*] ' + textAfter);
- setCaretPosition(text, caretPos + 5);
+ var textInsert = (word.indexOf('[/dl]') > 0) ? '\r\n[*=] ' : '\r\n[*] ';
+ var caretPositionDiff = (word.indexOf('[/dl]') > 0) ? 3 : 1;
+
+ $('#' + id).val(textBefore + textInsert + textAfter);
+ setCaretPosition(text, caretPos + (textInsert.length - caretPositionDiff));
return true;
}
else {
@@ -296,10 +299,11 @@ function string2bb(element) {
replace: function (element) {
element = string2bb(element);
if(open_elements.indexOf(element) < 0) {
- if(element === 'list' || element === 'ol' || element === 'ul' || element === 'dl') {
- return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
- }
- else if(element === 'table') {
+ if(element === 'list' || element === 'ol' || element === 'ul') {
+ return ['\[' + element + '\]' + '\n\[*\] ', '\n\[/' + element + '\]'];
+ } else if (element === 'dl') {
+ return ['\[' + element + '\]' + '\n\[*=Item name\] ', '\n\[/' + element + '\]'];
+ } else if(element === 'table') {
return ['\[' + element + '\]' + '\n\[tr\]', '\[/tr\]\n\[/' + element + '\]'];
}
else {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c19005f11..58f216029 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1681,9 +1681,7 @@ nav .badge.mail-update:hover {
.navbar-inverse .navbar-nav > li > a {
- font-size: 12px;
color: $nav_icon_colour;
- text-shadow: 0px 0px 0px;
}
.navbar-inverse .navbar-nav > li > a:hover,
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl
index c0207c623..870f7e9e1 100644
--- a/view/tpl/cloud_directory.tpl
+++ b/view/tpl/cloud_directory.tpl
@@ -20,7 +20,7 @@
{{/if}}
{{foreach $entries as $item}}
<tr id="cloud-index-{{$item.attachId}}">
- <td><i class="{{$item.iconFromType}}" title="{{$item.type}}"></i></td>
+ <td><i class="fa {{$item.iconFromType}}" title="{{$item.type}}"></i></td>
<td><a href="{{$item.fullPath}}">{{$item.displayName}}</a></td>
{{if $item.is_owner}}
<td class="cloud-index-tool">{{$item.attachIcon}}</td>
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 3de92cddb..a9f6766dc 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -138,6 +138,9 @@
{{if $feature_expire}}
<li><a href="#" onclick="jotGetExpiry(); return false;"><i class="fa fa-eraser"></i>&nbsp;{{$expires}}</a></li>
{{/if}}
+ {{if $feature_future}}
+ <li><a href="#" onclick="jotGetPubDate();return false;"><i class="fa fa-clock-o"></i>&nbsp;{{$future_txt}}</a></li>
+ {{/if}}
{{if $feature_encrypt}}
<li><a href="#" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;"><i class="fa fa-key"></i>&nbsp;{{$encrypt}}</a></li>
{{/if}}
@@ -176,6 +179,7 @@
<div id="jot-preview-content" style="display:none;"></div>
+{{if $feature_expire}}
<!-- Modal for item expiry-->
<div class="modal" id="expiryModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true">
<div class="modal-dialog">
@@ -196,7 +200,9 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
+{{/if}}
+{{if $feature_future}}
<!-- Modal for item created-->
<div class="modal" id="createdModal" tabindex="-1" role="dialog" aria-labelledby="createdModalLabel" aria-hidden="true">
<div class="modal-dialog">
@@ -217,7 +223,7 @@
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
-
+{{/if}}
{{if $content || $attachment || $expanded}}
<script>initEditor();</script>