1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00

HTML5 validation fixes.

This commit is contained in:
Cameron
2015-04-09 20:15:20 -07:00
parent 87f2b22241
commit fd12d59d12
5 changed files with 54 additions and 9 deletions

View File

@@ -1373,6 +1373,40 @@ class themeHandler
$text .= $itext;
$wildcard = false;
$curCss = array();
foreach($theme['css'] as $k=>$vl)
{
if($vl['name'] == '*')
{
unset($theme['css'][$k]);
$wildcard = true;
}
else
{
$curCss[] = $vl['name'];
}
}
if($wildcard == true)
{
foreach($theme['files'] as $val)
{
if(substr($val,-4) == '.css' && substr($val,0,5) != 'admin_' && !in_array($val, $curCss))
{
$theme['css'][] = array('name'=>$val, 'info'=>'User-added Stylesheet', 'nonadmin'=>1);
}
}
}
if(array_key_exists("multipleStylesheets", $theme) && $mode)
{

View File

@@ -108,10 +108,12 @@ class social_shortcodes extends e_shortcode
$size = varset($parm['size'], 'md');
//TODO LANS ie. "Share on [x]" in English_global.php
//TODO LANS ie. "Share on [x]" in English_global.php
$emailMessage = "Check out this link: "; //TODO LAN
$providers = array(
'email' => array('icon' => 'e-social-mail', 'title'=>"Email to someone", 'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=Check out this link: [u]"),
'email' => array('icon' => 'e-social-mail', 'title'=>"Email to someone", 'url' => "mailto:EMAIL_RECIPIENT?subject=[t]&body=".urlencode($emailMessage)."[u]"),
'facebook-like' => array('icon' => 'e-social-thumbs-up', 'title'=>"Like on Facebook", 'url' => "http://www.facebook.com/plugins/like.php?href=[u]"),
'facebook-share' => array('icon' => 'e-social-facebook', 'title'=>"Share on Facebook", 'url' => "http://www.facebook.com/sharer.php?u=[u]&t=[t]"),
'twitter' => array('icon' => 'e-social-twitter', 'title'=>"Share on Twitter", 'url' => "http://twitter.com/share?url=[u]&text=[t]"),
@@ -171,7 +173,7 @@ class social_shortcodes extends e_shortcode
$text = '<div class="btn-group '.$dir.'">
<a class="e-tip btn btn-dropdown btn-default btn-'.$size.' dropdown-toggle" data-toggle="dropdown" href="#" title="Share">'.$label.'</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel" style="min-width:435px">
<ul class="dropdown-menu" role="menu" style="min-width:435px">
<li><div class="btn-group" style="padding-left: 7px;">'.implode("\n",$opt).'</div></li>
</ul>

View File

@@ -30,7 +30,7 @@ if(deftrue('XURL_TWITTER'))
$text = '<a class="twitter-timeline" data-theme="'.$theme.'" href="'.XURL_TWITTER.'" data-tweet-limit="'.$limit.'" data-widget-id="'.$widgetId.'" height="'.$height.'" data-screen-name="'.$screenName.'" data-chrome="noheader nofooter transparent noscrollbar">Tweets by @'.$screenName.'</a>';
$text = '<a class="twitter-timeline" data-theme="'.$theme.'" href="'.XURL_TWITTER.'" data-tweet-limit="'.$limit.'" data-widget-id="'.$widgetId.'" style="height:'.$height.'px" data-screen-name="'.$screenName.'" data-chrome="noheader nofooter transparent noscrollbar">Tweets by @'.$screenName.'</a>';
e107::getRender()->tablerender('Twitter',$text,'twitter-menu');

View File

@@ -113,11 +113,19 @@ function tablestyle($caption, $text, $id='', $info=array())
</div>';
return;
}
echo '<h2 class="caption">'.$caption.'</h2>
'.$text.'
';
// default.
if(!empty($caption))
{
echo '<h2 class="caption">'.$caption.'</h2>';
}
echo $text;
return;

View File

@@ -18,6 +18,7 @@
</screenshots>
<stylesheets>
<css file="style.css" name="Default" />
<css file="*" name="*" />
</stylesheets>
<layouts>
<layout name='jumbotron_home' title='Jumbotron (home)' default='false'>