deon/lnapp
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated rending of social icons with bootstrap/fontawesome and fixed search typahead

Browse Source
This commit is contained in:
Deon George
2016-05-02 16:30:39 +10:00
parent 87e5de64fe
commit f49b864d3a
9 changed files with 166 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
views/login.php
View File

@@ -1,7 +1,7 @@
<br/>
<div class="center-block" style="width: 350px;">
<div class="content clearfix">
<form method="post" action="<?php echo URL::site('login'); ?>">
<br/>
<div class="panel panel-default">
<div class="panel-heading">
<div class="panel-title">Sign In</div>
@@ -28,13 +28,11 @@
</div> <!-- /btn-group -->
</div> <!-- form-group -->
<?php if ($oauth) : ?>
<?php if ($oauth AND $oa=ORM::factory('Oauth')->list_active() AND $oa->count()) : ?>
<div class="login-social">
<p>Sign in using social network:</p>
<?php foreach (ORM::factory('Oauth')->list_active() as $oo) : ?>
<div class="social-btn">
<?php echo HTML::anchor('oauth/login/'.$oo->name,'Login with <b>'.ucfirst($oo->name).'</b>',array('class'=>'btn-auth btn-'.$oo->name)); ?>
</div>
<?php foreach ($oa as $oo) : ?>
<?php echo HTML::anchor('oauth/login/'.$oo->name,sprintf('<span class="fa fa-%s"></span>',($oo->name == 'intuit' ? 'adn' : $oo->name)),array('class'=>'btn btn-sm btn-social-icon btn-'.($oo->name == 'intuit' ? 'adn' : $oo->name))); ?>
<?php endforeach ?>
</div>
<?php endif ?>
@@ -55,4 +53,3 @@
</div>
</div>
</div>
<div class="fb-root"></div>

8
views/theme/baseadmin/page.php
View File

@@ -18,7 +18,7 @@
echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css');
echo HTML::style('media/vendor/font-awesome/css/font-awesome.min.css');
} else {
echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css'));
echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css'));
echo HTML::style(Site::Protocol('maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'));
}
@@ -50,7 +50,7 @@
<form class="navbar-form navbar-right" role="search">
<div class="navbar-search-addon form-group">
<i class="fa fa-search"></i>
<input type="text" class="form-control input-sm search-query" placeholder="Search">
<input type="text" autocomplete="off" name="search-query" class="form-control input-sm search-query" placeholder="Search" data-provide="typeahead">
</div>
</form>
<?php endif ?>
@@ -132,13 +132,13 @@
echo HTML::script('media/js/lodash/lodash-1.2.1.min.js');
} else {
echo HTML::script(Site::Protocol('code.jquery.com/jquery-1.9.1.min.js'));
echo HTML::script(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js'));
echo HTML::script(Site::Protocol('maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js'));
echo HTML::script(Site::Protocol('cdnjs.cloudflare.com/ajax/libs/lodash.js/1.2.1/lodash.min.js'));
}
echo HTML::script('media/theme/bootstrap/js/bootstrap.validator.js');
echo HTML::script('media/theme/baseadmin/js/backtotop.js');
echo HTML::script('media/js/typeahead.bundle.min.js');
echo HTML::script('media/js/bootstrap3-typeahead.min.js');
echo HTML::script('media/js/search.js');
echo HTML::script('media/js/custom.js');
echo Script::factory()->render_all();