aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-12-20 14:55:43 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-12-20 14:55:43 -0800
commitf23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4 (patch)
treeabce5d057b603d8e196ea74726c3fde485b43a83
parent61fa97baabd5fbb1b809b67e3ae717bd05fdbfd0 (diff)
downloadvolse-hubzilla-f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4.tar.gz
volse-hubzilla-f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4.tar.bz2
volse-hubzilla-f23e8f8d41f9fba23b0e65f9bf9fae1342ffc4d4.zip
merge hell
-rwxr-xr-x.openshift/action_hooks/deploy18
-rw-r--r--include/comanche.php3
-rw-r--r--version.inc2
-rwxr-xr-xview/tpl/jot.tpl69
4 files changed, 50 insertions, 42 deletions
diff --git a/.openshift/action_hooks/deploy b/.openshift/action_hooks/deploy
index 7abe3efd1..f3f187d43 100755
--- a/.openshift/action_hooks/deploy
+++ b/.openshift/action_hooks/deploy
@@ -190,16 +190,16 @@ util/config directory globaldir 1
util/config directory pubforums 0
# Hubzill addons
-# echo "Try to add or update Hubzilla addons"
-# cd ${OPENSHIFT_REPO_DIR}
-# util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons
+echo "Try to add or update Hubzilla addons"
+cd ${OPENSHIFT_REPO_DIR}
+util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons
# Hubzilla themes
-# echo "Try to add or update Hubzilla themes"
-# cd ${OPENSHIFT_REPO_DIR}
-# util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes
+echo "Try to add or update Hubzilla themes"
+cd ${OPENSHIFT_REPO_DIR}
+util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes
# Hubzilla ownMapp
-# echo "Try to add or update Hubzilla ownMapp"
-# cd ${OPENSHIFT_REPO_DIR}
-# util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp
+echo "Try to add or update Hubzilla ownMapp"
+cd ${OPENSHIFT_REPO_DIR}
+util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp
diff --git a/include/comanche.php b/include/comanche.php
index 1537226ca..ca3ad336b 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -287,8 +287,7 @@ function comanche_widget($name, $text) {
if(! function_exists($func)) {
if(file_exists('widget/' . trim($name) . '.php'))
require_once('widget/' . trim($name) . '.php');
- elseif(folder_exists('widget/'. trim($name))
- && (file_exists('widget/' . trim($name) . '/' . trim($name) . '.php')))
+ elseif(file_exists('widget/' . trim($name) . '/' . trim($name) . '.php'))
require_once('widget/' . trim($name) . '/' . trim($name) . '.php');
}
else {
diff --git a/version.inc b/version.inc
index 4887ba16b..75d1e127a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-12-18.1250
+2015-12-20.1252
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index d8b58c5d2..32a08a9b3 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -48,16 +48,6 @@
<div id="profile-jot-submit-wrapper" class="jothidden">
<div id="profile-jot-submit-left" class="btn-toolbar pull-left">
<div class="btn-group">
- {{if $writefiles}}
- <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
- <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
- </button>
- {{/if}}
- <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">
- <i id="profile-link" class="icon-link jot-icons"></i>
- </button>
- </div>
- <div class="btn-group hidden-xs hidden-sm text-formatting-button-group">
<button id="main-editor-bold" class="btn btn-default btn-sm" title="{{$bold}}" onclick="inserteditortag('b', 'profile-jot-text'); return false;">
<i class="icon-bold jot-icons"></i>
</button>
@@ -74,35 +64,49 @@
<i class="icon-terminal jot-icons"></i>
</button>
</div>
- <div class="btn-group privacy-button-group">
- {{if $feature_encrypt}}
- <button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
- <i id="profile-encrypt" class="icon-key jot-icons"></i>
+ {{if $visitor}}
+ <div class="btn-group hidden-xs">
+ {{if $writefiles}}
+ <button id="wall-file-upload" class="btn btn-default btn-sm" title="{{$attach}}" >
+ <i id="wall-file-upload-icon" class="icon-paper-clip jot-icons"></i>
</button>
- {{/if}}
- {{if $feature_future}}
- <button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
- <i id="profile-future" class="icon-time jot-icons"></i>
+ {{/if}}
+ <button id="profile-link-wrapper" class="btn btn-default btn-sm" title="{{$weblink}}" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;">
+ <i id="profile-link" class="icon-link jot-icons"></i>
+ </button>
+ </div>
+ <div class="btn-group hidden-xs hidden-sm">
+ <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
+ <i id="profile-location" class="icon-globe jot-icons"></i>
</button>
- {{/if}}
+ {{if $noloc}}
+ <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
+ <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
+ </button>
+ {{/if}}
+ {{else}}
+ <div class="btn-group hidden-xs">
+ {{/if}}
{{if $feature_expire}}
<button id="profile-expire-wrapper" class="btn btn-default btn-sm" title="{{$expires}}" onclick="jotGetExpiry();return false;">
<i id="profile-expires" class="icon-eraser jot-icons"></i>
</button>
{{/if}}
- {{if $noloc}}
- <button id="profile-nolocation-wrapper" class="btn btn-default btn-sm" title="{{$noloc}}" onclick="jotClearLocation();return false;" disabled="disabled">
- <i id="profile-nolocation" class="icon-circle-blank jot-icons"></i>
+ {{if $feature_future}}
+ <button id="profile-future-wrapper" class="btn btn-default btn-sm" title="{{$future_txt}}" onclick="jotGetPubDate();return false;">
+ <i id="profile-future" class="icon-time jot-icons"></i>
</button>
{{/if}}
- <button id="profile-location-wrapper" class="btn btn-default btn-sm" title="{{$setloc}}" onclick="jotGetLocation();return false;">
- <i id="profile-location" class="icon-globe jot-icons"></i>
+ {{if $feature_encrypt}}
+ <button id="profile-encrypt-wrapper" class="btn btn-default btn-sm" title="{{$encrypt}}" onclick="red_encrypt('{{$cipher}}','#profile-jot-text',$('#profile-jot-text').val());return false;">
+ <i id="profile-encrypt" class="icon-key jot-icons"></i>
</button>
- {{if $showacl}}
- <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
- <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="icon-exclamation jot-icons"></i>{{/if}}
- </button>
- {{/if}}
+ {{/if}}
+ {{if $feature_voting}}
+ <button id="profile-voting-wrapper" class="btn btn-default btn-sm" title="{{$voting}}" onclick="toggleVoting();return false;">
+ <i id="profile-voting" class="icon-check-empty jot-icons"></i>
+ </button>
+ {{/if}}
</div>
<div class="btn-group visible-xs visible-sm">
<button type="button" id="more-tools" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
@@ -137,10 +141,15 @@
</div>
<div id="profile-jot-submit-right" class="btn-group pull-right">
{{if $preview}}
- <button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
+ <button class="btn btn-default btn-sm hidden-xs" onclick="preview_post();return false;" title="{{$preview}}">
<i class="icon-eye-open jot-icons" ></i>
</button>
{{/if}}
+ {{if $showacl}}
+ <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+ <i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>{{if $bang}}&nbsp;<i class="icon-exclamation jot-icons"></i>{{/if}}
+ </button>
+ {{/if}}
<button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" tabindex=3 name="button-submit" >{{$share}}</button>
</div>
<div id="profile-jot-perms-end"></div>