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

bring some more generic-content-wrappers and fix some of them

Browse Source
This commit is contained in:
Mario Vavti 2015-06-19 12:44:11 +02:00
parent 25e134dd9c
commit de84f48e2f
12 changed files with 283 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/RedDAV/RedBrowser.php
View File

@ -247,7 +247,7 @@ class RedBrowser extends DAV\Browser\Plugin {
$this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output)); $this->server->broadcastEvent('onHTMLActionsPanel', array($parent, &$output));
} }
$html .= replace_macros(get_markup_template('cloud_header.tpl'), array( $html .= replace_macros(get_markup_template('cloud.tpl'), array(
'$header' => t('Files') . ": " . $this->escapeHTML($path) . "/", '$header' => t('Files') . ": " . $this->escapeHTML($path) . "/",
'$quota' => $quota, '$quota' => $quota,
'$total' => t('Total'), '$total' => t('Total'),
@ -255,10 +255,7 @@ class RedBrowser extends DAV\Browser\Plugin {
'$shared' => t('Shared'), '$shared' => t('Shared'),
'$create' => t('Create'), '$create' => t('Create'),
'$upload' => t('Upload'), '$upload' => t('Upload'),
'$is_owner' => $is_owner '$is_owner' => $is_owner,
));
$html .= replace_macros(get_markup_template('cloud_directory.tpl'), array(
'$parentpath' => $parentpath, '$parentpath' => $parentpath,
'$entries' => $f, '$entries' => $f,
'$name' => t('Name'), '$name' => t('Name'),

2
view/tpl/blocklist.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
{{if $editor}} {{if $editor}}
<div class="pull-right"> <div class="pull-right">
@ -65,3 +66,4 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{{/if}} {{/if}}
</div>

2
view/tpl/cloud_directory.tpl
View File

@ -1,4 +1,4 @@
<div class="generic-content-wrapper section-content-wrapper-np"> <div class="section-content-wrapper-np">
<table id="cloud-index"> <table id="cloud-index">
<tr> <tr>
<th width="1%"></th> <th width="1%"></th>

2
view/tpl/conv_item.tpl
View File

@ -4,7 +4,7 @@
</div> </div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}} {{/if}}
<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}">
<a name="{{$item.id}}" ></a> <a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">

2
view/tpl/conv_list.tpl
View File

@ -4,7 +4,7 @@
</div> </div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;"> <div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}} {{/if}}
<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}} conv-list-mode"> <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper conv-list-mode{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}">
<a name="{{$item.id}}" ></a> <a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">

2
view/tpl/conversation.tpl
View File

@ -1,6 +1,6 @@
<div id="threads-begin"></div> <div id="threads-begin"></div>
{{foreach $threads as $thread}} {{foreach $threads as $thread}}
<div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper"> <div id="thread-wrapper-{{$thread.id}}" class="thread-wrapper generic-content-wrapper">
{{foreach $thread.items as $item}} {{foreach $thread.items as $item}}
{{if $item.comment_firstcollapsed}} {{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer"> <div class="hide-comments-outer">

2
view/tpl/layoutlist.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
{{if $editor}} {{if $editor}}
<div class="pull-right"> <div class="pull-right">
@ -67,3 +68,4 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
{{/if}} {{/if}}
</div>

2
view/tpl/menulist.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<div class="pull-right"> <div class="pull-right">
<button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button> <button id="webpage-create-btn" class="btn btn-xs btn-success" onclick="openClose('menu-creator');"><i class="icon-edit"></i>&nbsp;{{$hintnew}}</button>
@ -36,3 +37,4 @@
</table> </table>
</div> </div>
{{/if}} {{/if}}
</div>

4
view/tpl/photo_album.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<div class="pull-right"> <div class="pull-right">
<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a> <a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
@ -17,12 +18,13 @@
</div> </div>
{{$upload_form}} {{$upload_form}}
{{$album_edit.1}} {{$album_edit.1}}
<div id="photo-album-contents" class="generic-content-wrapper"> <div id="photo-album-contents">
{{foreach $photos as $photo}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
<div id="page-end"></div> <div id="page-end"></div>
</div> </div>
</div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
<div id="page-spinner"></div> <div id="page-spinner"></div>

4
view/tpl/photos_recent.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
{{if $can_post}} {{if $can_post}}
<button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button> <button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
@ -6,12 +7,13 @@
<div class="clear"></div> <div class="clear"></div>
</div> </div>
{{$upload_form}} {{$upload_form}}
<div id="photo-album-contents" class="generic-content-wrapper"> <div id="photo-album-contents">
{{foreach $photos as $photo}} {{foreach $photos as $photo}}
{{include file="photo_top.tpl"}} {{include file="photo_top.tpl"}}
{{/foreach}} {{/foreach}}
<div id="page-end"></div> <div id="page-end"></div>
</div> </div>
</div>
<div class="photos-end"></div> <div class="photos-end"></div>
<script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script> <script>$(document).ready(function() { loadingPage = false; justifyPhotos(); });</script>
<div id="page-spinner"></div> <div id="page-spinner"></div>

2
view/tpl/search_item.tpl
View File

@ -1,4 +1,4 @@
<div id="thread-wrapper-{{$item.id}}" class="thread-wrapper {{$item.toplevel}}"> <div id="thread-wrapper-{{$item.id}}" class="thread-wrapper{{if $item.toplevel}} {{$item.toplevel}} generic-content-wrapper{{/if}}">
<a name="{{$item.id}}" ></a> <a name="{{$item.id}}" ></a>
<div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" > <div class="wall-item-outside-wrapper {{$item.indent}}{{$item.previewing}}{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-outside-wrapper-{{$item.id}}" >
<div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;"> <div class="wall-item-content-wrapper {{$item.indent}}" id="wall-item-content-wrapper-{{$item.id}}" style="clear:both;">

4
view/tpl/webpagelist.tpl
View File

@ -1,3 +1,4 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
{{if $editor}} {{if $editor}}
<div class="pull-right"> <div class="pull-right">
@ -70,5 +71,6 @@
{{/foreach}} {{/foreach}}
</table> </table>
</div> </div>
<div class="clear"></div>
{{/if}} {{/if}}
<div class="clear"></div>
</div>