mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 05:37:32 +02:00
Code Issues Releases Wiki Activity

Fix for html5 validation issues in Safari etc.

Browse Source
This commit is contained in:
Cameron
2015-01-25 20:27:45 -08:00
parent 0d809d80dc
commit af465d2a5e
6 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/header.php
View File

@@ -67,6 +67,8 @@ function loadJSAddons()
e107::css('core', 'bootstrap-datetimepicker/css/datetimepicker.css', 'jquery'); e107::css('core', 'bootstrap-datetimepicker/css/datetimepicker.css', 'jquery');
e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2); e107::js('core', 'bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', 'jquery', 2);
e107::js('core', 'jquery.h5validate.min.js','jquery',2);
if(e_LAN != 'en') if(e_LAN != 'en')
{ {
e107::js('inline', buildDateLocale(),'jquery', 2); e107::js('inline', buildDateLocale(),'jquery', 2);

10
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -40,13 +40,13 @@ class admin_shortcodes
if($parm=='icon') if($parm=='icon')
{ {
return '<ul class="nav pill"> return '<ul class="nav navbar pill navbar-nav">
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#"> <a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#">
'.E_16_E107.' <b class="caret"></b> '.E_16_E107.' <b class="caret"></b>
</a> </a>
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li class="nav-header">Update Available</li> <li class="nav-header navbar-header">Update Available</li>
<li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li> <li><a href="'.$installUrl.'">e107 v'.$cacheData.'</a></li>
</ul> </ul>
</li> </li>
@@ -698,13 +698,13 @@ class admin_shortcodes
$outboxUrl = e_PLUGIN.'pm/admin_config.php?'.'searchquery=&amp;iframe=1&amp;filter_options=bool__pm_from__'.USERID; $outboxUrl = e_PLUGIN.'pm/admin_config.php?'.'searchquery=&amp;iframe=1&amp;filter_options=bool__pm_from__'.USERID;
$composeUrl = e_PLUGIN.'pm/admin_config.php?'.'mode=main&amp;iframe=1&amp;action=create'; $composeUrl = e_PLUGIN.'pm/admin_config.php?'.'mode=main&amp;iframe=1&amp;action=create';
$text = '<ul class="nav nav-pills"> $text = '<ul class="nav navbar-nav nav-pills">
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" > <a class="dropdown-toggle" title="Messages" role="button" data-toggle="dropdown" href="#" >
'.$tp->toGlyph('fa-envelope').$countDisp.'<b class="caret"></b> '.$tp->toGlyph('fa-envelope').$countDisp.'<b class="caret"></b>
</a> </a>
<ul class="dropdown-menu" role="menu" > <ul class="dropdown-menu" role="menu" >
<li class="nav-header">Private Messages</li> <li class="nav-header navbar-header">Private Messages</li>
<li><a class="e-modal" data-cache="false" data-modal-caption="Inbox" data-target="#uiModal" href="'.$inboxUrl.'" >Inbox</a></li> <li><a class="e-modal" data-cache="false" data-modal-caption="Inbox" data-target="#uiModal" href="'.$inboxUrl.'" >Inbox</a></li>
<li><a class="e-modal" data-cache="false" data-modal-caption="Outbox" data-target="#uiModal" href="'.$outboxUrl.'">Outbox</a></li> <li><a class="e-modal" data-cache="false" data-modal-caption="Outbox" data-target="#uiModal" href="'.$outboxUrl.'">Outbox</a></li>
<li><a class="e-modal" data-cache="false" data-modal-caption="Compose" data-target="#uiModal" href="'.$composeUrl.'">Compose</a></li> <li><a class="e-modal" data-cache="false" data-modal-caption="Compose" data-target="#uiModal" href="'.$composeUrl.'">Compose</a></li>
@@ -728,7 +728,7 @@ class admin_shortcodes
</a> </a>
<div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px"> <div id="dropdown" class="dropdown-menu pull-right e-noclick" style="padding:10px;width:300px">
<ul class="nav-list"> <ul class="nav-list">
<li class="nav-header">Unread Messages</li> <li class="nav-header navbar-header">Unread Messages</li>
<li><a href="#">Incoming Message Number 1</a></li> <li><a href="#">Incoming Message Number 1</a></li>
<li><a href="#">Incoming Message Number 2</a></li> <li><a href="#">Incoming Message Number 2</a></li>
<li><a href="#">Incoming Message Number 3</a></li> <li><a href="#">Incoming Message Number 3</a></li>

2
e107_core/templates/header_default.php
View File

@@ -32,6 +32,8 @@ e107::css('core', 'bootstrap/css/tooltip.css','jquery');
e107::js('core', 'bootstrap-notify/js/bootstrap-notify.js','jquery'); e107::js('core', 'bootstrap-notify/js/bootstrap-notify.js','jquery');
e107::css('core', 'bootstrap-notify/css/bootstrap-notify.css','jquery'); e107::css('core', 'bootstrap-notify/css/bootstrap-notify.css','jquery');
e107::js('core', 'jquery.h5validate.min.js','jquery');
// ------------------ // ------------------
// e107::js('core', 'jquery.elastic.js', 'jquery', 2); // e107::js('core', 'jquery.elastic.js', 'jquery', 2);

4
e107_themes/bootstrap3/theme.php
View File

@@ -8,8 +8,8 @@ define("BOOTSTRAP", 3);
define("FONTAWESOME", 4); define("FONTAWESOME", 4);
define('VIEWPORT', "width=device-width, initial-scale=1.0"); define('VIEWPORT', "width=device-width, initial-scale=1.0");
e107::js("url", "//netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js"); e107::js("url", "//netdna.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js");
e107::css('url', '//netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css'); e107::css('url', '//netdna.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css');
e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"); e107::css('url', "//netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css");
e107::js("footer-inline", "$('.e-tip').tooltip({container: 'body'})"); // activate bootstrap tooltips. e107::js("footer-inline", "$('.e-tip').tooltip({container: 'body'})"); // activate bootstrap tooltips.

6
e107_web/js/core/all.jquery.js
View File

@@ -11,13 +11,13 @@ $.ajaxSetup({
$(document).ready(function() $(document).ready(function()
{ {
$(".e-hideme").hide(); $(".e-hideme").hide();
$(".e-expandit").show(); $(".e-expandit").show();
$('form').h5Validate(); // allow older browsers to use html5 validation.
// $(".e-spinner").spinner(); //FIXME breaks tooltips // $(".e-spinner").spinner(); //FIXME breaks tooltips
//check all //check all
$("#check-all").click(function(event){ $("#check-all").click(function(event){
var val = $(this).val(), selector = '.field-spacer'; var val = $(this).val(), selector = '.field-spacer';

1
e107_web/js/jquery.h5validate.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long