aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2014-04-11 16:06:39 +0200
committermarijus <mario@mariovavti.com>2014-04-11 16:06:39 +0200
commit3197ccbf5edf51eab49623c7c21e63af7de7f127 (patch)
treea5b12e724e84e4329d42273dca3ab69f971ece16 /view/tpl
parent93a56db3913b8023582fe4824b266988aa5a96d8 (diff)
downloadvolse-hubzilla-3197ccbf5edf51eab49623c7c21e63af7de7f127.tar.gz
volse-hubzilla-3197ccbf5edf51eab49623c7c21e63af7de7f127.tar.bz2
volse-hubzilla-3197ccbf5edf51eab49623c7c21e63af7de7f127.zip
bootstrapify aclselector
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/acl_selector.tpl46
-rw-r--r--view/tpl/chatroom_new.tpl5
-rwxr-xr-xview/tpl/jot-header.tpl6
-rwxr-xr-xview/tpl/jot.tpl12
-rw-r--r--view/tpl/mitemedit.tpl13
-rwxr-xr-xview/tpl/photo_view.tpl10
-rwxr-xr-xview/tpl/photos_upload.tpl9
-rwxr-xr-xview/tpl/settings.tpl15
8 files changed, 48 insertions, 68 deletions
diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl
index d869562e2..c98350843 100755
--- a/view/tpl/acl_selector.tpl
+++ b/view/tpl/acl_selector.tpl
@@ -1,18 +1,34 @@
-<div id="acl-wrapper">
- <input id="acl-search">
- <a href="#" id="acl-showall">{{$showall}}</a>
- <div id="acl-list">
- <div id="acl-list-content">
- </div>
- </div>
- <span id="acl-fields"></span>
-</div>
-
-<div class="acl-list-item" rel="acl-template" style="display:none">
- <img src="{0}"><p>{1}</p>
- <a href="#" class='acl-button-show'></a>
- <a href="#" class='acl-button-hide'></a>
-</div>
+<div class="modal" id="aclModal">
+ <div class="modal-dialog">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+ <h4 class="modal-title">{{$aclModalTitle}}</h4>
+ </div>
+ <div class="modal-body">
+ <div id="acl-wrapper">
+ <button id="acl-showall" class="btn btn-block btn-default"><i class="icon-globe"></i> {{$showall}}</button>
+ <input type="text" id="acl-search" placeholder="&#xf002;">
+ <div id="acl-list">
+ <div id="acl-list-content"></div>
+ </div>
+ <span id="acl-fields"></span>
+ </div>
+ <div class="acl-list-item" rel="acl-template" style="display:none">
+ <img src="{0}"><p>{1}</p>
+ <button class="acl-button-hide btn btn-xs btn-default"><i class="icon-remove"></i> {{$hide}}</button>
+ <button class="acl-button-show btn btn-xs btn-default"><i class="icon-ok"></i> {{$show}}</button>
+ </div>
+ {{if $jotnets}}
+ {{$jotnets}}
+ {{/if}}
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">{{$aclModalDismiss}}</button>
+ </div>
+ </div><!-- /.modal-content -->
+ </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
<script>
$(document).ready(function() {
diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl
index 86eadb132..287f95cc0 100644
--- a/view/tpl/chatroom_new.tpl
+++ b/view/tpl/chatroom_new.tpl
@@ -2,10 +2,11 @@
<form action="chat" method="post" >
{{include file="field_input.tpl" field=$name}}
-<br />
-<br />
+<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
{{$acl}}
<div class="clear"></div>
+<br />
+<br />
<input type="submit" name="submit" value="{{$submit}}" />
</form>
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index 25a7912ad..27b081b57 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -86,11 +86,7 @@ function initEditor(cb){
});
editor = true;
- // setup acl popup
- $("a#jot-perms-icon").colorbox({
- 'inline' : true,
- 'transition' : 'elastic'
- });
+
} else {
if (typeof cb!="undefined") cb();
}
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index e1b8dc906..c4fdba0f5 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -11,6 +11,7 @@
<input type="hidden" name="post_id" value="{{$post_id}}" />
<input type="hidden" name="webpage" value="{{$webpage}}" />
<input type="hidden" name="preview" id="jot-preview" value="0" />
+ {{if $showacl}}{{$acl}}{{/if}}
{{$mimeselect}}
{{$layoutselect}}
{{if $id_select}}
@@ -75,7 +76,9 @@
</div>
<div id="profile-jot-submit-right" class="btn-group pull-right">
{{if $showacl}}
- <a href="#profile-jot-acl-wrapper" class="btn btn-default btn-sm jot-icons icon-{{$lockstate}}" id="jot-perms-icon" title="{{$permset}}"></a>{{$bang}}
+ <button 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">{{$bang}}</i>
+ </button>
{{/if}}
{{if $preview}}
<button class="btn btn-default btn-sm" onclick="preview_post();return false;" title="{{$preview}}">
@@ -88,13 +91,6 @@
<div id="profile-jot-plugin-wrapper">
{{$jotplugins}}
</div>
- <div style="display: none;">
- <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
- {{$acl}}
- <hr style="clear:both"/>
- {{$jotnets}}
- </div>
- </div>
</div>
<div id="profile-jot-text-loading"></div>
<div id="profile-jot-end" class="clear"></div>
diff --git a/view/tpl/mitemedit.tpl b/view/tpl/mitemedit.tpl
index 8f13f80c9..482005e44 100644
--- a/view/tpl/mitemedit.tpl
+++ b/view/tpl/mitemedit.tpl
@@ -16,18 +16,9 @@
{{include file="field_checkbox.tpl" field=$newwin}}
<div id="settings-default-perms" class="settings-default-perms" >
- <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
+ <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+ {{$aclselect}}
<div id="settings-default-perms-menu-end"></div>
-
- <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-
- <div style="display: none;">
- <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
- {{$aclselect}}
- </div>
- </div>
-
- </div>
</div>
<br/>
<div id="settings-default-perms-end"></div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 067073b23..01f135522 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -54,15 +54,9 @@
<div id="settings-default-perms" class="settings-default-perms" >
<span id="jot-perms-icon" class="{{$edit.lockstate}}" ></span>
- <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$edit.permissions}}</a>
+ <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
+ {{$edit.aclselect}}
<div id="settings-default-perms-menu-end"></div>
- <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
- <div style="display: none;">
- <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
- {{$edit.aclselect}}
- </div>
- </div>
- </div>
</div>
<br/>
<div id="settings-default-perms-end"></div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 1ab80d346..62591c648 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -25,16 +25,11 @@
<div id="photos-upload-perms" class="photos-upload-perms" >
<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
- <a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button" />{{$permissions}}</a>
+ <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
</div>
+ {{$aclselect}}
<div id="photos-upload-perms-end"></div>
- <div style="display: none;">
- <div id="photos-upload-permissions-wrapper">
- {{$aclselect}}
- </div>
- </div>
-
<div id="photos-upload-spacer"></div>
{{$uploader}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index acea86015..accd8f106 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -34,7 +34,7 @@
</ul>
-<button type="button" class="btn btn-xs btn-warning" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
+<button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
@@ -73,18 +73,9 @@
</div>
<div id="settings-default-perms" class="settings-default-perms" >
- <a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" >{{$permissions}} {{$permdesc}}</a>
+ <button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+ {{$aclselect}}
<div id="settings-default-perms-menu-end"></div>
-
- <div id="settings-default-perms-select" style="display: none; margin-bottom: 20px" >
-
- <div style="display: none;">
- <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
- {{$aclselect}}
- </div>
- </div>
-
- </div>
</div>
<br/>
<div id="settings-default-perms-end"></div>