Merge commit '395ef3d6' as 'Themes/Flatly'

Themes/Flatly/.bowerrc

+{
+  "directory": "resources/vendor"
+}
\ No newline at end of file

Themes/Flatly/.gitignore

+.idea/
+/node_modules
+/resources/vendor
\ No newline at end of file

Themes/Flatly/bower.json

+{
+  "name": "demo-theme",
+  "version": "1.0.0",
+  "description": "Demo Theme",
+  "license": "MIT",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "/resources/vendor",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "jquery": ">= 1.9.1",
+    "bootstrap": "~3.3.2",
+    "font-awesome": "~4.3.0",
+    "prism": "~1.5"
+  }
+}

Themes/Flatly/changelog.yml

+url: https://github.com/AsgardCms/Flatly-theme
+versions:
+    "2.0@unreleased":
+        added:
+            - Manual notifications partial, to remove laracasts/flash
+        changed:
+            - Set a fixed version for laravel-elixir
+            - Update gulpfile for laravel-elixir 5.0
+    "1.2.0":
+        changed:
+            - New master account layout for updated AdminLTE theme
+    "1.1.1":
+        changed:
+            - Google analytics code not escaped anymore
+    "1.1.0":
+        added:
+            - Changelog file
+    "1.0.0":
+        changed:
+            - Initial release

Themes/Flatly/composer.json

+{
+  "name": "asgardcms/flatly-theme",
+  "type": "asgard-theme",
+  "description": "An AsgardCMS Flatly bootswatch theme",
+  "keywords": [
+    "asgard-cms"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Nicolas Widart",
+      "email": "info@asgardcms.com",
+      "role": "Developer"
+    }
+  ],
+  "require": {
+    "php": ">=5.4",
+    "composer/installers": "~1.0"
+  },
+  "scripts": {
+    "post-install-cmd": [
+      "php artisan stylist:publish"
+    ],
+    "post-update-cmd": [
+      "php artisan stylist:publish"
+    ]
+  },
+  "extra": {
+    "branch-alias": {
+      "dev-2.0": "2.0.x-dev"
+    }
+  },
+  "minimum-stability": "dev",
+  "prefer-stable": true
+}

Themes/Flatly/elixir.json

+{
+  "srcDir": "Themes/Flatly",
+  "assetsPath": "resources/",
+  "publicPath": "assets/",
+  "cssOutput": "assets/css/",
+  "jsOutput": "assets/js/",
+  "bowerDir": "resources/vendor/"
+}

Themes/Flatly/gulpfile.js

+var gulp = require("gulp");
+var shell = require('gulp-shell');
+var elixir = require('laravel-elixir');
+var themeInfo = require('./theme.json');
+
+var Task = elixir.Task;
+
+elixir.extend('stylistPublish', function() {
+    new Task('stylistPublish', function() {
+        return gulp.src("").pipe(shell("php ../../artisan stylist:publish " + themeInfo.name));
+    });
+});
+/*
+ |--------------------------------------------------------------------------
+ | Elixir Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Elixir provides a clean, fluent API for defining some basic Gulp tasks
+ | for your Laravel application. By default, we are compiling the Sass
+ | file for our application, as well as publishing vendor resources.
+ |
+ */
+
+elixir(function (mix) {
+
+    /**
+     * Compile less
+     */
+    mix.less([
+        "main.less"
+    ], 'assets/css/main.css')
+    .stylistPublish();
+
+    /**
+     * Concat scripts
+     */
+    mix.scripts([
+        '/vendor/jquery/dist/jquery.js',
+        '/vendor/bootstrap/dist/js/bootstrap.min.js',
+        '/vendor/prism/prism.js',
+        '/js/bootswatch.js'
+    ], null, 'resources');
+
+    /**
+     * Copy Bootstrap fonts
+     */
+    mix.copy(
+        'resources/vendor/bootstrap/fonts',
+        'assets/fonts'
+    );
+
+    /**
+     * Copy Fontawesome fonts
+     */
+    mix.copy(
+        'resources/vendor/font-awesome/fonts',
+        'assets/fonts'
+    );
+});

Themes/Flatly/package.json

+{
+  "devDependencies": {
+    "gulp": "^3.8.8",
+    "gulp-shell": "^0.3.0",
+    "laravel-elixir": "^5.0.0"
+  }
+}

Themes/Flatly/readme.md

+# AsgardCMS Flatly theme
+
+## Installation
+
+Execute the following command in your terminal:
+
+``` json
+composer require asgardcms/flatly-theme
+```
+
+You'll find the theme in the `Themes/` directory.

Themes/Flatly/resources/js/bootswatch.js

+!function(){function t(t){var n=t.split(/\n/);n.shift(),n.splice(-1,1);var o=n[0].length-n[0].trim().length,e=new RegExp(" {"+o+"}");return n=n.map(function(t){return t.match(e)&&(t=t.substring(o)),t}),n=n.join("\n")}var n=$("<div id='source-button' class='btn btn-primary btn-xs'>&lt; &gt;</div>").click(function(){var n=$(this).parent().html();n=t(n),$("#source-modal pre").text(n),$("#source-modal").modal()});$('.bs-component [data-toggle="popover"]').popover(),$('.bs-component [data-toggle="tooltip"]').tooltip(),$(".bs-component").hover(function(){$(this).append(n),n.show()},function(){n.hide()})}();
\ No newline at end of file

Themes/Flatly/resources/less/bootswatch.less

+.box-shadow(@size) {
+  box-shadow: @size;
+}
+
+// Body =====================================================================
+
+body {
+  background: @body-bg;
+  padding-top: @navbar-height + 20px;
+}
+
+.group:after {
+  content: "";
+  display: table;
+  clear: both;
+}
+
+// Navbar =====================================================================
+
+.navbar {
+  border-width: 0px;
+
+  &-default {
+
+    .badge {
+      background-color: #fff;
+      color: @navbar-default-bg;
+    }
+  }
+
+  &-inverse {
+
+    .badge {
+      background-color: #fff;
+      color: @navbar-inverse-bg;
+    }
+  }
+
+  &-brand {
+    padding: 18.5px 15px 20.5px;
+  }
+}
+
+// Buttons ====================================================================
+
+.btn:active {
+  .box-shadow(none);
+}
+
+.btn-group.open .dropdown-toggle {
+  .box-shadow(none);
+}
+
+// Typography =================================================================
+
+.text-primary,
+.text-primary:hover {
+  color: @brand-primary;
+}
+
+.text-success,
+.text-success:hover {
+  color: @brand-success;
+}
+
+.text-danger,
+.text-danger:hover {
+  color: @brand-danger;
+}
+
+.text-warning,
+.text-warning:hover {
+  color: @brand-warning;
+}
+
+.text-info,
+.text-info:hover {
+  color: @brand-info;
+}
+
+// Tables =====================================================================
+
+table,
+.table {
+
+  a:not(.btn) {
+    text-decoration: underline;
+  }
+
+  .success,
+  .warning,
+  .danger,
+  .info {
+    color: #fff;
+
+    a {
+      color: #fff;
+    }
+  }
+
+  > thead > tr > th,
+  > tbody > tr > th,
+  > tfoot > tr > th,
+  > thead > tr > td,
+  > tbody > tr > td,
+  > tfoot > tr > td {
+    border: none;
+  }
+
+  &-bordered > thead > tr > th,
+  &-bordered > tbody > tr > th,
+  &-bordered > tfoot > tr > th,
+  &-bordered > thead > tr > td,
+  &-bordered > tbody > tr > td,
+  &-bordered > tfoot > tr > td {
+    border: 1px solid @table-border-color;
+  }
+}
+
+// Forms ======================================================================
+
+.form-control,
+input, {
+  border-width: 2px;
+  .box-shadow(none);
+
+  &:focus {
+    .box-shadow(none);
+  }
+}
+
+.has-warning {
+  .help-block,
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline,
+  .form-control-feedback {
+    color: @brand-warning;
+  }
+
+  .form-control,
+  .form-control:focus {
+    border: 2px solid @brand-warning;
+  }
+
+  .input-group-addon {
+    border-color: @brand-warning;
+  }
+}
+
+.has-error {
+  .help-block,
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline,
+  .form-control-feedback {
+    color: @brand-danger;
+  }
+
+  .form-control,
+  .form-control:focus {
+    border: 2px solid @brand-danger;
+  }
+
+  .input-group-addon {
+    border-color: @brand-danger;
+  }
+}
+
+.has-success {
+  .help-block,
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline,
+  .form-control-feedback {
+    color: @brand-success;
+  }
+
+  .form-control,
+  .form-control:focus {
+    border: 2px solid @brand-success;
+  }
+
+  .input-group-addon {
+    border-color: @brand-success;
+  }
+}
+
+// Navs =======================================================================
+
+.nav {
+  .open > a,
+  .open > a:hover,
+  .open > a:focus {
+    border-color: transparent;
+  }
+}
+
+.pager {
+  a,
+  a:hover {
+    color: #fff;
+  }
+
+  .disabled {
+    &>a,
+    &>a:hover,
+    &>a:focus,
+    &>span {
+      background-color: @pagination-disabled-bg;
+    }
+  }
+}
+
+// Indicators =================================================================
+
+.close {
+  color: #fff;
+  text-decoration: none;
+  opacity: 0.4;
+
+  &:hover,
+  &:focus {
+    color: #fff;
+    opacity: 1;
+  }
+}
+
+.alert {
+
+  .alert-link {
+    color: #fff;
+    text-decoration: underline;
+  }
+}
+
+// Progress bars ==============================================================
+
+.progress {
+  height: 10px;
+  .box-shadow(none);
+  .progress-bar {
+    font-size: 10px;
+    line-height: 10px;
+  }
+}
+
+// Containers =================================================================
+
+.well {
+  .box-shadow(none);
+}
+
+.panel {
+  &-default {
+    .close {
+      color: @text-color;
+    }
+  }
+}
+
+.modal {
+  .close {
+    color: @text-color;
+  }
+}
+
+.popover {
+  color: @text-color;
+}
+
+// Footer =======================================================================
+footer {
+  border-top: 1px solid #fff;
+  margin-top: 5rem;
+}
+
+footer .dark {
+  background: @brand-primary;
+  color: #fff;
+  padding: .5em 0 1em;
+}
+
+/* Bottom footer */
+.bottom-footer {
+  margin-top: 10px;
+}
+footer .bottom-list li {
+  padding-right: 20px;
+  float: left;
+}
+
+footer li.active a {
+  color: @brand-primary;
+}
\ No newline at end of file

Themes/Flatly/resources/less/main.less

+@import url("//fonts.googleapis.com/css?family=Lato:400,700,400italic");
+
+@import "../vendor/bootstrap/less/bootstrap.less";
+@import "../vendor/font-awesome/less/font-awesome.less";
+@import (inline) "../vendor/prism/themes/prism.css";
+@import "variables.less";
+@import "bootswatch";
+
+/* Homepage */
+body {
+  line-height: 2em;
+  margin: 0 0 22px;
+  font-size: 1.5em;
+}
+.rounded {
+  border-radius: 100px;
+}
+
+img.pull-top {
+  margin-top: 40px;
+}
+
+.jumbotron {
+  background: #ffffff;
+  padding: 20px 30px;
+}
+
+ul.no-padding {
+  padding-left: 0px;
+}
+
+/* Posts page */
+ul {
+  list-style: none;
+  li {
+    .date {
+      float: left;
+      margin-right: 1rem;
+      line-height: 3rem;
+      color: @gray-light;
+      width: 10rem;
+      text-align: right;
+    }
+  }
+}
+.date {
+  color: @gray-light;
+  font-size: 0.9em;
+}
+ul.bullet {
+  li {
+    list-style: disc;
+  }
+}
+
+.container pre[class*='language-'] > code[data-language] {
+  overflow: auto;
+}
+
+.container p {
+  line-height: 2em;
+  margin: 0 0 22px;
+  font-size: 1.3em;
+}
+
+
+blockquote {
+  font-style: italic;
+  border-left: 2px solid @brand-primary;
+}
+
+/* Projects page */
+.timeAgo {
+  display: block;
+  color: @gray-light;
+  font-size: .8em;
+}
+.activity {
+  padding-left: 0;
+  .actorAvatar {
+    margin-right: 10px;
+  }
+  li {
+    line-height: 20px;
+    margin-bottom: 15px;
+    font-size: 1.3rem;
+  }
+}
+
+/* Book library */
+
+.book-list {
+  padding-left: 0px;
+  .author {
+    color: @gray-light;
+    font-size: 1.1rem;
+  }
+}
+.book-cover {
+  width: 101px;
+  margin-right: 15px;
+}
+
+p.small {
+  font-size: 1.1em;
+}

Themes/Flatly/theme.json

+{
+  "name": "Flatly",
+  "description": "This is the Flatly theme",
+  "type": "frontend",
+  "version": "2.0.0"
+}

Themes/Flatly/views/blog/index.blade.php

+@extends('layouts.master')
+
+@section('title')
+    Blog posts | @parent
+@stop
+
+@section('content')
+    <div class="row">
+        <div class="col-md-12">
+            <h1>Blog</h1>
+            <?php if (isset($posts)): ?>
+            <ul>
+                <?php foreach($posts as $post): ?>
+                    <li>
+                        <span class="date">{{ $post->created_at->format('d-m-Y') }}</span>
+                        <h3><a href="{{ URL::route($currentLocale . '.blog.slug', [$post->slug]) }}">{{ $post->title }}</a></h3>
+                    </li>
+                    <div class="clearfix"></div>
+                <?php endforeach; ?>
+            </ul>
+            <?php endif; ?>
+        </div>
+    </div>
+@stop

Themes/Flatly/views/blog/show.blade.php

+@extends('layouts.master')
+
+@section('title')
+    {{ $post->title }} | @parent
+@stop
+
+@section('content')
+    <div class="row">
+        <div class="col-lg-12">
+        <span class="linkBack">
+            <a href="{{ URL::route($currentLocale . '.blog') }}"><i class="glyphicon glyphicon-chevron-left"></i> Back to post list</a>
+        </span>
+        <h1>{{ $post->title }}</h1>
+        <span class="date">{{ $post->created_at->format('d-m-Y') }}</span>
+
+        {!! $post->content !!}
+
+            <p>
+                <?php if ($previous = $post->present()->previous): ?>
+                    <a href="{{ route(locale() . '.blog.slug', [$previous->slug]) }}">Previous</a>
+                <?php endif; ?>
+                <?php if ($next = $post->present()->next): ?>
+                    <a href="{{ route(locale() . '.blog.slug', [$next->slug]) }}">Next</a>
+                <?php endif; ?>
+            </p>
+        </div>
+    </div>
+@stop

Themes/Flatly/views/default.blade.php

+@extends('layouts.master')
+
+@section('title')
+    {{ $page->title }} | @parent
+@stop
+@section('meta')
+    <meta name="title" content="{{ $page->meta_title}}" />
+    <meta name="description" content="{{ $page->meta_description }}" />
+@stop
+
+@section('content')
+    <div class="row">
+        <h1>{{ $page->title }}</h1>
+        {!! $page->body !!}
+    </div>
+@stop

Themes/Flatly/views/home.blade.php

+@extends('layouts.master')
+
+@section('title')
+    {{ $page->title }} | @parent
+@stop
+@section('meta')
+    <meta name="title" content="{{ $page->meta_title}}" />
+    <meta name="description" content="{{ $page->meta_description }}" />
+@stop
+
+@section('content')
+    <div class="row">
+        <h1>{{ $page->title }}</h1>
+        {!! $page->body !!}
+    </div>
+@stop

Themes/Flatly/views/index.blade.php

+@extends('layouts.master')
+
+@section('title')
+Projects | @parent
+@stop
+
+@section('content')
+<div class="row">
+    <h1>Hello World!</h1>
+</div>
+@stop

Themes/Flatly/views/layouts/account.blade.php

+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>
+        @section('title')
+            {{ Setting::get('core::site-name') }}
+        @show
+    </title>
+    <meta content='width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no' name='viewport'>
+    <link rel="stylesheet" href="{{ asset('themes/adminlte/vendor/bootstrap/dist/css/bootstrap.min.css') }}"/>
+    <link rel="stylesheet" href="{{ asset('themes/adminlte/vendor/font-awesome/css/font-awesome.min.css') }}"/>
+    <link rel="stylesheet" href="{{ asset('themes/adminlte/css/vendor/ionicons.min.css') }}"/>
+    <link rel="stylesheet" href="{{ asset('themes/adminlte/css/vendor/alertify/alertify.core.css') }}"/>
+    <link rel="stylesheet" href="{{ asset('themes/adminlte/vendor/admin-lte/dist/css/AdminLTE.min.css') }}"/>
+    <link rel="stylesheet" href="{{ asset('themes/adminlte/vendor/admin-lte/plugins/iCheck/square/blue.css') }}"/>
+
+    <script src="{{ asset('themes/adminlte/vendor/jquery/jquery.min.js') }}"></script>
+
+    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
+    <![endif]-->
+</head>
+<body class="hold-transition login-page">
+
+<div class="login-box">
+    @yield('content')
+</div>
+
+<!-- Bootstrap -->
+<script src="{{ asset('themes/adminlte/vendor/bootstrap/dist/js/bootstrap.min.js') }}"></script>
+<script src="{{ asset('themes/adminlte/vendor/iCheck/icheck.min.js') }}"></script>
+<script src="{{ asset('themes/adminlte/js/vendor/alertify/alertify.js') }}"></script>
+<script>
+    $(function () {
+        $('input').iCheck({
+            checkboxClass: 'icheckbox_square-blue',
+            radioClass: 'iradio_square-blue',
+            increaseArea: '20%' // optional
+        });
+    });
+</script>
+</body>
+</html>

Themes/Flatly/views/layouts/master.blade.php

+<!DOCTYPE html>
+<html>
+<head lang="{{ LaravelLocalization::setLocale() }}">
+    <meta charset="UTF-8">
+    @section('meta')
+        <meta name="description" content="@setting('core::site-description')" />
+    @show
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>
+        @section('title')@setting('core::site-name')@show
+    </title>
+    <link rel="shortcut icon" href="{{ Theme::url('favicon.ico') }}">
+
+    {!! Theme::style('css/main.css') !!}
+</head>
+<body>
+
+@include('partials.navigation')
+
+<div class="container">
+    @yield('content')
+</div>
+@include('partials.footer')
+
+{!! Theme::script('js/all.js') !!}
+@yield('scripts')
+
+<?php if (Setting::has('core::analytics-script')): ?>
+    {!! Setting::get('core::analytics-script') !!}
+<?php endif; ?>
+</body>
+</html>

Themes/Flatly/views/partials/footer.blade.php

+<footer class="container">
+    <div class="row">
+        <div class="col-md-12">
+            footer
+        </div>
+    </div>
+</footer>

Themes/Flatly/views/partials/navigation.blade.php

+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-responsive-collapse">
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="{{ URL::to('/') }}">@setting('core::site-name')</a>
+        </div>
+        <div class="navbar-collapse collapse navbar-responsive-collapse">
+            @menu('main')
+        </div>
+    </div>
+</nav>

Themes/Flatly/views/partials/notifications.blade.php

+@if (Session::has('success'))
+    <div class="alert alert-success fade in alert-dismissable">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+        {{ Session::get('success') }}
+    </div>
+@endif
+
+@if (Session::has('error'))
+    <div class="alert alert-danger fade in alert-dismissable">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+        {{ Session::get('error') }}
+    </div>
+@endif
+
+@if (Session::has('warning'))
+    <div class="alert alert-warning fade in alert-dismissable">
+        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
+        {{ Session::get('warning') }}
+    </div>
+@endif