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

Updated font-awesome and bootstrap

Browse Source
This commit is contained in:
Deon George
2014-09-08 23:42:05 +10:00
parent 05d132c4be
commit 85150c655c
166 changed files with 6994 additions and 19909 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
classes/lnApp/Block.php
View File

@@ -50,11 +50,11 @@ abstract class lnApp_Block extends HTMLRender {
$record = self::$_data[$this->_x];
$output = '';
$output .= sprintf('<div class="span%s %s">',empty($record['span']) ? '12' : $record['span'],empty($record['scrollable']) ? '' : 'scrollable');
$output .= sprintf('<div class="col-md-%s %s">',empty($record['span']) ? '12' : $record['span'],empty($record['scrollable']) ? '' : 'scrollable');
$output .= '<div class="widget stacked">';
if (! empty($record['title']))
$output .= sprintf('<div class="widget-header">%s<h3>%s</h3></div>',empty($record['title_icon']) ? '' : sprintf(' <i class="%s"></i>',$record['title_icon']),$record['title']);
$output .= sprintf('<div class="widget-header">%s<h3>%s</h3></div>',empty($record['title_icon']) ? '' : sprintf(' <i class="fa %s"></i>',$record['title_icon']),$record['title']);
$output .= '<div class="widget-content">';
@@ -65,7 +65,7 @@ abstract class lnApp_Block extends HTMLRender {
$output .= Form::close();
break;
case 'form-horizontal': $output .= Form::open(NULL,Arr::merge(array('class'=>'form-horizontal'),(empty($record['id']) ? array() : array('id'=>$record['id']))));
case 'form-horizontal': $output .= Form::open(NULL,Arr::merge(array('class'=>'form-horizontal','role'=>'form'),(empty($record['id']) ? array() : array('id'=>$record['id']))));
$output .= (string)$record['body'];
$output .= Form::close();
break;
@@ -79,7 +79,7 @@ abstract class lnApp_Block extends HTMLRender {
$output .= '</div> <!-- /widget-content -->';
$output .= '</div> <!-- /widget-stacked -->';
$output .= '</div> <!-- /span -->';
$output .= '</div> <!-- /col-md -->';
return $output;
}

11
classes/lnApp/Controller/Login.php
View File

@@ -16,6 +16,9 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
public function action_index() {
$output = '';
if (! array_key_exists('auth',Kohana::modules()))
throw HTTP_Exception::factory(501,'Auth not enabled.');
// If user already signed-in
if (Auth::instance()->logged_in())
HTTP::redirect(URL::link('user','welcome/index'));
@@ -35,7 +38,7 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
} else {
SystemMessage::factory()
->title(_('Invalid username or password'))
->type('error')
->type('danger')
->body(_('The username or password was invalid.'));
}
}
@@ -48,10 +51,6 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
$output .= View::factory('pages/login')
->set('oauth',$oauthlogin);
Style::factory()
->type('file')
->data('media/theme/baseadmin/css/pages/login.css');
Style::factory()
->type('file')
->data('media/css/auth-buttons.css');
@@ -67,7 +66,7 @@ class lnApp_Controller_Login extends Controller_TemplateDefault {
public function action_noaccess() {
SystemMessage::factory()
->title(_('No access to requested resource'))
->type('error')
->type('danger')
->body(_('You do not have access to the requested resource, please contact your administrator.'));
}
}

2
classes/lnApp/Controller/TemplateDefault.php
View File

@@ -105,7 +105,7 @@ abstract class lnApp_Controller_TemplateDefault extends Kohana_Controller_Templa
if ($this->request->is_ajax())
throw HTTP_Exception::factory(403,_('You dont have enough permissions.'));
else
if (! Kohana::$config->load('debug')->disabled_noaccess_redirect)
if (! Kohana::$config->load('config')->disabled_noaccess_redirect)
HTTP::redirect('login/noaccess');
else
throw HTTP_Exception::factory(501,'I would redirect you here - no ACCESS');

22
classes/lnApp/Form.php
View File

@@ -16,6 +16,7 @@ abstract class lnApp_Form extends Kohana_Form {
* @return array((string) control group wrapper,(array) attributes to exclude
*/
private static function _controlgroup($name,array &$attributes=NULL) {
// Bypass this rendering if nocg is set.
if (isset($attributes['nocg'])) {
unset($attributes['nocg']);
return '%s';
@@ -23,10 +24,11 @@ abstract class lnApp_Form extends Kohana_Form {
$output = '';
$output .= '<div class="control-group">';
$output .= '<div class="form-group">';
// Only need col-md for horizonal forms?
if (isset($attributes['label'])) {
$output .= Form::label($name,$attributes['label'],array('class'=>'control-label'));
$output .= Form::label($name,$attributes['label'],array('class'=>'col-md-2 control-label'));
unset($attributes['label']);
}
@@ -40,17 +42,25 @@ abstract class lnApp_Form extends Kohana_Form {
unset($attributes['add-on']);
}
$output .= '<div class="controls">';
$classdiv = FALSE;
if (isset($attributes['class'])) {
$output .= sprintf('<div class="%s">',$attributes['class']);
unset($attributes['class']);
$classdiv = TRUE;
}
$output .= '%s';
if ($classdiv)
$output .= '</div>';
if (isset($help))
$output .= sprintf('<span class="help-block">%s</span>',$help);
if (isset($addon))
$output .= sprintf('<span class="add-on">%s</span>',$addon);
$output .= sprintf('<span class="input-group-addon">%s</span>',$addon);
$output .= '</div>';
$output .= '</div>';
return $output;
}
@@ -71,7 +81,7 @@ abstract class lnApp_Form extends Kohana_Form {
* @usedby Form::image
*/
public static function input($name,$value=NULL,array $attributes=NULL) {
return (isset($attributes['type']) AND $attributes['type'] == 'hidden') ? parent::input($name,$value,$attributes) : sprintf(self::_controlgroup($name,$attributes),parent::input($name,$value,$attributes));
return (isset($attributes['type']) AND $attributes['type'] == 'hidden') ? parent::input($name,$value,$attributes) : sprintf(self::_controlgroup($name,$attributes),parent::input($name,$value,Arr::merge($attributes,array('class'=>'form-control'))));
}
public static function select($name,array $options=NULL,$selected=NULL,array $attributes=NULL) {

2
classes/lnApp/HTTP/Exception.php
View File

@@ -20,7 +20,7 @@ abstract class lnApp_HTTP_Exception extends Kohana_HTTP_Exception {
->set('message',$this->getMessage());
$output .= '<div class="error-actions">';
$output .= HTML::anchor((URL::admin_url() ? 'u/' : '').'welcome','<i class="icon-chevron-left"></i> Back to Home',array('class'=>'btn btn-large btn-primary'));
$output .= HTML::anchor((array_key_exists('auth',Kohana::modules()) AND URL::admin_url() ? 'u/' : '').'welcome','<i class="fa fa-chevron-left"></i> Back to Home',array('class'=>'btn btn-large btn-primary'));
$output .= '</div>';
$output .= '</div></div></div>';

2
classes/lnApp/StaticList/YesNo.php
View File

@@ -22,7 +22,7 @@ abstract class lnApp_StaticList_YesNo extends StaticList {
$value = 0;
return $format ? View::factory(Site::Theme().'/label/bool')
->set('label',$value ? 'label-success' : '')
->set('label',$value ? 'label-success' : 'label-default')
->set('column',StaticList_YesNo::factory()->_get($value)) : $value;
}
}

6
classes/lnApp/URL.php
View File

@@ -59,13 +59,13 @@ abstract class lnApp_URL extends Kohana_URL {
foreach (array_reverse(self::$method_directory) as $k=>$v)
switch ($k) {
case 'admin': $result[$k] = array('name'=>'Administrator','icon'=>'icon-globe');
case 'admin': $result[$k] = array('name'=>'Administrator','icon'=>'fa-globe');
break;
case 'user': $result[$k] = array('name'=>class_exists('Auth') ? Auth::instance()->get_user()->name() : 'Guest','icon'=>'icon-user');
case 'user': $result[$k] = array('name'=>array_key_exists('auth',Kohana::modules()) ? Auth::instance()->get_user()->name() : 'Guest','icon'=>'fa-user');
break;
default: $result[$k] = array('name'=>$k,'icon'=>'icon-question-sign');
default: $result[$k] = array('name'=>$k,'icon'=>'fa-question-sign');
}
return $result;