Rename "vendor" to "vendors" in static, fix rendering issues so initial setup prompt shows up (not wired up yet).
This commit is contained in:
Buster Silver
parent
1ff3e95a3b
commit
8a3cb890b3
|
|
@ -36,7 +36,7 @@ class SetupController extends BaseController
|
|||
return $this->redirectFromHere(['action' => 'index']);
|
||||
|
||||
// Create first account form.
|
||||
$this->view->setLayout('minimal');
|
||||
$this->view->setTemplateAfter('minimal');
|
||||
|
||||
$form = new \App\Form($this->current_module_config->forms->register);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,129 +5,24 @@ $page_class = 'login-content';
|
|||
|
||||
<!-- Login -->
|
||||
<div class="lc-block toggled" id="l-login">
|
||||
<h3 class="text-left">Welcome to <?=$this->config->application->name ?>!</h3>
|
||||
<P class="text-left">Begin setup by creating a Super Administrator account.</p>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-account"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Username">
|
||||
<input type="text" name="username" class="form-control" placeholder="E-mail Address">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-male"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="password" class="form-control" placeholder="Password">
|
||||
<input type="password" name="password" class="form-control" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" value="">
|
||||
<i class="input-helper"></i>
|
||||
Keep me signed in
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<a href="" class="btn btn-login btn-danger btn-float"><i class="zmdi zmdi-arrow-forward"></i></a>
|
||||
|
||||
<ul class="login-navigation">
|
||||
<li data-block="#l-register" class="bgm-red">Register</li>
|
||||
<li data-block="#l-forget-password" class="bgm-orange">Forgot Password?</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- Register -->
|
||||
<div class="lc-block" id="l-register">
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-account"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Username">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-email"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Email Address">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-male"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="password" class="form-control" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" value="">
|
||||
<i class="input-helper"></i>
|
||||
Accept the license agreement
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<a href="" class="btn btn-login btn-danger btn-float"><i class="zmdi zmdi-arrow-forward"></i></a>
|
||||
|
||||
<ul class="login-navigation">
|
||||
<li data-block="#l-login" class="bgm-green">Login</li>
|
||||
<li data-block="#l-forget-password" class="bgm-orange">Forgot Password?</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- Forgot Password -->
|
||||
<div class="lc-block" id="l-forget-password">
|
||||
<p class="text-left">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla eu risus. Curabitur commodo lorem fringilla enim feugiat commodo sed ac lacus.</p>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-email"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Email Address">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a href="" class="btn btn-login btn-danger btn-float"><i class="zmdi zmdi-arrow-forward"></i></a>
|
||||
|
||||
<ul class="login-navigation">
|
||||
<li data-block="#l-login" class="bgm-green">Login</li>
|
||||
<li data-block="#l-register" class="bgm-red">Register</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<? /*
|
||||
<div class="row-fluid">
|
||||
<div class="span8">
|
||||
<div class="floating">
|
||||
<h2>Create a PVL Account</h2>
|
||||
<p>Don't have an account within the Ponyville Live! system? Create one below.</p>
|
||||
|
||||
<div class="buttons">
|
||||
<?=$this->viewHelper->button(array(
|
||||
'type' => 'link',
|
||||
'class' => 'large',
|
||||
'href' => $this->viewHelper->routeFromHere(array('action' => 'register')),
|
||||
'icon' => 'icon-asterisk',
|
||||
'text' => 'Create New PVL Account',
|
||||
)) ?>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<h2>Sign In with PVL Account</h2>
|
||||
<p>If you have an account inside the Ponyville Live! system, enter your username and password below.</p>
|
||||
|
||||
<?=$form->render() ?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<div class="floating">
|
||||
<h2>Social Sign-In</h2>
|
||||
|
||||
<? foreach($external_providers as $provider_key => $provider_info): ?>
|
||||
<div class="buttons"><a href="<?=$this->viewHelper->routeFromHere(array('provider' => $provider_key)) ?>" class="zocial <?=$provider_info['class'] ?>">Sign in with <?=$provider_info['name'] ?></a></div>
|
||||
<? endforeach; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,20 +1,51 @@
|
|||
<?php
|
||||
header("Content-type: text/html; charset=utf-8");
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<!--[if IE 9 ]><html class="ie9"><![endif]-->
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<title>Material Admin</title>
|
||||
|
||||
<!-- Vendor CSS -->
|
||||
<link href="vendors/bower_components/animate.css/animate.min.css" rel="stylesheet">
|
||||
<link href="vendors/bower_components/bootstrap-sweetalert/lib/sweet-alert.css" rel="stylesheet">
|
||||
<link href="vendors/bower_components/material-design-iconic-font/dist/css/material-design-iconic-font.min.css" rel="stylesheet">
|
||||
<link href="vendors/bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.min.css" rel="stylesheet">
|
||||
<?php
|
||||
if ($title)
|
||||
$page_title = $title.' - '.$this->config->application->name;
|
||||
else
|
||||
$page_title = $this->config->application->name;
|
||||
|
||||
<!-- CSS -->
|
||||
<link href="css/app.min.1.css" rel="stylesheet">
|
||||
<link href="css/app.min.2.css" rel="stylesheet">
|
||||
$this->tag->setTitle($page_title);
|
||||
if (APP_APPLICATION_ENV != "production")
|
||||
$this->tag->prependTitle('('.ucfirst(APP_APPLICATION_ENV).') ');
|
||||
|
||||
echo $this->tag->getTitle();
|
||||
|
||||
// Set up CSS includes.
|
||||
$this->assets->collection('header_css')
|
||||
->addCss('vendors/bower_components/animate.css/animate.min.css')
|
||||
->addCss('vendors/bower_components/material-design-iconic-font/dist/css/material-design-iconic-font.min.css')
|
||||
->addCss('css/app.min.1.css')
|
||||
->addCss('css/app.min.2.css');
|
||||
|
||||
// Output header CSS.
|
||||
$this->assets->outputCss('header_css');
|
||||
|
||||
// Set up JS includes.
|
||||
$this->assets->collection('footer_js')
|
||||
->addJs('vendors/bower_components/jquery/dist/jquery.min.js')
|
||||
->addJs('vendors/bower_components/bootstrap/dist/js/bootstrap.min.js')
|
||||
->addJs('vendors/bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js')
|
||||
->addJs('vendors/bower_components/Waves/dist/waves.min.js')
|
||||
->addJs('vendors/bootstrap-growl/bootstrap-growl.min.js')
|
||||
->addJs('vendors/bower_components/bootstrap-sweetalert/lib/sweet-alert.min.js')
|
||||
->addJs('js/functions.js')
|
||||
->addJs('js/demo.js');
|
||||
?>
|
||||
<script>
|
||||
var APP_AppEnv = '<?=(defined('APP_APPLICATION_ENV') ? APP_APPLICATION_ENV : '') ?>';
|
||||
var APP_BaseUrl = '<?php echo rtrim($this->url->get(''), '/'); ?>';
|
||||
var APP_ContentPath = '<?php echo $this->url->getStatic(''); ?>';
|
||||
</script>
|
||||
</head>
|
||||
<body>
|
||||
<header id="header" class="clearfix" data-current-skin="blue">
|
||||
|
|
@ -28,7 +59,7 @@
|
|||
</li>
|
||||
|
||||
<li class="logo hidden-xs">
|
||||
<a href="index.html">Material Admin</a>
|
||||
<a href="<?=$this->url->get('') ?>"><?=$this->config->application->name ?></a>
|
||||
</li>
|
||||
|
||||
<li class="pull-right">
|
||||
|
|
@ -1095,7 +1126,7 @@
|
|||
</section>
|
||||
|
||||
<footer id="footer">
|
||||
Copyright © 2015 Material Admin
|
||||
Copyright © <?=date('Y') ?> <?=$this->config->application->name ?>.
|
||||
|
||||
<ul class="f-menu">
|
||||
<li><a href="">Home</a></li>
|
||||
|
|
@ -1117,65 +1148,8 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Older IE warning message -->
|
||||
<!--[if lt IE 9]>
|
||||
<div class="ie-warning">
|
||||
<h1 class="c-white">Warning!!</h1>
|
||||
<p>You are using an outdated version of Internet Explorer, please upgrade <br/>to any of the following web browsers to access this website.</p>
|
||||
<div class="iew-container">
|
||||
<ul class="iew-download">
|
||||
<li>
|
||||
<a href="http://www.google.com/chrome/">
|
||||
<img src="img/browsers/chrome.png" alt="">
|
||||
<div>Chrome</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://www.mozilla.org/en-US/firefox/new/">
|
||||
<img src="img/browsers/firefox.png" alt="">
|
||||
<div>Firefox</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://www.opera.com">
|
||||
<img src="img/browsers/opera.png" alt="">
|
||||
<div>Opera</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="https://www.apple.com/safari/">
|
||||
<img src="img/browsers/safari.png" alt="">
|
||||
<div>Safari</div>
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="http://windows.microsoft.com/en-us/internet-explorer/download-ie">
|
||||
<img src="img/browsers/ie.png" alt="">
|
||||
<div>IE (New)</div>
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<p>Sorry for the inconvenience!</p>
|
||||
</div>
|
||||
<![endif]-->
|
||||
|
||||
|
||||
<!-- Javascript Libraries -->
|
||||
<script src="vendors/bower_components/jquery/dist/jquery.min.js"></script>
|
||||
<script src="vendors/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
|
||||
|
||||
<script src="vendors/bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.concat.min.js"></script>
|
||||
<script src="vendors/bower_components/Waves/dist/waves.min.js"></script>
|
||||
<script src="vendors/bootstrap-growl/bootstrap-growl.min.js"></script>
|
||||
<script src="vendors/bower_components/bootstrap-sweetalert/lib/sweet-alert.min.js"></script>
|
||||
|
||||
<!-- Placeholder for IE9 -->
|
||||
<!--[if IE 9 ]>
|
||||
<script src="vendors/bower_components/jquery-placeholder/jquery.placeholder.min.js"></script>
|
||||
<![endif]-->
|
||||
|
||||
<script src="js/functions.js"></script>
|
||||
<script src="js/demo.js"></script>
|
||||
<?
|
||||
echo $this->assets->outputJs('footer_js');
|
||||
?>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -2,7 +2,7 @@
|
|||
header("Content-type: text/html; charset=utf-8");
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<!--[if IE 9 ]><html class="ie9"><![endif]-->
|
||||
<html>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
|
|
@ -48,99 +48,6 @@ header("Content-type: text/html; charset=utf-8");
|
|||
|
||||
<?php echo $this->getContent(); ?>
|
||||
|
||||
<div class="lc-block toggled" id="l-login">
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-account"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Username">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-male"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="password" class="form-control" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" value="">
|
||||
<i class="input-helper"></i>
|
||||
Keep me signed in
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<a href="" class="btn btn-login btn-danger btn-float"><i class="zmdi zmdi-arrow-forward"></i></a>
|
||||
|
||||
<ul class="login-navigation">
|
||||
<li data-block="#l-register" class="bgm-red">Register</li>
|
||||
<li data-block="#l-forget-password" class="bgm-orange">Forgot Password?</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- Register -->
|
||||
<div class="lc-block" id="l-register">
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-account"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Username">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-email"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Email Address">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-male"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="password" class="form-control" placeholder="Password">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="clearfix"></div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" value="">
|
||||
<i class="input-helper"></i>
|
||||
Accept the license agreement
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<a href="" class="btn btn-login btn-danger btn-float"><i class="zmdi zmdi-arrow-forward"></i></a>
|
||||
|
||||
<ul class="login-navigation">
|
||||
<li data-block="#l-login" class="bgm-green">Login</li>
|
||||
<li data-block="#l-forget-password" class="bgm-orange">Forgot Password?</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<!-- Forgot Password -->
|
||||
<div class="lc-block" id="l-forget-password">
|
||||
<p class="text-left">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla eu risus. Curabitur commodo lorem fringilla enim feugiat commodo sed ac lacus.</p>
|
||||
|
||||
<div class="input-group m-b-20">
|
||||
<span class="input-group-addon"><i class="zmdi zmdi-email"></i></span>
|
||||
<div class="fg-line">
|
||||
<input type="text" class="form-control" placeholder="Email Address">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<a href="" class="btn btn-login btn-danger btn-float"><i class="zmdi zmdi-arrow-forward"></i></a>
|
||||
|
||||
<ul class="login-navigation">
|
||||
<li data-block="#l-login" class="bgm-green">Login</li>
|
||||
<li data-block="#l-register" class="bgm-red">Register</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<?
|
||||
echo $this->assets->outputJs('footer_js');
|
||||
?>
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue