Inicio Explorar Axuda
Rexistro Iniciar sesión
mxuser
/
yii2-app-basic
1
1
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

Fixed the basic app template.

Qiang Xue %!s(int64=12) %!d(string=hai) anos
pai
42cad0bbe3
achega
37f69a52d7
Modificáronse 4 ficheiros con 47 adicións e 115 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 0 1
      controllers/SiteController.php
  2. 28 25
      views/layouts/main.php
  3. 17 16
      views/site/index.php
  4. 2 73
      web/css/site.css

+ 0 - 1
controllers/SiteController.php
Ver ficheiro 

@@ -21,7 +21,6 @@ class SiteController extends Controller
 
 
 
 	public function actionIndex()
 
 	public function actionIndex()
 
 	{
 
 	{
 
-		Yii::warning('test');
 
 		return $this->render('index');
 
 		return $this->render('index');
 
 	}
 
 	}

+ 28 - 25
views/layouts/main.php
Ver ficheiro 

@@ -19,36 +19,39 @@ app\config\AppAsset::register($this);
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
 <?php $this->beginBody(); ?>
 
 <?php $this->beginBody(); ?>
 
-<div class="container">
 
-	<div class="masthead">
 
-		<h3 class="text-muted">My Company</h3>
 
+	<div class="navbar navbar-inverse navbar-fixed-top">
 
+		<div class="container">
 
+			<?php echo Html::a('My Company', Yii::$app->homeUrl, array('class' => 'navbar-brand')); ?>
 
+			<div class="nav-collapse collapse pull-right">
 
+				<?php echo Menu::widget(array(
 
+					'options' => array('class' => 'nav navbar-nav'),
 
+					'items' => array(
 
+						array('label' => 'Home', 'url' => array('/site/index')),
 
+						array('label' => 'About', 'url' => array('/site/about')),
 
+						array('label' => 'Contact', 'url' => array('/site/contact')),
 
+						Yii::$app->user->isGuest ?
 
+							array('label' => 'Login', 'url' => array('/site/login')) :
 
+							array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')),
 
+					),
 
+				)); ?>
 
+			</div>
 
+		</div>
 
+	</div>
 
 
 
-		<?php echo Menu::widget(array(
 
-			'options' => array('class' => 'nav navbar-nav nav-justified'),
 
-			'items' => array(
 
-				array('label' => 'Home', 'url' => array('/site/index')),
 
-				array('label' => 'About', 'url' => array('/site/about')),
 
-				array('label' => 'Contact', 'url' => array('/site/contact')),
 
-				Yii::$app->user->isGuest ?
 
-					array('label' => 'Login', 'url' => array('/site/login')) :
 
-					array('label' => 'Logout (' . Yii::$app->user->identity->username .')' , 'url' => array('/site/logout')),
 
-			),
 
+	<div class="container">
 
+		<?php echo Breadcrumbs::widget(array(
 
+			'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
 
 		)); ?>
 
 		)); ?>
 
+		<?php echo $content; ?>
 
 	</div>
 
 	</div>
 
 
 
-	<?php echo Breadcrumbs::widget(array(
 
-		'links' => isset($this->params['breadcrumbs']) ? $this->params['breadcrumbs'] : array(),
 
-	)); ?>
 
-	<?php echo $content; ?>
 
+	<footer class="footer">
 
+		<div class="container">
 
+			<p class="pull-left">&copy; My Company <?php echo date('Y'); ?></p>
 
+			<p class="pull-right"><?php echo Yii::powered(); ?></p>
 
+		</div>
 
+	</footer>
 
 
 
-	<div class="footer">
 
-		<p>&copy; My Company <?php echo date('Y'); ?></p>
 
-		<p>
 
-			<?php echo Yii::powered(); ?>
 
-			Template by <a href="http://twitter.github.io/bootstrap/">Twitter Bootstrap</a>
 
-		</p>
 
-	</div>
 
-</div>
 
 <?php $this->endBody(); ?>
 
 <?php $this->endBody(); ?>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 17 - 16
views/site/index.php
Ver ficheiro 

@@ -5,44 +5,45 @@
 
 $this->title = 'Welcome';
 
 $this->title = 'Welcome';
 
 ?>
 
 ?>
 
 <div class="jumbotron">
 
 <div class="jumbotron">
 
-	<h1>Welcome!</h1>
 
+	<h1>Congratulations!</h1>
 
 
 
-	<p class="lead">Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus
 
-		commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet.</p>
 
+	<p class="lead">You have successfully created your Yii-powered application.</p>
 
 
 
 	<p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
 
 	<p><a class="btn btn-large btn-success" href="http://www.yiiframework.com">Get started with Yii</a></p>
 
 </div>
 
 </div>
 
 
 
 <div class="body-content">
 
 <div class="body-content">
 
 
 
-	<!-- Example row of columns -->
 
 	<div class="row">
 
 	<div class="row">
 
 		<div class="col-lg-4">
 
 		<div class="col-lg-4">
 
 			<h2>Heading</h2>
 
 			<h2>Heading</h2>
 
 
 
-			<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
 
-				condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis
 
-				euismod. Donec sed odio dui. </p>
 
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
 
+				dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
 
+				ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
 
+				fugiat nulla pariatur.</p>
 
 
 
-			<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
 
+			<p><a class="btn btn-default" href="http://www.yiiframework.com/doc/">Yii Documentation &raquo;</a></p>
 
 		</div>
 
 		</div>
 
 		<div class="col-lg-4">
 
 		<div class="col-lg-4">
 
 			<h2>Heading</h2>
 
 			<h2>Heading</h2>
 
 
 
-			<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris
 
-				condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis
 
-				euismod. Donec sed odio dui. </p>
 
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
 
+				dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
 
+				ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
 
+				fugiat nulla pariatur.</p>
 
 
 
-			<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
 
+			<p><a class="btn btn-default" href="http://www.yiiframework.com/forum/">Yii Forum &raquo;</a></p>
 
 		</div>
 
 		</div>
 
 		<div class="col-lg-4">
 
 		<div class="col-lg-4">
 
 			<h2>Heading</h2>
 
 			<h2>Heading</h2>
 
 
 
-			<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula
 
-				porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut
 
-				fermentum massa.</p>
 
+			<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et
 
+				dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip
 
+				ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
 
+				fugiat nulla pariatur.</p>
 
 
 
-			<p><a class="btn btn-default" href="#">View details &raquo;</a></p>
 
+			<p><a class="btn btn-default" href="http://www.yiiframework.com/extensions/">Yii Extensions &raquo;</a></p>
 
 		</div>
 
 		</div>
 
 	</div>
 
 	</div>

+ 2 - 73
web/css/site.css
Ver ficheiro 

@@ -1,32 +1,14 @@
 
 body {
 
 body {
 
-  padding-top: 20px;
 
-}
 
-
 
-/* Everything but the jumbotron gets side spacing for mobile-first views */
 
-.masthead,
 
-.body-content,
 
-.footer {
 
-  padding-left: 15px;
 
-  padding-right: 15px;
 
-}
 
-
 
-.masthead:before,
 
-.masthead:after {
 
-  display: table;
 
-  content: " ";
 
-}
 
-.masthead:after {
 
-	clear: both;
 
+  padding-top: 70px;
 
 }
 
 }
 
 
 
 .footer {
 
 .footer {
 
   border-top: 1px solid #ddd;
 
   border-top: 1px solid #ddd;
 
   margin-top: 30px;
 
   margin-top: 30px;
 
-  padding-top: 29px;
 
+  padding-top: 15px;
 
   padding-bottom: 30px;
 
   padding-bottom: 30px;
 
 }
 
 }
 
 
 
-/* Main marketing message and sign up button */
 
 .jumbotron {
 
 .jumbotron {
 
   text-align: center;
 
   text-align: center;
 
   background-color: transparent;
 
   background-color: transparent;
 
@@ -35,56 +17,3 @@ body {
 
   font-size: 21px;
 
   font-size: 21px;
 
   padding: 14px 24px;
 
   padding: 14px 24px;
 
 }
 
 }
 
-
 
-/* Customize the nav-justified links to be fill the entire space of the .navbar */
 
-.nav-justified {
 
-  max-height: 50px;
 
-  background-color: #eee;
 
-  border-radius: 5px;
 
-  border: 1px solid #ccc;
 
-}
 
-.nav-justified > li > a {
 
-  padding-top: 15px;
 
-  padding-bottom: 15px;
 
-  color: #777;
 
-  font-weight: bold;
 
-  text-align: center;
 
-  border-left: 1px solid rgba(255,255,255,.75);
 
-  border-right: 1px solid rgba(0,0,0,.1);
 
-  background-color: #e5e5e5; /* Old browsers */
 
-  background-repeat: repeat-x; /* Repeat the gradient */
 
-  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #e5e5e5 100%); /* FF3.6+ */
 
-  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#e5e5e5)); /* Chrome,Safari4+ */
 
-  background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Chrome 10+,Safari 5.1+ */
 
-  background-image: -ms-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* IE10+ */
 
-  background-image: -o-linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* Opera 11.10+ */
 
-  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#e5e5e5',GradientType=0 ); /* IE6-9 */
 
-  background-image: linear-gradient(top, #f5f5f5 0%,#e5e5e5 100%); /* W3C */
 
-}
 
-.nav-justified > .active > a {
 
-  background-color: #ddd;
 
-  background-image: none;
 
-  box-shadow: inset 0 3px 7px rgba(0,0,0,.15);
 
-}
 
-.nav-justified > li:first-child > a {
 
-  border-left: 0;
 
-  border-top-left-radius: 5px;
 
-  border-bottom-left-radius: 5px;
 
-}
 
-.nav-justified > li:last-child > a {
 
-  border-right: 0;
 
-  border-top-right-radius: 5px;
 
-  border-bottom-right-radius: 5px;
 
-}
 
-
 
-
 
-/* Responsive: Portrait tablets and up */
 
-@media screen and (min-width: 768px) {
 
-  /* Remove the padding we set earlier */
 
-  .masthead,
 
-  .marketing,
 
-  .footer {
 
-    padding-left: 0;
 
-    padding-right: 0;
 
-  }
 
-}