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

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source
This commit is contained in:
redmatrix 2015-06-19 16:44:16 -07:00
commit 0a9d3b4025
16 changed files with 333 additions and 311 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'),

14
view/theme/redbasic/css/style.css
View File

@ -1889,7 +1889,6 @@ nav .dropdown-menu {
color: #31708f; color: #31708f;
background-color: #d9edf7; background-color: #d9edf7;
margin-bottom: 3px; margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center; text-align: center;
} }
@ -1898,7 +1897,6 @@ nav .dropdown-menu {
color: #8a6d3b; color: #8a6d3b;
background-color: #fcf8e3; background-color: #fcf8e3;
margin-bottom: 3px; margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center; text-align: center;
} }
@ -1907,10 +1905,20 @@ nav .dropdown-menu {
color: #a94442; color: #a94442;
background-color: #f2dede; background-color: #f2dede;
margin-bottom: 3px; margin-bottom: 3px;
border-radius: $radiuspx;
text-align: center; text-align: center;
} }
.section-content-tools-wrapper .section-content-info-wrapper,
.section-content-wrapper .section-content-info-wrapper,
.section-content-tools-wrapper .section-content-warning-wrapper,
.section-content-wrapper .section-content-warning-wrapper,
.section-content-tools-wrapper .section-content-danger-wrapper,
.section-content-wrapper .section-content-danger-wrapper {
margin-bottom: 0px;
border-radius: $radiuspx;
}
.section-content-wrapper { .section-content-wrapper {
padding: 7px 10px; padding: 7px 10px;
background-color: $comment_item_colour; background-color: $comment_item_colour;

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>

4
view/tpl/cloud.tpl Normal file
View File

@ -0,0 +1,4 @@
<div class="generic-content-wrapper">
{{include file="cloud_header.tpl"}}
{{include file="cloud_directory.tpl"}}
</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>

3
view/tpl/photo_view.tpl
View File

@ -1,6 +1,5 @@
<div id="live-photos"></div> <div id="live-photos"></div>
<div class="generic-content-wrapper"> <div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<div class="pull-right"> <div class="pull-right">
@ -155,7 +154,6 @@
{{/if}} {{/if}}
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div>
{{$comments}} {{$comments}}
@ -166,6 +164,7 @@
{{/if}} {{/if}}
<div class="clear"></div> <div class="clear"></div>
</div>
{{$paginate}} {{$paginate}}

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/sharedwithme.tpl
View File

@ -1,8 +1,9 @@
<div class="generic-content-wrapper">
<div class="section-title-wrapper"> <div class="section-title-wrapper">
<a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a> <a href="/sharedwithme/dropall" onclick="return confirmDelete();" class="btn btn-xs btn-default pull-right"><i class="icon-trash"></i>&nbsp;{{$dropall}}</a>
<h2>{{$header}}</h2> <h2>{{$header}}</h2>
</div> </div>
<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>
@ -22,3 +23,4 @@
{{/foreach}} {{/foreach}}
</table> </table>
</div> </div>
</div>

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>