Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
298aae5ddf
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -9,6 +9,7 @@ include/jquery-1.4.2.min.js
|
|||
favicon.*
|
||||
home.html
|
||||
addon
|
||||
*.orig
|
||||
*~
|
||||
robots.txt
|
||||
|
||||
|
|
|
|||
2
boot.php
2
boot.php
|
|
@ -1292,7 +1292,7 @@ function get_server()
|
|||
$server = Config::get("system", "directory");
|
||||
|
||||
if ($server == "") {
|
||||
$server = "http://dir.friendica.social";
|
||||
$server = "https://dir.friendica.social";
|
||||
}
|
||||
|
||||
return($server);
|
||||
|
|
|
|||
|
|
@ -1120,6 +1120,7 @@ function admin_page_site_post(App $a)
|
|||
}
|
||||
Config::set('system', 'language', $language);
|
||||
Config::set('system', 'theme', $theme);
|
||||
Theme::install($theme);
|
||||
|
||||
if ($theme_mobile == '---') {
|
||||
Config::delete('system', 'mobile-theme');
|
||||
|
|
|
|||
|
|
@ -303,12 +303,13 @@ function install_content(App $a) {
|
|||
* required : boolean
|
||||
* help : string optional
|
||||
*/
|
||||
function check_add(&$checks, $title, $status, $required, $help) {
|
||||
function check_add(&$checks, $title, $status, $required, $help, $error_msg = "") {
|
||||
$checks[] = [
|
||||
'title' => $title,
|
||||
'status' => $status,
|
||||
'required' => $required,
|
||||
'help' => $help,
|
||||
'error_msg' => $error_msg,
|
||||
];
|
||||
}
|
||||
|
||||
|
|
@ -489,18 +490,24 @@ function check_smarty3(&$checks) {
|
|||
function check_htaccess(&$checks) {
|
||||
$status = true;
|
||||
$help = "";
|
||||
$error_msg = "";
|
||||
if (function_exists('curl_init')) {
|
||||
$test = Network::fetchUrl(System::baseUrl()."/install/testrewrite");
|
||||
$test = Network::fetchUrlFull(System::baseUrl()."/install/testrewrite");
|
||||
|
||||
if ($test != "ok") {
|
||||
$test = Network::fetchUrl(normalise_link(System::baseUrl()."/install/testrewrite"));
|
||||
$url = normalise_link(System::baseUrl()."/install/testrewrite");
|
||||
if ($test['body'] != "ok") {
|
||||
$test = Network::fetchUrlFull($url);
|
||||
}
|
||||
|
||||
if ($test != "ok") {
|
||||
if ($test['body'] != "ok") {
|
||||
$status = false;
|
||||
$help = L10n::t('Url rewrite in .htaccess is not working. Check your server configuration.');
|
||||
$error_msg = [];
|
||||
$error_msg['head'] = L10n::t('Error message from Curl when fetching');
|
||||
$error_msg['url'] = $test['redirect_url'];
|
||||
$error_msg['msg'] = $test['error'];
|
||||
}
|
||||
check_add($checks, L10n::t('Url rewrite is working'), $status, true, $help);
|
||||
check_add($checks, L10n::t('Url rewrite is working'), $status, true, $help, $error_msg);
|
||||
} else {
|
||||
// cannot check modrewrite if libcurl is not installed
|
||||
/// @TODO Maybe issue warning here?
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ use Friendica\Core\Config;
|
|||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Theme;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Contact;
|
||||
|
|
@ -354,6 +355,7 @@ function settings_post(App $a)
|
|||
theme_post($a);
|
||||
}
|
||||
}
|
||||
Theme::install($theme);
|
||||
|
||||
$r = q("UPDATE `user` SET `theme` = '%s' WHERE `uid` = %d",
|
||||
dbesc($theme),
|
||||
|
|
|
|||
|
|
@ -36,7 +36,30 @@ class Network
|
|||
*/
|
||||
public static function fetchUrl($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = 0)
|
||||
{
|
||||
$ret = self::curl(
|
||||
$ret = self::fetchUrlFull($url, $binary, $redirects, $timeout, $accept_content, $cookiejar);
|
||||
|
||||
return $ret['body'];
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Curl wrapper with array of return values.
|
||||
*
|
||||
* Inner workings and parameters are the same as @ref fetchUrl but returns an array with
|
||||
* all the information collected during the fetch.
|
||||
*
|
||||
* @param string $url URL to fetch
|
||||
* @param boolean $binary default false
|
||||
* TRUE if asked to return binary results (file download)
|
||||
* @param integer $redirects The recursion counter for internal use - default 0
|
||||
* @param integer $timeout Timeout in seconds, default system config value or 60 seconds
|
||||
* @param string $accept_content supply Accept: header with 'accept_content' as the value
|
||||
* @param string $cookiejar Path to cookie jar file
|
||||
*
|
||||
* @return array With all relevant information, 'body' contains the actual fetched content.
|
||||
*/
|
||||
public static function fetchUrlFull($url, $binary = false, &$redirects = 0, $timeout = 0, $accept_content = null, $cookiejar = 0)
|
||||
{
|
||||
return self::curl(
|
||||
$url,
|
||||
$binary,
|
||||
$redirects,
|
||||
|
|
@ -45,8 +68,6 @@ class Network
|
|||
'cookiejar'=>$cookiejar
|
||||
]
|
||||
);
|
||||
|
||||
return($ret['body']);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -65,7 +65,7 @@ $a->config['system']['no_regfullname'] = true;
|
|||
//$a->config['system']['block_local_dir'] = false;
|
||||
|
||||
// Location of the global directory
|
||||
$a->config['system']['directory'] = 'http://dir.friendica.social';
|
||||
$a->config['system']['directory'] = 'https://dir.friendica.social';
|
||||
|
||||
// turn on friendica's log
|
||||
$a->config['system']['debugging'] = true;
|
||||
|
|
|
|||
|
|
@ -32,6 +32,9 @@ td.help {
|
|||
td.help blockquote {
|
||||
margin-left: 60px;
|
||||
}
|
||||
.error_header {
|
||||
margin-left: 60px;
|
||||
}
|
||||
input[type="submit"] {
|
||||
margin: 2em 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
<div class="field checkbox" id="div_id_{{$field.0}}">
|
||||
<label for="id_{{$field.0}}">{{$field.1}}</label>
|
||||
<label id="id_{{$field.0}}_label" for="id_{{$field.0}}">{{$field.1}}</label>
|
||||
<input type="hidden" name="{{$field.0}}" value="0">
|
||||
<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@
|
|||
{{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
|
||||
</select>
|
||||
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,5 +3,7 @@
|
|||
<div class='field custom'>
|
||||
<label for='{{$field.0}}'>{{$field.1}}</label>
|
||||
{{$field.2}}
|
||||
<span class='field_help'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,5 +2,7 @@
|
|||
<div class='field input' id='wrapper_{{$field.0}}'>
|
||||
<label for='id_{{$field.0}}'>{{$field.1}}</label>
|
||||
<input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
|
||||
{{if $field.3}}
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,5 +3,7 @@
|
|||
<div class='field checkbox'>
|
||||
<label for='id_{{$field.0}}'>{{$field.1}}</label>
|
||||
<input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
|
||||
{{if $field.4}}
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,5 +2,7 @@
|
|||
<div class='field input openid' id='wrapper_{{$field.0}}'>
|
||||
<label for='id_{{$field.0}}'>{{$field.1}}</label>
|
||||
<input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,5 +2,7 @@
|
|||
<div class='field password' id='wrapper_{{$field.0}}'>
|
||||
<label for='id_{{$field.0}}'>{{$field.1}}</label>
|
||||
<input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
|
||||
{{if $field.3}}
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
<div class='field radio'>
|
||||
<label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
|
||||
<input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2|escape:'html'}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
|
||||
{{if $field.3}}
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,5 +3,7 @@
|
|||
<div class='field richtext'>
|
||||
<label for='id_{{$field.0}}'>{{$field.1}}</label>
|
||||
<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,5 +5,7 @@
|
|||
<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
|
||||
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
|
||||
</select>
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,5 +5,7 @@
|
|||
<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
|
||||
{{$field.4}}
|
||||
</select>
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -3,5 +3,7 @@
|
|||
<div class='field textarea'>
|
||||
<label for='id_{{$field.0}}'>{{$field.1}}</label>
|
||||
<textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea>
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
<select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} aria-describedby='{{$field.0}}_tip'>
|
||||
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
|
||||
</select>
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
{{if $field.5}}<div id="theme-preview"></div>{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -10,5 +10,7 @@
|
|||
{{if $field.4}}{{$field.4.1}}{{else}}ON{{/if}}
|
||||
</a>
|
||||
</div>
|
||||
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -107,7 +107,7 @@ $a->config['system']['no_regfullname'] = true;
|
|||
//$a->config['system']['block_local_dir'] = false;
|
||||
|
||||
// Location of the global directory
|
||||
$a->config['system']['directory'] = 'http://dir.friendica.social';
|
||||
$a->config['system']['directory'] = 'https://dir.friendica.social';
|
||||
|
||||
// Authentication cookie lifetime, in days
|
||||
$a->config['system']['auth_cookie_lifetime'] = 7;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,13 @@
|
|||
{{/if}}
|
||||
</td><td>{{if $check.required}}(required){{/if}}</td></tr>
|
||||
{{if $check.help}}
|
||||
<tr><td class="help" colspan="3"><blockquote>{{$check.help}}</blockquote></td></tr>
|
||||
<tr><td class="help" colspan="3">
|
||||
<blockquote>{{$check.help}}</blockquote>
|
||||
{{if $check.error_msg}}
|
||||
<div class="error_header"><b>{{$check.error_msg.head}}</br><a href="{{$check.error_msg.url}}">{{$check.error_msg.url}}</a></b></div>
|
||||
<blockquote>{{$check.error_msg.msg}}</blockquote>
|
||||
{{/if}}
|
||||
</td></tr>
|
||||
{{/if}}
|
||||
{{/foreach}}
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -4,11 +4,14 @@
|
|||
<div id="login-group" role="group" aria-labelledby="login-head">
|
||||
<input type="hidden" name="auth-params" value="login" />
|
||||
|
||||
<div id="login-head" class="sr-only">{{$login}}</div>
|
||||
<h3 id="login-head" class="sr-only">{{$login}}</h3>
|
||||
|
||||
<div id="login_standard">
|
||||
{{include file="field_input.tpl" field=$lname}}
|
||||
{{include file="field_password.tpl" field=$lpassword}}
|
||||
<div id="login-lost-password-link">
|
||||
<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{{if $openid}}
|
||||
|
|
@ -17,17 +20,12 @@
|
|||
</div>
|
||||
{{/if}}
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$lremember}}
|
||||
|
||||
<div id="login-extra-links">
|
||||
{{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>{{/if}}
|
||||
<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
|
||||
</div>
|
||||
|
||||
<div id="login-submit-wrapper" >
|
||||
<input type="submit" name="submit" id="login-submit-button" value="{{$login|escape:'html'}}" />
|
||||
</div>
|
||||
|
||||
{{include file="field_checkbox.tpl" field=$lremember}}
|
||||
|
||||
{{foreach $hiddens as $k=>$v}}
|
||||
<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
|
||||
{{/foreach}}
|
||||
|
|
@ -35,5 +33,11 @@
|
|||
</div>
|
||||
</form>
|
||||
|
||||
{{if $register}}
|
||||
<div id="login-extra-links">
|
||||
<h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
|
||||
<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
|
||||
|
|
|
|||
|
|
@ -37,11 +37,11 @@ Don't blame me too much for ugly code and hacks. Fix it ;-)
|
|||
**Theme - Settings**
|
||||
|
||||
|
||||
**Red schema**
|
||||
|
||||
**Red scheme**
|
||||
|
||||
|
||||
**Love Music schema**
|
||||
|
||||
**Love Music scheme**
|
||||
|
||||
|
||||
**frio on mobile**
|
||||
|
||||
|
|
|
|||
|
|
@ -8,128 +8,134 @@ use Friendica\Core\System;
|
|||
|
||||
require_once 'view/theme/frio/php/Image.php';
|
||||
|
||||
function theme_post(App $a) {
|
||||
function theme_post(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($_POST['frio-settings-submit'])) {
|
||||
PConfig::set(local_user(), 'frio', 'schema', $_POST["frio_schema"]);
|
||||
PConfig::set(local_user(), 'frio', 'nav_bg', $_POST["frio_nav_bg"]);
|
||||
PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST["frio_nav_icon_color"]);
|
||||
PConfig::set(local_user(), 'frio', 'link_color', $_POST["frio_link_color"]);
|
||||
PConfig::set(local_user(), 'frio', 'background_color', $_POST["frio_background_color"]);
|
||||
PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST["frio_contentbg_transp"]);
|
||||
PConfig::set(local_user(), 'frio', 'background_image', $_POST["frio_background_image"]);
|
||||
PConfig::set(local_user(), 'frio', 'bg_image_option', $_POST["frio_bg_image_option"]);
|
||||
PConfig::set(local_user(), 'frio', 'scheme', $_POST['frio_scheme']);
|
||||
PConfig::set(local_user(), 'frio', 'nav_bg', $_POST['frio_nav_bg']);
|
||||
PConfig::set(local_user(), 'frio', 'nav_icon_color', $_POST['frio_nav_icon_color']);
|
||||
PConfig::set(local_user(), 'frio', 'link_color', $_POST['frio_link_color']);
|
||||
PConfig::set(local_user(), 'frio', 'background_color', $_POST['frio_background_color']);
|
||||
PConfig::set(local_user(), 'frio', 'contentbg_transp', $_POST['frio_contentbg_transp']);
|
||||
PConfig::set(local_user(), 'frio', 'background_image', $_POST['frio_background_image']);
|
||||
PConfig::set(local_user(), 'frio', 'bg_image_option', $_POST['frio_bg_image_option']);
|
||||
PConfig::set(local_user(), 'frio', 'css_modified', time());
|
||||
}
|
||||
}
|
||||
|
||||
function theme_admin_post(App $a) {
|
||||
function theme_admin_post(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (isset($_POST['frio-settings-submit'])) {
|
||||
Config::set('frio', 'schema', $_POST["frio_schema"]);
|
||||
Config::set('frio', 'nav_bg', $_POST["frio_nav_bg"]);
|
||||
Config::set('frio', 'nav_icon_color', $_POST["frio_nav_icon_color"]);
|
||||
Config::set('frio', 'link_color', $_POST["frio_link_color"]);
|
||||
Config::set('frio', 'background_color', $_POST["frio_background_color"]);
|
||||
Config::set('frio', 'contentbg_transp', $_POST["frio_contentbg_transp"]);
|
||||
Config::set('frio', 'background_image', $_POST["frio_background_image"]);
|
||||
Config::set('frio', 'bg_image_option', $_POST["frio_bg_image_option"]);
|
||||
Config::set('frio', 'login_bg_image', $_POST["frio_login_bg_image"]);
|
||||
Config::set('frio', 'login_bg_color', $_POST["frio_login_bg_color"]);
|
||||
Config::set('frio', 'scheme', $_POST['frio_scheme']);
|
||||
Config::set('frio', 'nav_bg', $_POST['frio_nav_bg']);
|
||||
Config::set('frio', 'nav_icon_color', $_POST['frio_nav_icon_color']);
|
||||
Config::set('frio', 'link_color', $_POST['frio_link_color']);
|
||||
Config::set('frio', 'background_color', $_POST['frio_background_color']);
|
||||
Config::set('frio', 'contentbg_transp', $_POST['frio_contentbg_transp']);
|
||||
Config::set('frio', 'background_image', $_POST['frio_background_image']);
|
||||
Config::set('frio', 'bg_image_option', $_POST['frio_bg_image_option']);
|
||||
Config::set('frio', 'login_bg_image', $_POST['frio_login_bg_image']);
|
||||
Config::set('frio', 'login_bg_color', $_POST['frio_login_bg_color']);
|
||||
Config::set('frio', 'css_modified', time());
|
||||
}
|
||||
}
|
||||
|
||||
function theme_content(App $a) {
|
||||
function theme_content(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
$arr = [];
|
||||
|
||||
$arr["schema"] = PConfig::get(local_user(), 'frio', 'schema');
|
||||
$arr["nav_bg"] = PConfig::get(local_user(), 'frio', 'nav_bg');
|
||||
$arr["nav_icon_color"] = PConfig::get(local_user(), 'frio', 'nav_icon_color');
|
||||
$arr["link_color"] = PConfig::get(local_user(), 'frio', 'link_color');
|
||||
$arr["bgcolor"] = PConfig::get(local_user(), 'frio', 'background_color');
|
||||
$arr["contentbg_transp"] = PConfig::get(local_user(), 'frio', 'contentbg_transp');
|
||||
$arr["background_image"] = PConfig::get(local_user(), 'frio', 'background_image');
|
||||
$arr["bg_image_option"] = PConfig::get(local_user(), 'frio', 'bg_image_option');
|
||||
$arr['scheme'] = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'schema'));
|
||||
$arr['nav_bg'] = PConfig::get(local_user(), 'frio', 'nav_bg');
|
||||
$arr['nav_icon_color'] = PConfig::get(local_user(), 'frio', 'nav_icon_color');
|
||||
$arr['link_color'] = PConfig::get(local_user(), 'frio', 'link_color');
|
||||
$arr['background_color'] = PConfig::get(local_user(), 'frio', 'background_color');
|
||||
$arr['contentbg_transp'] = PConfig::get(local_user(), 'frio', 'contentbg_transp');
|
||||
$arr['background_image'] = PConfig::get(local_user(), 'frio', 'background_image');
|
||||
$arr['bg_image_option'] = PConfig::get(local_user(), 'frio', 'bg_image_option');
|
||||
|
||||
return frio_form($arr);
|
||||
}
|
||||
|
||||
function theme_admin(App $a) {
|
||||
function theme_admin(App $a)
|
||||
{
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
$arr = [];
|
||||
|
||||
$arr["schema"] = Config::get('frio', 'schema');
|
||||
$arr["nav_bg"] = Config::get('frio', 'nav_bg');
|
||||
$arr["nav_icon_color"] = Config::get('frio', 'nav_icon_color');
|
||||
$arr["link_color"] = Config::get('frio', 'link_color');
|
||||
$arr["bgcolor"] = Config::get('frio', 'background_color');
|
||||
$arr["contentbg_transp"] = Config::get('frio', 'contentbg_transp');
|
||||
$arr["background_image"] = Config::get('frio', 'background_image');
|
||||
$arr["bg_image_option"] = Config::get('frio', 'bg_image_option');
|
||||
$arr["login_bg_image"] = Config::get('frio', 'login_bg_image');
|
||||
$arr["login_bg_color"] = Config::get('frio', 'login_bg_color');
|
||||
$arr['scheme'] = Config::get('frio', 'scheme', Config::get('frio', 'scheme'));
|
||||
$arr['nav_bg'] = Config::get('frio', 'nav_bg');
|
||||
$arr['nav_icon_color'] = Config::get('frio', 'nav_icon_color');
|
||||
$arr['link_color'] = Config::get('frio', 'link_color');
|
||||
$arr['background_color'] = Config::get('frio', 'background_color');
|
||||
$arr['contentbg_transp'] = Config::get('frio', 'contentbg_transp');
|
||||
$arr['background_image'] = Config::get('frio', 'background_image');
|
||||
$arr['bg_image_option'] = Config::get('frio', 'bg_image_option');
|
||||
$arr['login_bg_image'] = Config::get('frio', 'login_bg_image');
|
||||
$arr['login_bg_color'] = Config::get('frio', 'login_bg_color');
|
||||
|
||||
return frio_form($arr);
|
||||
}
|
||||
|
||||
function frio_form($arr) {
|
||||
require_once("view/theme/frio/php/schema.php");
|
||||
function frio_form($arr)
|
||||
{
|
||||
require_once 'view/theme/frio/php/scheme.php';
|
||||
|
||||
$scheme_info = get_schema_info($arr["schema"]);
|
||||
$disable = $scheme_info["overwrites"];
|
||||
$scheme_info = get_scheme_info($arr['scheme']);
|
||||
$disable = $scheme_info['overwrites'];
|
||||
if (!is_array($disable)) {
|
||||
$disable = [];
|
||||
}
|
||||
|
||||
$scheme_choices = [];
|
||||
$scheme_choices["---"] = L10n::t("Default");
|
||||
$files = glob('view/theme/frio/schema/*.php');
|
||||
$scheme_choices['---'] = L10n::t('Custom');
|
||||
$files = glob('view/theme/frio/scheme/*.php');
|
||||
if ($files) {
|
||||
foreach ($files as $file) {
|
||||
$f = basename($file, ".php");
|
||||
$f = basename($file, '.php');
|
||||
if ($f != 'default') {
|
||||
$scheme_name = $f;
|
||||
$scheme_name = ucfirst($f);
|
||||
$scheme_choices[$f] = $scheme_name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$background_image_help = "<strong>" . L10n::t("Note"). ": </strong>".L10n::t("Check image permissions if all users are allowed to visit the image");
|
||||
$background_image_help = '<strong>' . L10n::t('Note') . ': </strong>' . L10n::t('Check image permissions if all users are allowed to see the image');
|
||||
|
||||
$t = get_markup_template('theme_settings.tpl');
|
||||
$ctx = [
|
||||
'$submit' => L10n::t('Submit'),
|
||||
'$baseurl' => System::baseUrl(),
|
||||
'$title' => L10n::t("Theme settings"),
|
||||
'$schema' => ['frio_schema', L10n::t("Select scheme"), $arr["schema"], '', $scheme_choices],
|
||||
'$nav_bg' => array_key_exists("nav_bg", $disable) ? "" : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false],
|
||||
'$nav_icon_color' => array_key_exists("nav_icon_color", $disable) ? "" : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false],
|
||||
'$link_color' => array_key_exists("link_color", $disable) ? "" : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false],
|
||||
'$bgcolor' => array_key_exists("bgcolor", $disable) ? "" : ['frio_background_color', L10n::t('Set the background color'), $arr['bgcolor'], '', false],
|
||||
'$contentbg_transp' => array_key_exists("contentbg_transp", $disable) ? "" : ['frio_contentbg_transp', L10n::t("Content background opacity"), ((isset($arr["contentbg_transp"]) && $arr["contentbg_transp"] != "") ? $arr["contentbg_transp"] : 100), ''],
|
||||
'$background_image' => array_key_exists("background_image", $disable) ? "" : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false],
|
||||
'$title' => L10n::t('Theme settings'),
|
||||
'$scheme' => ['frio_scheme', L10n::t('Select color scheme'), $arr['scheme'], '', $scheme_choices],
|
||||
'$nav_bg' => array_key_exists('nav_bg', $disable) ? '' : ['frio_nav_bg', L10n::t('Navigation bar background color'), $arr['nav_bg'], '', false],
|
||||
'$nav_icon_color' => array_key_exists('nav_icon_color', $disable) ? '' : ['frio_nav_icon_color', L10n::t('Navigation bar icon color '), $arr['nav_icon_color'], '', false],
|
||||
'$link_color' => array_key_exists('link_color', $disable) ? '' : ['frio_link_color', L10n::t('Link color'), $arr['link_color'], '', false],
|
||||
'$background_color' => array_key_exists('background_color', $disable) ? '' : ['frio_background_color', L10n::t('Set the background color'), $arr['background_color'], '', false],
|
||||
'$contentbg_transp' => array_key_exists('contentbg_transp', $disable) ? '' : ['frio_contentbg_transp', L10n::t('Content background opacity'), defaults($arr, 'contentbg_transp', 100), ''],
|
||||
'$background_image' => array_key_exists('background_image', $disable) ? '' : ['frio_background_image', L10n::t('Set the background image'), $arr['background_image'], $background_image_help, false],
|
||||
'$bg_image_options_title' => L10n::t('Background image style'),
|
||||
'$bg_image_options' => Image::get_options($arr),
|
||||
];
|
||||
|
||||
if (array_key_exists("login_bg_image", $arr) && !array_key_exists("login_bg_image", $disable)) {
|
||||
$ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false];
|
||||
}
|
||||
if (array_key_exists("login_bg_color", $arr) && !array_key_exists("login_bg_color", $disable)) {
|
||||
$ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false];
|
||||
if (array_key_exists('login_bg_image', $arr) && !array_key_exists('login_bg_image', $disable)) {
|
||||
$ctx['$login_bg_image'] = ['frio_login_bg_image', L10n::t('Login page background image'), $arr['login_bg_image'], $background_image_help, false];
|
||||
}
|
||||
|
||||
if (array_key_exists('login_bg_color', $arr) && !array_key_exists('login_bg_color', $disable)) {
|
||||
$ctx['$login_bg_color'] = ['frio_login_bg_color', L10n::t('Login page background color'), $arr['login_bg_color'], L10n::t('Leave background image and color empty for theme defaults'), false];
|
||||
}
|
||||
|
||||
$o = replace_macros($t, $ctx);
|
||||
|
||||
|
|
|
|||
|
|
@ -24,9 +24,10 @@ and open the template in the editor.
|
|||
|
||||
body {
|
||||
padding-top: 110px;
|
||||
background-color: $bgcolor;
|
||||
background-color: $background_color;
|
||||
background-image: url("$background_image");
|
||||
background-size: $background_size_img;
|
||||
background-repeat: $background_repeat;
|
||||
background-attachment: fixed;
|
||||
color: #777;
|
||||
/*color: #555;*/
|
||||
|
|
@ -3136,12 +3137,30 @@ section .profile-match-wrapper {
|
|||
* Login page
|
||||
*/
|
||||
#login-submit-wrapper {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
float: right;
|
||||
}
|
||||
#lost-password-link { flex-grow: 2; }
|
||||
#login-lost-password-link {
|
||||
margin-bottom: 10px;
|
||||
float: right;
|
||||
}
|
||||
#div_id_remember {
|
||||
float: left;
|
||||
}
|
||||
#id_password_wrapper {
|
||||
margin-bottom: unset;
|
||||
}
|
||||
#login_openid {
|
||||
clear: both;
|
||||
}
|
||||
#register-link {
|
||||
color: white;
|
||||
background: #8ad0a1;
|
||||
width: 100%;
|
||||
}
|
||||
#login-end {
|
||||
clear: both;
|
||||
}
|
||||
|
||||
.mod-home.is-not-singleuser,
|
||||
.mod-login {
|
||||
|
|
@ -3166,12 +3185,15 @@ section .profile-match-wrapper {
|
|||
margin-top: 2.5%;
|
||||
}
|
||||
|
||||
.mod-home.is-not-singleuser .login-form > #login-extra-links {
|
||||
margin-top: 4em;
|
||||
}
|
||||
|
||||
.mod-home.is-not-singleuser .login-form > #login-form label,
|
||||
.mod-login #content #login-form label {
|
||||
color: #eee;
|
||||
}
|
||||
|
||||
|
||||
.mod-home.is-not-singleuser .login-panel-content,
|
||||
.mod-login .login-panel-content {
|
||||
background-color: rgba(255,255,255,.85);
|
||||
|
|
@ -3185,11 +3207,15 @@ section .profile-match-wrapper {
|
|||
}
|
||||
|
||||
.mod-home.is-not-singleuser .login-form > #login-form,
|
||||
.mod-home.is-not-singleuser .login-form > #login-extra-links,
|
||||
.mod-login #content #login-form {
|
||||
background-color: #fff;
|
||||
padding: 1em;
|
||||
position: relative;
|
||||
margin-top: 4em;
|
||||
}
|
||||
.mod-home.is-not-singleuser .login-form > #login-extra-links {
|
||||
margin-top: unset;
|
||||
background-color: white;
|
||||
}
|
||||
|
||||
.mod-home.is-not-singleuser .login-form > #login-form label,
|
||||
|
|
@ -3197,7 +3223,7 @@ section .profile-match-wrapper {
|
|||
color: #444;
|
||||
}
|
||||
|
||||
.mod-home.is-not-singleuser .login-form > #login-form::before,
|
||||
.mod-home.is-not-singleuser .login-form::before,
|
||||
.mod-login #content #login-form::before {
|
||||
display: block;
|
||||
position: absolute;
|
||||
|
|
@ -3210,7 +3236,7 @@ section .profile-match-wrapper {
|
|||
z-index: -1;
|
||||
}
|
||||
|
||||
.mod-home.is-not-singleuser .login-form > #login-form::after,
|
||||
.mod-home.is-not-singleuser .login-form::after,
|
||||
.mod-login #content #login-form::after {
|
||||
display: block;
|
||||
position: absolute;
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 239 KiB After Width: | Height: | Size: 239 KiB |
|
Before Width: | Height: | Size: 750 KiB After Width: | Height: | Size: 750 KiB |
|
|
@ -21,14 +21,10 @@ class Image
|
|||
public static function get_options($arr)
|
||||
{
|
||||
$bg_image_options = [
|
||||
'repeat' => [
|
||||
'frio_bg_image_option', L10n::t("Repeat the image"), "repeat", L10n::t("Will repeat your image to fill the background."), ($arr["bg_image_option"] == "repeat")],
|
||||
'stretch' => [
|
||||
'frio_bg_image_option', L10n::t("Stretch"), "stretch", L10n::t("Will stretch to width/height of the image."), ($arr["bg_image_option"] == "stretch")],
|
||||
'cover' => [
|
||||
'frio_bg_image_option', L10n::t("Resize fill and-clip"), "cover", L10n::t("Resize to fill and retain aspect ratio."), ($arr["bg_image_option"] == "cover")],
|
||||
'contain' => [
|
||||
'frio_bg_image_option', L10n::t("Resize best fit"), "contain", L10n::t("Resize to best fit and retain aspect ratio."), ($arr["bg_image_option"] == "contain")],
|
||||
'stretch' => ['frio_bg_image_option', L10n::t('Top Banner'), 'stretch', L10n::t('Resize image to the width of the screen and show background color below on long pages.'), ($arr['bg_image_option'] == 'stretch')],
|
||||
'cover' => ['frio_bg_image_option', L10n::t('Full screen'), 'cover', L10n::t('Resize image to fill entire screen, clipping either the right or the bottom.'), ($arr['bg_image_option'] == 'cover')],
|
||||
'contain' => ['frio_bg_image_option', L10n::t('Single row mosaic'), 'contain', L10n::t('Resize image to repeat it on a single row, either vertical or horizontal.'), ($arr['bg_image_option'] == 'contain')],
|
||||
'repeat' => ['frio_bg_image_option', L10n::t('Mosaic'), 'repeat', L10n::t('Repeat image to fill the screen.'), ($arr['bg_image_option'] == 'repeat')],
|
||||
];
|
||||
|
||||
return $bg_image_options;
|
||||
|
|
|
|||
|
|
@ -43,10 +43,10 @@ if (!isset($minimal)) {
|
|||
if (is_null($uid)) {
|
||||
$uid = Profile::getThemeUid();
|
||||
}
|
||||
$schema = PConfig::get($uid, 'frio', 'schema');
|
||||
if (($schema) && ($schema != '---')) {
|
||||
if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
|
||||
$schemefile = 'view/theme/frio/schema/' . $schema . '.php';
|
||||
$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
|
||||
if (($scheme) && ($scheme != '---')) {
|
||||
if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
|
||||
$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
|
||||
require_once $schemefile;
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
<?php
|
||||
|
||||
|
||||
/**
|
||||
* @brief: Get info header of the shema
|
||||
*
|
||||
* This function parses the header of the shemename.php file for inormations like
|
||||
* Author, Description and Overwrites. Most of the code comes from the Addon::getInfo()
|
||||
* function. We use this to get the variables which get overwritten through the shema.
|
||||
* All color variables which get overwritten through the theme have to be
|
||||
* listed (comma seperated) in the shema header under Overwrites:
|
||||
* This seemst not to be the best solution. We need to investigate further.
|
||||
*
|
||||
* @param string $schema Name of the shema
|
||||
* @return array With theme information
|
||||
* 'author' => Author Name
|
||||
* 'description' => Schema description
|
||||
* 'version' => Schema version
|
||||
* 'overwrites' => Variables which overwriting custom settings
|
||||
*/
|
||||
|
||||
use Friendica\Core\PConfig;
|
||||
|
||||
function get_schema_info($schema){
|
||||
|
||||
$theme = current_theme();
|
||||
$themepath = "view/theme/" . $theme . "/";
|
||||
$schema = PConfig::get(local_user(),'frio', 'schema');
|
||||
|
||||
$info=[
|
||||
'name' => $schema,
|
||||
'description' => "",
|
||||
'author' => [],
|
||||
'version' => "",
|
||||
'overwrites' => []
|
||||
];
|
||||
|
||||
if (!is_file($themepath . "schema/" . $schema . ".php")) return $info;
|
||||
|
||||
$f = file_get_contents($themepath . "schema/" . $schema . ".php");
|
||||
|
||||
$r = preg_match("|/\*.*\*/|msU", $f, $m);
|
||||
|
||||
if ($r){
|
||||
$ll = explode("\n", $m[0]);
|
||||
foreach( $ll as $l ) {
|
||||
$l = trim($l,"\t\n\r */");
|
||||
if ($l!=""){
|
||||
list($k,$v) = array_map("trim", explode(":",$l,2));
|
||||
$k= strtolower($k);
|
||||
if ($k=="author"){
|
||||
$r=preg_match("|([^<]+)<([^>]+)>|", $v, $m);
|
||||
if ($r) {
|
||||
$info['author'][] = ['name'=>$m[1], 'link'=>$m[2]];
|
||||
} else {
|
||||
$info['author'][] = ['name'=>$v];
|
||||
}
|
||||
} elseif ($k == "overwrites") {
|
||||
$theme_settings = explode(',',str_replace(' ','', $v));
|
||||
foreach ($theme_settings as $key => $value) {
|
||||
$info["overwrites"][$value] = true;
|
||||
}
|
||||
} else {
|
||||
if (array_key_exists($k,$info)){
|
||||
$info[$k]=$v;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
return $info;
|
||||
}
|
||||
71
view/theme/frio/php/scheme.php
Normal file
71
view/theme/frio/php/scheme.php
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* @brief: Get info header of the scheme
|
||||
*
|
||||
* This function parses the header of the schemename.php file for informations like
|
||||
* Author, Description and Overwrites. Most of the code comes from the Addon::getInfo()
|
||||
* function. We use this to get the variables which get overwritten through the scheme.
|
||||
* All color variables which get overwritten through the theme have to be
|
||||
* listed (comma separated) in the scheme header under Overwrites:
|
||||
* This seems not to be the best solution. We need to investigate further.
|
||||
*
|
||||
* @param string $scheme Name of the scheme
|
||||
* @return array With theme information
|
||||
* 'author' => Author Name
|
||||
* 'description' => Scheme description
|
||||
* 'version' => Scheme version
|
||||
* 'overwrites' => Variables which overwriting custom settings
|
||||
*/
|
||||
use Friendica\Core\PConfig;
|
||||
|
||||
function get_scheme_info($scheme)
|
||||
{
|
||||
$theme = current_theme();
|
||||
$themepath = 'view/theme/' . $theme . '/';
|
||||
$scheme = PConfig::get(local_user(), 'frio', 'scheme', PConfig::get(local_user(), 'frio', 'scheme'));
|
||||
|
||||
$info = [
|
||||
'name' => $scheme,
|
||||
'description' => '',
|
||||
'author' => [],
|
||||
'version' => '',
|
||||
'overwrites' => []
|
||||
];
|
||||
|
||||
if (!is_file($themepath . 'scheme/' . $scheme . '.php')) return $info;
|
||||
|
||||
$f = file_get_contents($themepath . 'scheme/' . $scheme . '.php');
|
||||
|
||||
$r = preg_match('|/\*.*\*/|msU', $f, $m);
|
||||
|
||||
if ($r) {
|
||||
$ll = explode("\n", $m[0]);
|
||||
foreach ($ll as $l) {
|
||||
$l = trim($l, "\t\n\r */");
|
||||
if ($l != '') {
|
||||
list($k, $v) = array_map('trim', explode(':', $l, 2));
|
||||
$k = strtolower($k);
|
||||
if ($k == 'author') {
|
||||
$r = preg_match('|([^<]+)<([^>]+)>|', $v, $m);
|
||||
if ($r) {
|
||||
$info['author'][] = ['name' => $m[1], 'link' => $m[2]];
|
||||
} else {
|
||||
$info['author'][] = ['name' => $v];
|
||||
}
|
||||
} elseif ($k == 'overwrites') {
|
||||
$theme_settings = explode(',', str_replace(' ', '', $v));
|
||||
foreach ($theme_settings as $key => $value) {
|
||||
$info['overwrites'][$value] = true;
|
||||
}
|
||||
} else {
|
||||
if (array_key_exists($k, $info)) {
|
||||
$info[$k] = $v;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $info;
|
||||
}
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<?php $frio = "view/theme/frio"; ?>
|
||||
<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
|
||||
</head>
|
||||
<body id=\"top\">";
|
||||
<body id="top">
|
||||
<?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
|
||||
<a href="#content" class="sr-only sr-only-focusable">Skip to main content</a>
|
||||
<?php
|
||||
|
|
|
|||
16
view/theme/frio/scheme/blue.php
Normal file
16
view/theme/frio/scheme/blue.php
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
<?php
|
||||
/*
|
||||
* Name: Blue
|
||||
* Author: Rabuzarus
|
||||
*
|
||||
* List here all variables which will get overwritten through this scheme
|
||||
* Overwrites: nav_bg, nav_icon_color, link_color, background_color, login_bg_color, contentbg_transp
|
||||
*/
|
||||
|
||||
$nav_bg = "#708fa0";
|
||||
$nav_icon_color = "#fff";
|
||||
$link_color = "#6fdbe8";
|
||||
$background_color = "#ededed";
|
||||
$login_bg_color = "#ededed";
|
||||
$contentbg_transp = 100;
|
||||
|
||||
|
|
@ -1,13 +1,13 @@
|
|||
<?php
|
||||
/* Licence: AGP
|
||||
* Author: rabuzarus
|
||||
* Overwrites: nav_bg, nav_icon_color, link_color, bgcolor, contentbg_transp, background_image, bg_image_option, link_hover_color
|
||||
* Overwrites: nav_bg, nav_icon_color, link_color, background_color, contentbg_transp, background_image, bg_image_option, link_hover_color
|
||||
*/
|
||||
|
||||
$nav_bg = "#000";
|
||||
$nav_icon_color = "#e355e0";
|
||||
$link_color = "#e355e0";
|
||||
$bgcolor = "#fff";
|
||||
$background_color = "#fff";
|
||||
$contentbg_transp = 100;
|
||||
$background_image = "img/bg_circle.png";
|
||||
$bg_image_option = "repeat";
|
||||
|
|
@ -3,13 +3,13 @@
|
|||
* Name: Red
|
||||
* Author: Rabuzarus
|
||||
*
|
||||
* List here all variables which will get overwritten through this schema
|
||||
* Overwrites: nav_bg, nav_icon_color, link_color, bgcolor, contentbg_transp
|
||||
* List here all variables which will get overwritten through this scheme
|
||||
* Overwrites: nav_bg, nav_icon_color, link_color, background_color, contentbg_transp
|
||||
*/
|
||||
|
||||
$nav_bg = "#870000";
|
||||
$nav_icon_color = "#f5f5f5";
|
||||
$link_color = "#b50404";
|
||||
$bgcolor = "#ededed";
|
||||
$background_color = "#ededed";
|
||||
$contentbg_transp = 95;
|
||||
|
||||
|
|
@ -8,7 +8,7 @@ use Friendica\Model\Profile;
|
|||
|
||||
require_once 'view/theme/frio/php/PHPColors/Color.php';
|
||||
|
||||
$schemecss = "";
|
||||
$schemecss = '';
|
||||
$schemecssfile = false;
|
||||
$scheme_modified = 0;
|
||||
|
||||
|
|
@ -19,15 +19,15 @@ if ($a->module !== 'install') {
|
|||
PConfig::load($uid, 'frio');
|
||||
|
||||
// Load the profile owners pconfig.
|
||||
$schema = PConfig::get($uid, "frio", "schema");
|
||||
$nav_bg = PConfig::get($uid, "frio", "nav_bg");
|
||||
$nav_icon_color = PConfig::get($uid, "frio", "nav_icon_color");
|
||||
$link_color = PConfig::get($uid, "frio", "link_color");
|
||||
$bgcolor = PConfig::get($uid, "frio", "background_color");
|
||||
$contentbg_transp = PConfig::get($uid, "frio", "contentbg_transp");
|
||||
$background_image = PConfig::get($uid, "frio", "background_image");
|
||||
$bg_image_option = PConfig::get($uid, "frio", "bg_image_option");
|
||||
$modified = PConfig::get($uid, "frio", "css_modified");
|
||||
$scheme = PConfig::get($uid, 'frio', 'scheme', PConfig::get($uid, 'frio', 'schema'));
|
||||
$nav_bg = PConfig::get($uid, 'frio', 'nav_bg');
|
||||
$nav_icon_color = PConfig::get($uid, 'frio', 'nav_icon_color');
|
||||
$link_color = PConfig::get($uid, 'frio', 'link_color');
|
||||
$background_color = PConfig::get($uid, 'frio', 'background_color');
|
||||
$contentbg_transp = PConfig::get($uid, 'frio', 'contentbg_transp');
|
||||
$background_image = PConfig::get($uid, 'frio', 'background_image');
|
||||
$bg_image_option = PConfig::get($uid, 'frio', 'bg_image_option');
|
||||
$modified = PConfig::get($uid, 'frio', 'css_modified');
|
||||
|
||||
// There is maybe the case that the user did never modify the theme settings.
|
||||
// In this case we store the present time.
|
||||
|
|
@ -38,17 +38,17 @@ if ($a->module !== 'install') {
|
|||
Config::load('frio');
|
||||
|
||||
// Load frios system config.
|
||||
$schema = Config::get("frio", "schema");
|
||||
$nav_bg = Config::get("frio", "nav_bg");
|
||||
$nav_icon_color = Config::get("frio", "nav_icon_color");
|
||||
$link_color = Config::get("frio", "link_color");
|
||||
$bgcolor = Config::get("frio", "background_color");
|
||||
$contentbg_transp = Config::get("frio", "contentbg_transp");
|
||||
$background_image = Config::get("frio", "background_image");
|
||||
$bg_image_option = Config::get("frio", "bg_image_option");
|
||||
$login_bg_image = Config::get("frio", "login_bg_image");
|
||||
$login_bg_color = Config::get("frio", "login_bg_color");
|
||||
$modified = Config::get("frio", "css_modified");
|
||||
$scheme = Config::get('frio', 'scheme', Config::get('frio', 'schema'));
|
||||
$nav_bg = Config::get('frio', 'nav_bg');
|
||||
$nav_icon_color = Config::get('frio', 'nav_icon_color');
|
||||
$link_color = Config::get('frio', 'link_color');
|
||||
$background_color = Config::get('frio', 'background_color');
|
||||
$contentbg_transp = Config::get('frio', 'contentbg_transp');
|
||||
$background_image = Config::get('frio', 'background_image');
|
||||
$bg_image_option = Config::get('frio', 'bg_image_option');
|
||||
$login_bg_image = Config::get('frio', 'login_bg_image');
|
||||
$login_bg_color = Config::get('frio', 'login_bg_color');
|
||||
$modified = Config::get('frio', 'css_modified');
|
||||
|
||||
// There is maybe the case that the user did never modify the theme settings.
|
||||
// In this case we store the present time.
|
||||
|
|
@ -59,60 +59,59 @@ if ($a->module !== 'install') {
|
|||
}
|
||||
|
||||
// Now load the scheme. If a value is changed above, we'll keep the settings
|
||||
// If not, we'll keep those defined by the schema
|
||||
// Setting $schema to '' wasn't working for some reason, so we'll check it's
|
||||
// If not, we'll keep those defined by the scheme
|
||||
// Setting $scheme to '' wasn't working for some reason, so we'll check it's
|
||||
// not --- like the mobile theme does instead.
|
||||
// Allow layouts to over-ride the schema.
|
||||
if (x($_REQUEST, 'schema')) {
|
||||
$schema = $_REQUEST['schema'];
|
||||
// Allow layouts to over-ride the scheme.
|
||||
if (x($_REQUEST, 'scheme')) {
|
||||
$scheme = $_REQUEST['scheme'];
|
||||
}
|
||||
|
||||
// Sanitize the data.
|
||||
$schema = !empty($schema) ? basename($schema) : "";
|
||||
$scheme = !empty($scheme) ? basename($scheme) : '';
|
||||
|
||||
|
||||
if (($schema) && ($schema != '---')) {
|
||||
if (file_exists('view/theme/frio/schema/' . $schema . '.php')) {
|
||||
$schemefile = 'view/theme/frio/schema/' . $schema . '.php';
|
||||
if (($scheme) && ($scheme != '---')) {
|
||||
if (file_exists('view/theme/frio/scheme/' . $scheme . '.php')) {
|
||||
$schemefile = 'view/theme/frio/scheme/' . $scheme . '.php';
|
||||
require_once $schemefile;
|
||||
}
|
||||
if (file_exists('view/theme/frio/schema/' . $schema . '.css')) {
|
||||
$schemecssfile = 'view/theme/frio/schema/' . $schema . '.css';
|
||||
if (file_exists('view/theme/frio/scheme/' . $scheme . '.css')) {
|
||||
$schemecssfile = 'view/theme/frio/scheme/' . $scheme . '.css';
|
||||
}
|
||||
}
|
||||
|
||||
// If we haven't got a schema, load the default. We shouldn't touch this - we
|
||||
// If we haven't got a scheme, load the default. We shouldn't touch this - we
|
||||
// should leave it for admins to define for themselves.
|
||||
// default.php and default.css MUST be symlinks to existing schema files.
|
||||
if (! $schema) {
|
||||
if (file_exists('view/theme/frio/schema/default.php')) {
|
||||
$schemefile = 'view/theme/frio/schema/default.php';
|
||||
// default.php and default.css MUST be symlinks to existing scheme files.
|
||||
if (!$scheme) {
|
||||
if (file_exists('view/theme/frio/scheme/default.php')) {
|
||||
$schemefile = 'view/theme/frio/scheme/default.php';
|
||||
require_once $schemefile;
|
||||
}
|
||||
if (file_exists('view/theme/frio/schema/default.css')) {
|
||||
$schemecssfile = 'view/theme/frio/schema/default.css';
|
||||
if (file_exists('view/theme/frio/scheme/default.css')) {
|
||||
$schemecssfile = 'view/theme/frio/scheme/default.css';
|
||||
}
|
||||
}
|
||||
|
||||
//Set some defaults - we have to do this after pulling owner settings, and we have to check for each setting
|
||||
//individually. If we don't, we'll have problems if a user has set one, but not all options.
|
||||
$nav_bg = (empty($nav_bg) ? "#708fa0" : $nav_bg);
|
||||
$nav_icon_color = (empty($nav_icon_color) ? "#fff" : $nav_icon_color);
|
||||
$link_color = (empty($link_color) ? "#6fdbe8" : $link_color);
|
||||
$bgcolor = (empty($bgcolor) ? "#ededed" : $bgcolor);
|
||||
$nav_bg = (empty($nav_bg) ? '#708fa0' : $nav_bg);
|
||||
$nav_icon_color = (empty($nav_icon_color) ? '#fff' : $nav_icon_color);
|
||||
$link_color = (empty($link_color) ? '#6fdbe8' : $link_color);
|
||||
$background_color = (empty($background_color) ? '#ededed' : $background_color);
|
||||
// The background image can not be empty. So we use a dummy jpg if no image was set.
|
||||
$background_image = (empty($background_image) ? 'img/none.jpg' : $background_image);
|
||||
$modified = (empty($modified) ? time() :$modified);
|
||||
$modified = (empty($modified) ? time() : $modified);
|
||||
|
||||
|
||||
// set a default login bg image if no custom image and no custom bg color are set.
|
||||
if (empty($login_bg_image) && empty($login_bg_color)) {
|
||||
$login_bg_image = (empty($login_bg_image) ? 'img/login_bg.jpg' : $login_bg_image);
|
||||
$login_bg_image = 'img/login_bg.jpg';
|
||||
}
|
||||
$login_bg_color = (empty($login_bg_color) ? "#ededed" : $login_bg_color);
|
||||
$login_bg_color = (empty($login_bg_color) ? '#ededed' : $login_bg_color);
|
||||
|
||||
|
||||
$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != "") ? $contentbg_transp : 100);
|
||||
$contentbg_transp = ((isset($contentbg_transp) && $contentbg_transp != '') ? $contentbg_transp : 100);
|
||||
|
||||
// Calculate some colors in dependance of existing colors.
|
||||
// Some colors are calculated to don't have too many selection
|
||||
|
|
@ -153,29 +152,35 @@ if (!isset($link_hover_color)) {
|
|||
if (!isset($bg_image_option)) {
|
||||
$bg_image_option = null;
|
||||
}
|
||||
|
||||
switch ($bg_image_option) {
|
||||
case "stretch":
|
||||
$background_size_img = "100%";
|
||||
case 'stretch':
|
||||
$background_size_img = '100%';
|
||||
$background_repeat = 'no-repeat';
|
||||
break;
|
||||
case "cover":
|
||||
$background_size_img ="cover";
|
||||
case 'cover':
|
||||
$background_size_img = 'cover';
|
||||
$background_repeat = 'no-repeat';
|
||||
break;
|
||||
case "repeat":
|
||||
$background_size_img = "auto";
|
||||
case 'repeat':
|
||||
$background_size_img = 'auto';
|
||||
$background_repeat = 'repeat';
|
||||
break;
|
||||
case "contain":
|
||||
$background_size_img = "contain";
|
||||
case 'contain':
|
||||
$background_size_img = 'contain';
|
||||
$background_repeat = 'repeat';
|
||||
break;
|
||||
|
||||
default:
|
||||
$background_size_img = "auto";
|
||||
$background_size_img = 'auto';
|
||||
$background_repeat = 'no-repeat';
|
||||
break;
|
||||
}
|
||||
|
||||
// Convert transparency level from percentage to opacity value.
|
||||
$contentbg_transp = $contentbg_transp / 100;
|
||||
|
||||
$options = [
|
||||
$options = [
|
||||
'$nav_bg' => $nav_bg,
|
||||
'$nav_icon_color' => $nav_icon_color,
|
||||
'$nav_icon_hover_color' => $nav_icon_hover_color,
|
||||
|
|
@ -184,10 +189,11 @@ $options = [
|
|||
'$menu_background_hover_color' => $menu_background_hover_color,
|
||||
'$btn_primary_color' => $nav_icon_color,
|
||||
'$btn_primary_hover_color' => $menu_background_hover_color,
|
||||
'$bgcolor' => $bgcolor,
|
||||
'$background_color' => $background_color,
|
||||
'$contentbg_transp' => $contentbg_transp,
|
||||
'$background_image' => $background_image,
|
||||
'$background_size_img' => $background_size_img,
|
||||
'$background_repeat' => $background_repeat,
|
||||
'$login_bg_image' => $login_bg_image,
|
||||
'$login_bg_color' => $login_bg_color
|
||||
];
|
||||
|
|
@ -214,13 +220,13 @@ $etag = md5($css);
|
|||
|
||||
// Set a header for caching.
|
||||
header('Cache-Control: public');
|
||||
header('ETag: "'.$etag.'"');
|
||||
header('Last-Modified: '.$modified);
|
||||
header('ETag: "' . $etag . '"');
|
||||
header('Last-Modified: ' . $modified);
|
||||
|
||||
// Only send the CSS file if it was changed.
|
||||
if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) || isset($_SERVER['HTTP_IF_NONE_MATCH'])) {
|
||||
$cached_modified = gmdate('r', strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']));
|
||||
$cached_etag = str_replace(['"', "-gzip"], ['', ''],
|
||||
$cached_etag = str_replace(['"', '-gzip'], ['', ''],
|
||||
stripslashes($_SERVER['HTTP_IF_NONE_MATCH']));
|
||||
|
||||
if (($cached_modified == $modified) && ($cached_etag == $etag)) {
|
||||
|
|
|
|||
|
|
@ -4,6 +4,8 @@
|
|||
<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="1" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip" {{if $field.4}}{{$field.4}}{{/if}}>
|
||||
<label for="id_{{$field.0}}">
|
||||
{{$field.1}}
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</label>
|
||||
</div>
|
||||
|
|
@ -6,6 +6,8 @@
|
|||
{{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
|
||||
<span class="input-group-addon"><i></i></span>
|
||||
</div>
|
||||
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
<div id="end_{{$field.0}}" class="field_end"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,5 +2,7 @@
|
|||
<div class="form-group field custom">
|
||||
<label for="{{$field.0}}">{{$field.1}}</label>
|
||||
{{$field.2}}
|
||||
<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
{{if $field.4}}<span class="required">{{$field.4}}</span>{{/if}}
|
||||
<span class="input-group-addon image-select"><i class="fa fa-picture-o"></i></span>
|
||||
</div>
|
||||
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
<div id="end_{{$field.0}}" class="field_end"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
<div id="id_{{$field.0}}_wrapper" class="form-group field input">
|
||||
<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
|
||||
<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2|escape:'html'}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
|
||||
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
<div class="form-group field checkbox">
|
||||
<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip">
|
||||
<label for="id_{{$field.0}}">{{$field.1}}</label>
|
||||
<span class="help-block" role="tooltip" id="{{$field.0}}_tip">{{$field.4}}</span>
|
||||
{{if $field.4}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.4}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
<div id="id_{{$field.0}}_wrapper" class="form-group field input openid">
|
||||
<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
|
||||
<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
|
||||
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,8 @@
|
|||
<div id="id_{{$field.0}}_wrapper" class="form-group field input password">
|
||||
<label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
|
||||
<input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
|
||||
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,9 @@
|
|||
<input type="radio" name="{{$field.0}}" id="id_{{$field.0}}_{{$field.2}}" value="{{$field.2}}" {{if $field.4}}checked{{/if}} aria-checked="{{if $field.4}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_{{$field.2}}_tip">
|
||||
<label for="id_{{$field.0}}_{{$field.2}}">
|
||||
{{$field.1}}
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_{{$field.2}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -4,5 +4,7 @@
|
|||
<select name="{{$field.0}}" id="id_{{$field.0}}" class="form-control" aria-describedby="{{$field.0}}_tip">
|
||||
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
|
||||
</select>
|
||||
<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
@ -4,5 +4,7 @@
|
|||
<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip">
|
||||
{{$field.4}}
|
||||
</select>
|
||||
<span class="help-block" id="{{$field.0}}_tip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
|
|
@ -2,6 +2,8 @@
|
|||
<div class="form-group field textarea">
|
||||
<label for="id_{{$field.0}}">{{$field.1}}</label>
|
||||
<textarea class="form-control text-autosize" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.4}}{{$field.4}}{{/if}} aria-describedby="{{$field.0}}_tip">{{$field.2}}</textarea>
|
||||
<span id="{{$field.0}}_tip" class="help-block" role="tooltip">{{$field.3}}</span>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
<select class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" {{if $field.5=="preview"}}onchange="previewTheme(this);"{{/if}} aria-describedby="{{$field.0}}_tip" >
|
||||
{{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
|
||||
</select>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
{{if $field.5=="preview"}}<div id="theme-preview"></div>{{/if}}
|
||||
</div>
|
||||
|
|
@ -14,6 +14,8 @@
|
|||
<span class="toggle-handle btn btn-default btn-xs"></span>
|
||||
</div>
|
||||
</div>
|
||||
{{if $field.3}}
|
||||
<span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
|
||||
{{/if}}
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
<div id="login_standard">
|
||||
{{include file="field_input.tpl" field=$lname}}
|
||||
{{include file="field_password.tpl" field=$lpassword}}
|
||||
<div id="login-lost-password-link">
|
||||
<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
|
||||
</div>
|
||||
<div id="login-end"></div>
|
||||
</div>
|
||||
|
||||
{{if $openid}}
|
||||
|
|
@ -19,10 +23,7 @@
|
|||
{{include file="field_checkbox.tpl" field=$lremember}}
|
||||
|
||||
<div id="login-submit-wrapper">
|
||||
<a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link">{{$lostlink}}</a>
|
||||
|
||||
<div class="pull-right" >
|
||||
{{if $register}}<a href="register" title="{{$register.title|escape:'html'}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>{{/if}}
|
||||
<button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -32,7 +33,15 @@
|
|||
<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
|
||||
{{/foreach}}
|
||||
|
||||
<div id="login-end"></div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
{{if $register}}
|
||||
<div id="login-extra-links">
|
||||
<h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
|
||||
<a href="register" title="{{$register.title|escape:'html'}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>
|
||||
</div>
|
||||
{{/if}}
|
||||
|
||||
<script type="text/javascript"> $(document).ready(function() { $("#id_{{$lname.0}}").focus();} );</script>
|
||||
|
|
|
|||
|
|
@ -4,13 +4,13 @@
|
|||
<script src="{{$baseurl}}/view/theme/frio/frameworks/jRange/jquery.range.js"></script>
|
||||
<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
|
||||
|
||||
{{include file="field_select.tpl" field=$schema}}
|
||||
{{include file="field_select.tpl" field=$scheme}}
|
||||
|
||||
{{if $nav_bg}}{{include file="field_colorinput.tpl" field=$nav_bg}}{{/if}}
|
||||
{{if $nav_icon_color}}{{include file="field_colorinput.tpl" field=$nav_icon_color}}{{/if}}
|
||||
{{if $link_color}}{{include file="field_colorinput.tpl" field=$link_color}}{{/if}}
|
||||
|
||||
{{if $bgcolor}}{{include file="field_colorinput.tpl" field=$bgcolor}}{{/if}}
|
||||
{{if $background_color}}{{include file="field_colorinput.tpl" field=$background_color}}{{/if}}
|
||||
|
||||
{{* The slider for the content opacity - We use no template for this since it is only used at this page *}}
|
||||
{{if $contentbg_transp}}
|
||||
|
|
@ -25,6 +25,7 @@
|
|||
{{if $background_image}}{{include file="field_fileinput.tpl" field=$background_image}}{{/if}}
|
||||
|
||||
<div id="frio_bg_image_options" style="display: none;">
|
||||
<label>{{$bg_image_options_title}}:</label>
|
||||
{{foreach $bg_image_options as $options}}
|
||||
{{include file="field_radio.tpl" field=$options}}
|
||||
{{/foreach}}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ use Friendica\Core\System;
|
|||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\Profile;
|
||||
|
||||
$frio = "view/theme/frio";
|
||||
$frio = 'view/theme/frio';
|
||||
|
||||
global $frio;
|
||||
|
||||
|
|
@ -34,21 +34,21 @@ function frio_init(App $a)
|
|||
|
||||
$style = PConfig::get(local_user(), 'frio', 'style');
|
||||
|
||||
$frio = "view/theme/frio";
|
||||
$frio = 'view/theme/frio';
|
||||
|
||||
global $frio;
|
||||
|
||||
// if the device is a mobile device set js is_mobile
|
||||
// variable so the js scripts can use this information
|
||||
if ($a->is_mobile || $a->is_tablet) {
|
||||
$a->page["htmlhead"] .= <<< EOT
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script type="text/javascript">
|
||||
var is_mobile = 1;
|
||||
</script>
|
||||
EOT;
|
||||
}
|
||||
|
||||
if ($style == "") {
|
||||
if ($style == '') {
|
||||
$style = Config::get('frio', 'style');
|
||||
}
|
||||
}
|
||||
|
|
@ -62,7 +62,7 @@ function frio_install()
|
|||
Addon::registerHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
|
||||
Addon::registerHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item');
|
||||
|
||||
logger("installed theme frio");
|
||||
logger('installed theme frio');
|
||||
}
|
||||
|
||||
function frio_uninstall()
|
||||
|
|
@ -74,7 +74,7 @@ function frio_uninstall()
|
|||
Addon::unregisterHook('acl_lookup_end', 'view/theme/frio/theme.php', 'frio_acl_lookup');
|
||||
Addon::unregisterHook('display_item', 'view/theme/frio/theme.php', 'frio_display_item');
|
||||
|
||||
logger("uninstalled theme frio");
|
||||
logger('uninstalled theme frio');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -92,26 +92,26 @@ function frio_uninstall()
|
|||
function frio_item_photo_links(App $a, &$body_info)
|
||||
{
|
||||
$occurence = 0;
|
||||
$p = Plaintext::getBoundariesPosition($body_info['html'], "<a", ">");
|
||||
$p = Plaintext::getBoundariesPosition($body_info['html'], '<a', '>');
|
||||
while ($p !== false && ($occurence++ < 500)) {
|
||||
$link = substr($body_info['html'], $p['start'], $p['end'] - $p['start']);
|
||||
$matches = [];
|
||||
|
||||
preg_match("/\/photos\/[\w]+\/image\/([\w]+)/", $link, $matches);
|
||||
preg_match('/\/photos\/[\w]+\/image\/([\w]+)/', $link, $matches);
|
||||
if ($matches) {
|
||||
// Replace the link for the photo's page with a direct link to the photo itself
|
||||
$newlink = str_replace($matches[0], "/photo/{$matches[1]}", $link);
|
||||
|
||||
// Add a "quiet" parameter to any redir links to prevent the "XX welcomes YY" info boxes
|
||||
$newlink = preg_replace("/href=\"([^\"]+)\/redir\/([^\"]+)&url=([^\"]+)\"/", 'href="$1/redir/$2&quiet=1&url=$3"', $newlink);
|
||||
$newlink = preg_replace('/href="([^"]+)\/redir\/([^"]+)&url=([^"]+)"/', 'href="$1/redir/$2&quiet=1&url=$3"', $newlink);
|
||||
|
||||
// Having any arguments to the link for Colorbox causes it to fetch base64 code instead of the image
|
||||
$newlink = preg_replace("/\/[?&]zrl=([^&\"]+)/", '', $newlink);
|
||||
$newlink = preg_replace('/\/[?&]zrl=([^&"]+)/', '', $newlink);
|
||||
|
||||
$body_info['html'] = str_replace($link, $newlink, $body_info['html']);
|
||||
}
|
||||
|
||||
$p = Plaintext::getBoundariesPosition($body_info['html'], "<a", ">", $occurence);
|
||||
$p = Plaintext::getBoundariesPosition($body_info['html'], '<a', '>', $occurence);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -127,10 +127,10 @@ function frio_item_photo_links(App $a, &$body_info)
|
|||
*/
|
||||
function frio_item_photo_menu(App $a, &$arr)
|
||||
{
|
||||
foreach ($arr["menu"] as $k => $v) {
|
||||
foreach ($arr['menu'] as $k => $v) {
|
||||
if (strpos($v, 'poke/?f=&c=') === 0 || strpos($v, 'message/new/') === 0) {
|
||||
$v = "javascript:addToModal('" . $v . "'); return false;";
|
||||
$arr["menu"][$k] = $v;
|
||||
$v = 'javascript:addToModal(\'' . $v . '\'); return false;';
|
||||
$arr['menu'][$k] = $v;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -149,9 +149,9 @@ function frio_item_photo_menu(App $a, &$arr)
|
|||
*/
|
||||
function frio_contact_photo_menu(App $a, &$args)
|
||||
{
|
||||
$cid = $args["contact"]["id"];
|
||||
$pokelink = $args["menu"]["poke"][1];
|
||||
$pmlink = $args["menu"]["pm"][1];
|
||||
$cid = $args['contact']['id'];
|
||||
$pokelink = $args['menu']['poke'][1];
|
||||
$pmlink = $args['menu']['pm'][1];
|
||||
|
||||
// Set the the indicator for opening the status, profile and photo pages
|
||||
// in a new tab to false if the contact a dfrn (friendica) contact
|
||||
|
|
@ -160,12 +160,12 @@ function frio_contact_photo_menu(App $a, &$args)
|
|||
// friendica servers as remote user or visitor
|
||||
//
|
||||
// The value for opening in a new tab is e.g. when
|
||||
// $args["menu"]["status"][2] is true. If the value of the [2] key is true
|
||||
// $args['menu']['status'][2] is true. If the value of the [2] key is true
|
||||
// and if it's a friendica contact we set it to false
|
||||
foreach ($args["menu"] as $k => $v) {
|
||||
if ($k === "status" || $k === "profile" || $k === "photos") {
|
||||
$v[2] = (($args["contact"]["network"] === "dfrn") ? false : true);
|
||||
$args["menu"][$k][2] = $v[2];
|
||||
foreach ($args['menu'] as $k => $v) {
|
||||
if ($k === 'status' || $k === 'profile' || $k === 'photos') {
|
||||
$v[2] = (($args['contact']['network'] === 'dfrn') ? false : true);
|
||||
$args['menu'][$k][2] = $v[2];
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -173,11 +173,11 @@ function frio_contact_photo_menu(App $a, &$args)
|
|||
// Later we can make conditions in the corresponing templates (e.g.
|
||||
// contact_template.tpl)
|
||||
if (strpos($pokelink, 'poke/?f=&c=' . $cid) !== false) {
|
||||
$args["menu"]["poke"][3] = "modal";
|
||||
$args['menu']['poke'][3] = 'modal';
|
||||
}
|
||||
|
||||
if (strpos($pmlink, 'message/new/' . $cid) !== false) {
|
||||
$args["menu"]["pm"][3] = "modal";
|
||||
$args['menu']['pm'][3] = 'modal';
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -231,43 +231,43 @@ function frio_remote_nav($a, &$nav)
|
|||
// user info
|
||||
$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
|
||||
|
||||
$r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
|
||||
$r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : 'images/person-48.jpg');
|
||||
$r[0]['name'] = $a->user['username'];
|
||||
} elseif (!local_user() && remote_user()) {
|
||||
$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
|
||||
$nav['remote'] = L10n::t("Guest");
|
||||
$nav['remote'] = L10n::t('Guest');
|
||||
} elseif (Profile::getMyURL()) {
|
||||
$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
|
||||
WHERE `addr` = '%s' AND `network` = 'dfrn'",
|
||||
dbesc($webbie));
|
||||
$nav['remote'] = L10n::t("Visitor");
|
||||
$nav['remote'] = L10n::t('Visitor');
|
||||
} else {
|
||||
$r = false;
|
||||
}
|
||||
|
||||
if (DBM::is_result($r)) {
|
||||
$nav['userinfo'] = [
|
||||
'icon' => (DBM::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
|
||||
'icon' => (DBM::is_result($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
|
||||
'name' => $r[0]['name'],
|
||||
];
|
||||
}
|
||||
|
||||
if (!local_user() && !empty($server_url)) {
|
||||
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), "", L10n::t('End this session')];
|
||||
$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
|
||||
|
||||
// user menu
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), "", L10n::t('Your posts and conversations')];
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), "", L10n::t('Your profile page')];
|
||||
$nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), "", L10n::t('Your photos')];
|
||||
$nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), "", L10n::t('Your videos')];
|
||||
$nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), "", L10n::t('Your events')];
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
|
||||
$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];
|
||||
$nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), '', L10n::t('Your photos')];
|
||||
$nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')];
|
||||
$nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), '', L10n::t('Your events')];
|
||||
|
||||
// navbar links
|
||||
$nav['network'] = [$server_url . '/network', L10n::t('Network'), "", L10n::t('Conversations from your friends')];
|
||||
$nav['events'] = [$server_url . '/events', L10n::t('Events'), "", L10n::t('Events and Calendar')];
|
||||
$nav['messages'] = [$server_url . '/message', L10n::t('Messages'), "", L10n::t('Private mail')];
|
||||
$nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), "", L10n::t('Account settings')];
|
||||
$nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), "", L10n::t('Manage/edit friends and contacts')];
|
||||
$nav['network'] = [$server_url . '/network', L10n::t('Network'), '', L10n::t('Conversations from your friends')];
|
||||
$nav['events'] = [$server_url . '/events', L10n::t('Events'), '', L10n::t('Events and Calendar')];
|
||||
$nav['messages'] = [$server_url . '/message', L10n::t('Messages'), '', L10n::t('Private mail')];
|
||||
$nav['settings'] = [$server_url . '/settings', L10n::t('Settings'), '', L10n::t('Account settings')];
|
||||
$nav['contacts'] = [$server_url . '/contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
|
||||
$nav['sitename'] = $a->config['sitename'];
|
||||
}
|
||||
}
|
||||
|
|
@ -289,17 +289,17 @@ function frio_acl_lookup(App $a, &$results)
|
|||
{
|
||||
require_once 'mod/contacts.php';
|
||||
|
||||
$nets = x($_GET, "nets") ? notags(trim($_GET["nets"])) : "";
|
||||
$nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : '';
|
||||
|
||||
// we introduce a new search type, r should do the same query like it's
|
||||
// done in /mod/contacts for connections
|
||||
if ($results["type"] !== "r") {
|
||||
if ($results['type'] !== 'r') {
|
||||
return;
|
||||
}
|
||||
|
||||
$sql_extra = '';
|
||||
if ($results["search"]) {
|
||||
$search_txt = dbesc(protect_sprintf(preg_quote($results["search"])));
|
||||
if ($results['search']) {
|
||||
$search_txt = dbesc(protect_sprintf(preg_quote($results['search'])));
|
||||
$sql_extra .= " AND (`attag` LIKE '%%" . dbesc($search_txt) . "%%' OR `name` LIKE '%%" . dbesc($search_txt) . "%%' OR `nick` LIKE '%%" . dbesc($search_txt) . "%%') ";
|
||||
}
|
||||
|
||||
|
|
@ -311,7 +311,7 @@ function frio_acl_lookup(App $a, &$results)
|
|||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||
WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra ", intval($_SESSION['uid']));
|
||||
if (DBM::is_result($r)) {
|
||||
$total = $r[0]["total"];
|
||||
$total = $r[0]['total'];
|
||||
}
|
||||
|
||||
$sql_extra3 = Widget::unavailableNetworks();
|
||||
|
|
@ -328,8 +328,8 @@ function frio_acl_lookup(App $a, &$results)
|
|||
}
|
||||
}
|
||||
|
||||
$results["items"] = $contacts;
|
||||
$results["tot"] = $total;
|
||||
$results['items'] = $contacts;
|
||||
$results['tot'] = $total;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -91,6 +91,13 @@ nav ul {
|
|||
width: 100% !important; height: 110px !important;
|
||||
}
|
||||
|
||||
#login-extra-links, #login-form {
|
||||
/* width: 341px; */
|
||||
width: 100%;
|
||||
}
|
||||
#id_remember_label {
|
||||
width: unset;
|
||||
}
|
||||
}
|
||||
|
||||
@media screen and (max-width: 480px) {
|
||||
|
|
|
|||
|
|
@ -2422,10 +2422,60 @@ aside #div_id_remember label {
|
|||
float: inherit;
|
||||
}
|
||||
|
||||
#login-group {
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
#login-head {
|
||||
position: unset;
|
||||
width: unset;
|
||||
height: unset;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
||||
div #wrapper_username {
|
||||
padding: 0px;
|
||||
}
|
||||
|
||||
div #wrapper_password {
|
||||
padding: 0px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
#div_id_remember {
|
||||
float: left;
|
||||
width: unset;
|
||||
}
|
||||
|
||||
#remember_tip {
|
||||
display: none;
|
||||
}
|
||||
|
||||
#login-submit-wrapper {
|
||||
float: right;
|
||||
}
|
||||
|
||||
#login-form {
|
||||
margin-top: 20px;
|
||||
}
|
||||
|
||||
#login-extra-links, #login-form {
|
||||
/* width: 341px; */
|
||||
width: 341px;
|
||||
clear: both;
|
||||
border-top: 3px solid white;
|
||||
padding-top: 20px;
|
||||
}
|
||||
|
||||
aside div #login-submit-button {
|
||||
margin-left:0px;
|
||||
}
|
||||
|
||||
#login-lost-password-link {
|
||||
margin-bottom: 10px;
|
||||
float: right;
|
||||
}
|
||||
|
||||
aside #register-link, aside #lost-password-link {
|
||||
display: block;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue