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

Merge upstream

Browse Source
This commit is contained in:
Christian Vogeley
2013-10-20 01:22:51 +02:00
parent c0789bdb4f 49fb6326e0
commit 2db45695e8
88 changed files with 4338 additions and 2844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4471
view/it/messages.po
View File

File diff suppressed because it is too large Load Diff

879
view/it/strings.php
View File

File diff suppressed because it is too large Load Diff

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

@@ -371,7 +371,7 @@ footer {
margin-bottom: 10px;
}
.group-selected, .nets-selected, .fileas-selected, .categories-selected, .settings-widget .active {
.group-selected, .nets-selected, .fileas-selected, .categories-selected, .active {
color: #444444 !important;
}
@@ -1484,12 +1484,6 @@ tr.mceLast {
box-shadow: 0 0 0 0;
}
.settings-widget .selected {
border-radius: $radiuspx;
-moz-border-radius: $radiuspx;
box-shadow: 4px 4px 3px 0 #444444;
}
#sidebar-page-list .label {
margin-left: 5px;
}
@@ -3320,8 +3314,8 @@ ul.menu-popup {
#mail-list-wrapper {
border-bottom: 1px solid #ccc;
margin: 5px 5px 5px 5px;
border-top: 1px solid #ccc;
padding: 5px 5px 5px 5px;
}
span.mail-list {
@@ -3341,6 +3335,10 @@ width: 30px;
img.mail-list-sender-photo {
height: 24px;
width: 24px;
float: left;
margin-right: 30px;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
}
.tag1 {
@@ -3450,3 +3448,29 @@ a .drop-icons {
.drop-icons:hover {
color: #FF0000;
}
.permission-inherited {
float: left;
margin-right: 10px;
color: #FF0000;
}
.attachlink {
float: left;
border: 1px solid black;
padding: 5px;
margin-right: 8px;
}
.attach-icons {
font-size: 1.4em;
}
.attach-clip {
margin-right: 3px;
font-size: 1.8em;
}
.item-category {
margin-right: 10px;
}

2
view/theme/redbasic/php/config.php
View File

@@ -41,7 +41,7 @@ function redbasic_form(&$a, $schema, $nav_colour, $bgcolour, $background_image,
$scheme_choices = array();
$scheme_choices["---"] = t("Default");
$files = glob('view/theme/' . current_theme() . '/schema/*');
$files = glob('view/theme/redbasic/schema/*.php');
if($files) {
foreach($files as $file) {
$f = basename($file, ".php");

11
view/theme/redbasic/php/style.php
View File

@@ -1,5 +1,4 @@
<?php
// Get the UID of the channel owner
$uid = get_theme_uid();
@@ -30,14 +29,14 @@
// not --- like the mobile theme does instead.
if (($schema) && ($schema != '---')) {
$schemefile = 'view/theme/' . current_theme() . '/schema/' . $schema . '.php';
$schemefile = 'view/theme/redbasic/schema/' . $schema . '.php';
require_once ($schemefile);
}
// If we haven't got a schema, load the default. We shouldn't touch this - we
// should leave it for admins to define for themselves.
if (! $schema) {
if(file_exists('view/theme/' . current_theme() . '/schema/default.php')) {
$schemefile = 'view/theme/' . current_theme() . '/schema/' . 'default.php';
if(file_exists('view/theme/redbasic/schema/default.php')) {
$schemefile = 'view/theme/redbasic/schema/' . 'default.php';
require_once ($schemefile);
}
}
@@ -100,8 +99,8 @@
// Apply the settings
if(file_exists('view/theme/' . current_theme() . '/css/style.css')) {
$x = file_get_contents('view/theme/' . current_theme() . '/css/style.css');
if(file_exists('view/theme/redbasic/css/style.css')) {
$x = file_get_contents('view/theme/redbasic/css/style.css');
$options = array (
'$nav_bg_1' => $nav_bg_1,

2
view/tpl/conv_item.tpl
View File

@@ -37,7 +37,7 @@
</div>
</div>
<div class="wall-item-author">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.via}} <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}<br />
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">{{if $item.verified}}<i class="icon-ok" title="{{$item.verified}}"></i>&nbsp;{{/if}}<span class="autotime" title="{{$item.isotime}}">{{$item.localtime}}</span>{{if $item.app}}<span class="item.app">{{$item.str_app}}</span>{{/if}}</div>
</div>

6
view/tpl/dir_sort_links.tpl Normal file
View File

@@ -0,0 +1,6 @@
<div class="widget" id="dir_sort_links">
<h3>{{$header}}</h3>
<a href="directory?f=&order=">{{$normal}}</a><br />
<a href="directory?f=&order=reverse">{{$reverse}}</a><br />
<a href="directory?f=&order=date">{{$date}}</a><br />
</div>

2
view/tpl/field_acheckbox.tpl
View File

@@ -1,6 +1,6 @@
<div class='field acheckbox'>
<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}} disabled="disabled" {{/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}}
<span class='field_abook_help'>{{$field.6}}</span>
</div>

2
view/tpl/generic_links_widget.tpl
View File

@@ -4,7 +4,7 @@
<ul>
{{foreach $items as $item}}
<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}selected{{/if}}">{{$item.label}}</a></li>
<li class="tool"><a href="{{$item.url}}" class="{{if $item.selected}}active{{/if}}">{{$item.label}}</a></li>
{{/foreach}}
</ul>

6
view/tpl/item_attach.tpl Normal file
View File

@@ -0,0 +1,6 @@
<div class="body-attach">
{{foreach $attaches as $a}}
<a href="{{$a.url}}" title="{{$a.title}}" class="attachlink" ><i class="icon-paper-clip attach-icons attach-clip"></i><i class="{{$a.icon}} attach-icons"></i></a>
{{/foreach}}
<div class="clear"></div>
</div>

8
view/tpl/item_categories.tpl Normal file
View File

@@ -0,0 +1,8 @@
{{if $categories}}
<div class="categorytags">
{{foreach $categories as $cat}}
<span class="item-category"><i class="icon-asterisk cat-icons"></i>&nbsp;{{if $cat.url}}<a href="{{$cat.url}}">{{$cat.term}}</a>{{else}}{{$cat.term}}{{/if}}</span>
{{/foreach}}
</div>
{{/if}}

8
view/tpl/item_filer.tpl Normal file
View File

@@ -0,0 +1,8 @@
{{if $categories}}
<div class="filesavetags">
{{foreach $categories as $cat}}
<span class="item-category"><i class="icon-folder-close cat-icons"></i>&nbsp;{{$cat.term}}&nbsp;<a href="{{$cat.removelink}}" class="category-remove-link" title="{{$remove}}"><i class="icon-remove drop-icons"></i></a></span>
{{/foreach}}
</div>
{{/if}}

3
view/tpl/mail_list.tpl
View File

@@ -1,7 +1,8 @@
<div class="generic-content-wrapper" id="mail-list-wrapper">
<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
<span class="mail-list">{{$from_name}}</span>
<span class="mail-list" {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-list" title="{{$date}}">{{$date}}</span>
<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
<div class="clear">&nbsp;</div>
</div>