Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrections of PR before #8

Merged
merged 5 commits into from
Jan 9, 2018
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,3 @@ composer.phar
.buildpath
.project
.settings

composer.lock
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file. This project make usage of the [Yii Versioning Strategy](https://github.com/yiisoft/yii2/blob/master/docs/internals/versions.md). In order to read more about upgrading and BC breaks have a look at the [UPGRADE Document](UPGRADE.md).

## 1.0.1 (in progress)

- [#7](https://github.com/luyadev/luya-kickstarter/pull/7) Update kickstarter style a little bit in general.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dev7ch please make one entry

- [#7](https://github.com/luyadev/luya-kickstarter/pull/7) Change to Roboto font.
- [#7](https://github.com/luyadev/luya-kickstarter/pull/7) Replace bs3 jumbotron with card.
- [#7](https://github.com/luyadev/luya-kickstarter/pull/7) adding favicon.
- [#7](https://github.com/luyadev/luya-kickstarter/pull/7) adding the new LUYA logo.

## 1.0.0 (12. December 2017)

- First stable release.
4 changes: 3 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,12 @@
}
]
},
"asset-installer-paths": {
"bower-asset-library": "vendor/bower"
},
"branch-alias": {
"dev-master": "1.0.x-dev"
}

},
"config": {
"fxp-asset" : {
Expand Down
2 changes: 1 addition & 1 deletion messages/de/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

return [
'kickstarter_success' => '<h1 class="alert-heading">Du bist bereit!</h1>
<p>Super, du hast es geschafft <i>LUYA</i> erfolgreich zu installieren. Du kannst dich nun in den Administrations-Bereich einloggen um dort deinen ersten Seiten erstellen.</p>
<p>Super, du hast es geschafft <i>LUYA</i> erfolgreich zu installieren. Du kannst dich nun in den Administrationsbereich einloggen um dort deine ersten Seiten erstellen.</p>
<p><strong>Wichtig</strong><br />Nachdem du dich in den Administrationsbereich eingeloggt hast, musst du zuerst unter &laquo;System&raquo; alle Berechtigungen für deine Gruppe (Adminstrator) aktivieren.</p>',
'kickstarter_admin_link' => '<p><a href="{link}" class="btn btn-primary btn-lg btn-outline-light">zur Administration</a></p>',
];
4 changes: 2 additions & 2 deletions messages/en/app.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

return [
'kickstarter_success' => '<h1 class="alert-heading">You are ready!</h1>
<p>Yes, you have successful installed <i>LUYA</i> on your System. You are now able to login into the administration area to create your pages.</p>
<p><strong>Important</strong><br />After loging into the administration area you have to navigation to &laquo;System&raquo; and enable all permissions for your group (Adminstrator).</p>',
<p>Yes, you have successfully installed <i>LUYA</i> on your System. You are now able to login to the administration area to create your pages.</p>
<p><strong>Important</strong><br />After logging into the administration area you have to navigate to &laquo;System&raquo; and enable all permissions for your group (Adminstrator).</p>',
'kickstarter_admin_link' => '<p><a href="{link}" class="btn btn-primary btn-lg">Open administration area</a></p>',
];
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
78 changes: 38 additions & 40 deletions views/layouts/main.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php
use app\assets\ResourcesAsset;
use app\assets\BootstrapAsset;
use luya\helpers\Url;
use luya\cms\widgets\LangSwitcher;

Expand All @@ -21,12 +20,11 @@
<meta property="og:title" content="LUYA - Build any system" />
<meta property="og:image" content="<?= $this->publicHtml ?>/images/logo/2x/luya_logo@2x-100.jpg" />
<meta property=“og:type“ content=“website“/>
<link rel="apple-touch-icon" sizes="180x180" href="<?= $this->publicHtml ?>/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="<?= $this->publicHtml ?>/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="<?= $this->publicHtml ?>/favicon-16x16.png">
<link rel="manifest" href="<?= $this->publicHtml ?>/manifest.json">
<link rel="mask-icon" href="<?= $this->publicHtml ?>/safari-pinned-tab.svg" color="#A50045">
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link rel="apple-touch-icon" sizes="180x180" href="<?= $this->publicHtml ?>/favicon/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="<?= $this->publicHtml ?>/favicon/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="<?= $this->publicHtml ?>/favicon/favicon-16x16.png">
<link rel="manifest" href="<?= $this->publicHtml ?>/favicon/manifest.json">
<link rel="mask-icon" href="<?= $this->publicHtml ?>/favicon/safari-pinned-tab.svg" color="#A50045">
<meta name="theme-color" content="#A50045">
<title><?= $this->title; ?></title>
<?php $this->head() ?>
Expand Down Expand Up @@ -58,42 +56,42 @@
</div>
</nav> end of bs4 navbar -->

<nav class="navbar navbar-default">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?= $this->publicHtml; ?>">
<img alt="luya.io-kickstarter" src="<?= $this->publicHtml; ?>/images/logo/0.2x/luya_logo@0.2x.png" height="20px" width="auto">
</a>
</div>
<nav class="navbar navbar-default">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="<?= $this->publicHtml; ?>">
<img alt="luya.io-kickstarter" src="<?= $this->publicHtml; ?>/images/logo/0.2x/luya_logo@0.2x.png" height="20px" width="auto">
</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<?php foreach (Yii::$app->menu->findAll(['depth' => 1, 'container' => 'default']) as $item): /* @var $item \luya\cms\menu\Item */ ?>
<li class="nav-item<?= $item->isActive ? ' active' : '' ?>">
<a class="nav-link" href="<?= $item->link; ?>"><?= $item->title; ?></a>
</li>
<?php endforeach; ?>
</ul>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<?php foreach (Yii::$app->menu->findAll(['depth' => 1, 'container' => 'default']) as $item): /* @var $item \luya\cms\menu\Item */ ?>
<li class="nav-item<?= $item->isActive ? ' active' : '' ?>">
<a class="nav-link" href="<?= $item->link; ?>"><?= $item->title; ?></a>
</li>
<?php endforeach; ?>
</ul>

<?= LangSwitcher::widget([
'listElementOptions' => ['class' => 'nav navbar-nav navbar-right'],
'elementOptions' => ['class' => 'nav-item'],
'linkOptions' => ['class' => 'nav-link'],
'linkLabel' => function ($lang) {
return strtoupper($lang['short_code']);
}
]); ?>
<?= LangSwitcher::widget([
'listElementOptions' => ['class' => 'nav navbar-nav navbar-right'],
'elementOptions' => ['class' => 'nav-item'],
'linkOptions' => ['class' => 'nav-link'],
'linkLabel' => function ($lang) {
return strtoupper($lang['short_code']);
}
]); ?>

</div><!-- /.navbar-collapse -->
</div>
</nav>
</div><!-- /.navbar-collapse -->
</div>
</nav>
</div>
<div class="container">
<nav aria-label="breadcrumb mb-3">
Expand Down