aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-06-29 10:15:55 +1000
committerRedMatrix <info@friendica.com>2014-06-29 10:15:55 +1000
commitf29f8a1b40ba68db66c22bbb824371296c86ac8c (patch)
treeffacd4ba6908b726d4209706af8c1a66b3ce4c2c
parente6a29c7ceac0dae5340b1922a2c9551be721e497 (diff)
parentdfe45342f6739bef9b3dff8e49641bb58998c757 (diff)
downloadvolse-hubzilla-f29f8a1b40ba68db66c22bbb824371296c86ac8c.tar.gz
volse-hubzilla-f29f8a1b40ba68db66c22bbb824371296c86ac8c.tar.bz2
volse-hubzilla-f29f8a1b40ba68db66c22bbb824371296c86ac8c.zip
Merge pull request #514 from tuscanhobbit/master
Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
-rw-r--r--view/css/mod_connedit.css13
-rwxr-xr-xview/tpl/abook_edit.tpl9
-rwxr-xr-xview/tpl/field_acheckbox.tpl19
-rw-r--r--view/tpl/filestorage.tpl23
4 files changed, 27 insertions, 37 deletions
diff --git a/view/css/mod_connedit.css b/view/css/mod_connedit.css
index 83f167915..8b80b4e70 100644
--- a/view/css/mod_connedit.css
+++ b/view/css/mod_connedit.css
@@ -3,12 +3,12 @@
color: #000;
}
.abook-them {
- margin-left: 375px;
- margin-bottom: 15px;
+ padding: 5px;
+ text-align: center;
}
.abook-me {
- margin-left: 36px;
- margin-bottom: 15px;
+ padding: 5px 5px 5px 15px;
+ text-align: center;
}
.acheckbox {
margin-bottom: 5px !important;
@@ -27,7 +27,8 @@
.abook-edit-them, .abook-edit-me {
float: left;
- width: 100px !important;
+ margin-left: 10px;
+ margin-right: 10px;
}
.field_abook_help {
float: left;
@@ -148,4 +149,4 @@
#abook-advanced {
margin-top: 15px;
-} \ No newline at end of file
+}
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index b8b01df4c..9b12b5f29 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -83,13 +83,14 @@
<div id="abook-advanced-panel" style="display: block;">
-<span class="abook-them">{{$them}}</span><span class="abook-me">{{$me}}</span>
-<br />
-<br />
+<table>
+<tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr>
+<tr><td colspan="5"><hr /></td></tr>
{{foreach $perms as $prm}}
{{include file="field_acheckbox.tpl" field=$prm}}
{{/foreach}}
-<br />
+<tr><td colspan="5"><hr /></td></tr>
+</table>
</div>
diff --git a/view/tpl/field_acheckbox.tpl b/view/tpl/field_acheckbox.tpl
index f5dda4cc0..342491ded 100755
--- a/view/tpl/field_acheckbox.tpl
+++ b/view/tpl/field_acheckbox.tpl
@@ -1,6 +1,17 @@
- <div class='field acheckbox'>
+<tr>
+ <td>
<label for='id_{{$field.0}}'>{{$field.1}}</label>
- <input type="checkbox" class="abook-edit-them" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
- <input type="checkbox" class="abook-edit-me" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />{{if $field.5}} <span class="permission-inherited">{{$inherited}}</span> {{/if}}
+ </td>
+ <td class="abook-them">
+ <input type="checkbox" name='them_{{$field.0}}' id='them_id_{{$field.0}}' value="1" disabled="disabled" {{if $field.2}}checked="checked"{{/if}} />
+ </td>
+ <td class="abook-me">
+ <input type="checkbox" name='{{$field.0}}' id='me_id_{{$field.0}}' value="{{$field.4}}" {{if $field.3}}checked="checked"{{/if}} />
+ </td>
+ <td>
+ {{if $field.5}}<span class="permission-inherited">{{$inherited}}</span> {{/if}}
+ </td>
+ <td>
<span class='field_abook_help'>{{$field.6}}</span>
- </div>
+ </td>
+</tr> \ No newline at end of file
diff --git a/view/tpl/filestorage.tpl b/view/tpl/filestorage.tpl
deleted file mode 100644
index 1995b95e1..000000000
--- a/view/tpl/filestorage.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-{{if $files}}
-
- <div class="generic-content-wrapper">
- {{if $limit}}{{$limitlabel}}{{$limit}}{{/if}} {{if $used}} {{$usedlabel}}{{$used}}{{/if}}
- <br />
- <br />
-
- {{foreach $files as $key => $items}}
- {{foreach $items as $item}}
- <div class="files-list-item">
- <a href="{{$baseurl}}/{{$item.id}}/edit" title="{{$edit}}"><i class="icon-pencil"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;
- <a href="{{$baseurl}}/{{$item.id}}/delete" title="{{$delete}}"><i class="icon-remove drop-icons"></i></a>&nbsp;&nbsp;&nbsp;&nbsp;
- {{if ! $item.dir}}<a href="attach/{{$item.download}}">{{/if}}{{$item.title}}{{if ! $item.dir}}</a>{{/if}}
- {{if ! $item.dir}} | {{$item.size}} bytes{{else}}{{$directory}}{{/if}}
-
-</div>
- {{/foreach}}
- {{/foreach}}
- </div>
-
- <div class="clear"></div>
-
-{{/if}}