1
0
Fork 0

Merge pull request #914 from annando/master

Vier, API and Twitter cards
This commit is contained in:
Tobias Diekershoff 2014-02-24 07:21:15 +01:00
commit 0eec22f656
11 changed files with 277 additions and 70 deletions

View file

@ -0,0 +1,52 @@
<?php
/**
* Theme settings
*/
function theme_content(&$a){
if(!local_user())
return;
$style = get_pconfig(local_user(), 'vier', 'style');
return vier_form($a,$style);
}
function theme_post(&$a){
if(! local_user())
return;
if (isset($_POST['vier-settings-submit'])){
set_pconfig(local_user(), 'vier', 'style', $_POST['vier_style']);
}
}
function theme_admin(&$a){
$style = get_config('vier', 'style');
return vier_form($a,$style);
}
function theme_admin_post(&$a){
if (isset($_POST['vier-settings-submit'])){
set_config('vier', 'style', $_POST['vier_style']);
}
}
function vier_form(&$a, $style){
$styles = array(
"shadow"=>"Shadow",
"flat"=>"Flat"
);
$t = get_markup_template("theme_settings.tpl" );
$o .= replace_macros($t, array(
'$submit' => t('Submit'),
'$baseurl' => $a->get_baseurl(),
'$title' => t("Theme settings"),
'$style' => array('vier_style',t ('Set style'),$style,'',$styles),
));
return $o;
}

4
view/theme/vier/flat.css Normal file
View file

@ -0,0 +1,4 @@
*{ box-shadow: 0 0 0 0 !important;}
body, section { background-color: #ffffff !important;}
#profile-jot-form { background-color: #ffffff !important;}
.dspr, .twit, .pump, .dfrn { background-color: #ffffff !important;}

View file

@ -1219,6 +1219,10 @@ border-bottom: 1px solid #D2D2D2;
.type-link .oembed {
}
.type-link img + br{
display: none;
}
.wall-item-container .wall-item-content {
/* font-size: 14px; */
max-width: 660px;

View file

@ -0,0 +1,11 @@
{{*
* AUTOMATICALLY GENERATED TEMPLATE
* DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
*
*}}
{{include file="field_select.tpl" field=$style}}
<div class="settings-submit-wrapper">
<input type="submit" value="{{$submit}}" class="settings-submit" name="vier-settings-submit" />
</div>

View file

@ -15,6 +15,10 @@ $baseurl = $a->get_baseurl();
$a->theme_info = array();
$style = get_pconfig(local_user(), 'vier', 'style');
if ($style == "flat")
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/vier/flat.css" type="text/css" media="screen"/>'."\n";
$a->page['htmlhead'] .= <<< EOT
<script type="text/javascript" src="$baseurl/view/theme/vier/js/jquery.divgrow-1.3.1.f1.min.js"></script>
<script>