harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #514 from tuscanhobbit/master

Browse Source 
Checkboxes were not aligned in connedit, added a table and removed orphaned filestorage.tpl
This commit is contained in:
RedMatrix 2014-06-29 10:15:55 +10:00
commit f29f8a1b40
4 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
view/css/mod_connedit.css
View File

@ -3,12 +3,12 @@
color: #000; color: #000;
} }
.abook-them { .abook-them {
margin-left: 375px; padding: 5px;
margin-bottom: 15px; text-align: center;
} }
.abook-me { .abook-me {
margin-left: 36px; padding: 5px 5px 5px 15px;
margin-bottom: 15px; text-align: center;
} }
.acheckbox { .acheckbox {
margin-bottom: 5px !important; margin-bottom: 5px !important;
@ -27,7 +27,8 @@
.abook-edit-them, .abook-edit-me { .abook-edit-them, .abook-edit-me {
float: left; float: left;
width: 100px !important; margin-left: 10px;
margin-right: 10px;
} }
.field_abook_help { .field_abook_help {
float: left; float: left;
@ -148,4 +149,4 @@
#abook-advanced { #abook-advanced {
margin-top: 15px; margin-top: 15px;
} }

9
view/tpl/abook_edit.tpl
View File

@ -83,13 +83,14 @@
<div id="abook-advanced-panel" style="display: block;"> <div id="abook-advanced-panel" style="display: block;">
<span class="abook-them">{{$them}}</span><span class="abook-me">{{$me}}</span> <table>
<br /> <tr><td></td><td class="abook-them">{{$them}}</td><td colspan="2" class="abook-me">{{$me}}</td><td></td></tr>
<br /> <tr><td colspan="5"><hr /></td></tr>
{{foreach $perms as $prm}} {{foreach $perms as $prm}}
{{include file="field_acheckbox.tpl" field=$prm}} {{include file="field_acheckbox.tpl" field=$prm}}
{{/foreach}} {{/foreach}}
<br /> <tr><td colspan="5"><hr /></td></tr>
</table>
</div> </div>

19
view/tpl/field_acheckbox.tpl
View File

@ -1,6 +1,17 @@
<div class='field acheckbox'> <tr>
<td>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <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}} /> </td>
<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 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> <span class='field_abook_help'>{{$field.6}}</span>
</div> </td>
</tr>

23
view/tpl/filestorage.tpl
View File

@ -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}}