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

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

Browse Source
This commit is contained in:
zotlabs 2017-03-02 17:36:14 -08:00
commit 7445f1881e
9 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Settings/Display.php
View File

@ -65,7 +65,7 @@ class Display {
set_pconfig(local_channel(),'system','manual_conversation_update', $manual_update);
$newschema = '';
if($theme == $existing_theme){
if($theme){
// call theme_post only if theme has not been changed
if( ($themeconfigfile = $this->get_theme_config_file($theme)) != null){
require_once($themeconfigfile);

13
view/js/mod_settings.js
View File

@ -37,12 +37,19 @@ function setTheme(elm) {
function previewTheme(elm) {
theme = $(elm).val();
var schema = $('#id_schema').val();
$.getJSON('theme_info/' + theme,function(data) {
$('#theme-preview').html('<div id="theme-desc">' + data.desc + '</div><div id="theme-version">' + data.version + '</div><div id="theme-credits">' + data.credits + '</div><a href="' + data.img + '"><img src="' + data.img + '" style="max-width:100%; max-height:300px" alt="' + theme + '"></a>');
$('#id_schema').empty();
$(data.schemas).each(function(index,item) {
$('<option/>',{value:item['key'],text:item['val']}).appendTo('#id_schema');
});
if(data.schemas.length) {
$(data.schemas).each(function(index,item) {
$('<option/>',{value:item['key'],text:item['val']}).appendTo('#id_schema');
});
$('#id_schema').val(schema ? schema : '---');
}
else {
$('<option/>',{value:'',text:'No schemes available'}).appendTo('#id_schema');
}
$('#custom-settings-content .section-content-tools-wrapper').html(data.config);
});
}

1
view/theme/redbasic/schema/dark.css
View File

@ -417,7 +417,6 @@ pre {
.contextual-help-content-open {
background: $nav_bg;
top: 50px;
border-bottom: #555 1px solid;
box-shadow: 0px 3px 3px rgba(85,85,85,0.2);
}

2
view/theme/redbasic/schema/simple_black_on_white.css
View File

@ -294,8 +294,6 @@ pre {
.contextual-help-content-open {
background: #FFF;
top: 50px;
}
.profile-match-wrapper {

1
view/theme/redbasic/schema/simple_green_on_black.css
View File

@ -367,7 +367,6 @@ pre {
.contextual-help-content-open {
background: $nav_bg;
top: 50px;
border-bottom: #1C5419 1px solid;
box-shadow: 0px 3px 3px rgba(28,84,25,0.2);
}

1
view/theme/redbasic/schema/simple_white_on_black.css
View File

@ -340,7 +340,6 @@ pre {
.contextual-help-content-open {
background: $nav_bg;
top: 50px;
border-bottom: #FFF 1px solid;
box-shadow: 0px 3px 3px rgba(255,255,255,0.2);
}

10
view/tpl/connections.tpl
View File

@ -17,12 +17,10 @@
</div>
<div id="contacts-search-form" class="section-content-tools-wrapper">
<form action="{{$cmd}}" method="get" >
<div class="form-group">
<div class="input-group">
<input type="text" name="search" id="contacts-search" class="widget-input" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-search"></i></button>
</div>
<div class="input-group form-group">
<input type="text" name="search" id="contacts-search" class="form-control input-sm" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button id="contacts-search-submit" class="btn btn-default btn-sm" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-fw fa-search"></i></button>
</div>
</div>
</form>

11
view/tpl/follow.tpl
View File

@ -1,12 +1,10 @@
<div id="follow-sidebar" class="widget">
<h3>{{$connect}}</h3>
<form action="follow" method="post" />
<div class="form-group">
<div class="input-group">
<input class="widget-input" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button class="btn btn-default btn-sm" type="submit" name="submit" value="{{$follow}}"><i class="fa fa-plus"></i></button>
</div>
<div class="input-group">
<input class="form-control input-sm" type="text" name="url" title="{{$hint}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button class="btn btn-success btn-sm" type="submit" name="submit" value="{{$follow}}" title="{{$follow}}"><i class="fa fa-fw fa-plus"></i></button>
</div>
</div>
</form>
@ -14,4 +12,3 @@
<div class="usage-message" id="abook-usage-message">{{$abook_usage_message}}</div>
{{/if}}
</div>

10
view/tpl/peoplefind.tpl
View File

@ -1,12 +1,10 @@
<div id="peoplefind-sidebar" class="widget">
<h3>{{$findpeople}}</h3>
<form action="directory" method="post" />
<div class="form-group">
<div class="input-group">
<input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="fa fa-search"></i></button>
</div>
<div class="input-group form-group">
<input class="form-control input-sm" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
<div class="input-group-btn">
<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="fa fa-fw fa-search"></i></button>
</div>
</div>
</form>