Merge remote-tracking branch 'upstream/master'

clevertech · Oct 22, 2012 · cb1f7c7 · cb1f7c7
2 parents 2105e99 + 4aa2b2c
commit cb1f7c7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/backend/config/main.php b/backend/config/main.php
@@ -73,6 +73,9 @@
 			)
 		), */
 		'components' => array(
+			'user' => array(
+				'allowAutoLogin'=>true,
+			),
 			/* load bootstrap components */
 			'bootstrap' => array(
 				'class' => 'common.extensions.bootstrap.components.Bootstrap',
@@ -96,10 +99,9 @@
 				'urlSuffix' => '/',
 				'rules' => $params['url.rules']
 			),
-		),
-		/* make sure you have your cache set correctly before uncommenting */
-		/* 'cache' => $params['cache.core'], */
-		/* 'contentCache' => $params['cache.content'] */
+			/* make sure you have your cache set correctly before uncommenting */
+			/* 'cache' => $params['cache.core'], */
+		),		
 	),
 	CMap::mergeArray($mainEnvConfiguration, $mainLocalConfiguration)
 );
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
@@ -26,8 +26,8 @@
 	<meta name="keywords" content="">
 	<meta name="viewport" content="width=device-width,initial-scale=1">
 
-	<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/css/main.css">
 	<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/css/normalize.css">
+	<link rel="stylesheet" href="<?php echo Yii::app()->request->baseUrl; ?>/css/main.css">
 	<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->request->baseUrl; ?>/css/styles.css"/>
 	<!--using less instead? file not included-->
 	<!--<link rel="stylesheet/less" type="text/css" href="/less/styles.less">-->