Fixed some lib paths and seperated out duplicated notifications

author Dan Brown <redacted>

Mon, 30 Nov 2015 22:23:48 +0000 (22:23 +0000)

committer Dan Brown <redacted>

Mon, 30 Nov 2015 22:23:48 +0000 (22:23 +0000)
author Dan Brown <redacted>
Mon, 30 Nov 2015 22:23:48 +0000 (22:23 +0000)
committer Dan Brown <redacted>
Mon, 30 Nov 2015 22:23:48 +0000 (22:23 +0000)
diff --git a/resources/views/base.blade.php b/resources/views/base.blade.php

index ca73551b2abfa1f5ea412904e8d30c84f7437c63..be67109c56e0dc16994dd384d18a3aa58e44df02 100644 (file)
--- a/resources/views/base.blade.php
+++ b/resources/views/base.blade.php
@@ -3,7 +3,7 @@
  <head>
      <title>BookStack</title>
  
  <head>
      <title>BookStack</title>
  
-    <!-- Meta-->
+    <!-- Meta -->
      <meta name="viewport" content="width=device-width">
      <meta name="token" content="{{ csrf_token() }}">
      <meta charset="utf-8">
      <meta name="viewport" content="width=device-width">
      <meta name="token" content="{{ csrf_token() }}">
      <meta charset="utf-8">
@@ -21,17 +21,7 @@
  </head>
  <body class="@yield('body-class')" id="app">
  
  </head>
  <body class="@yield('body-class')" id="app">
  
-    @if(Session::has('success'))
-        <div class="notification anim pos">
-            <i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
-        </div>
-    @endif
-
-    @if(Session::has('error'))
-        <div class="notification anim neg stopped">
-            <i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
-        </div>
-    @endif
+    @include('partials/notifications')
  
      <header id="header">
          <div class="container">
  
      <header id="header">
          <div class="container">
diff --git a/resources/views/partials/notifications.blade.php b/resources/views/partials/notifications.blade.php

new file mode 100644 (file)

index 0000000..6bb00e2
--- /dev/null
+++ b/resources/views/partials/notifications.blade.php
@@ -0,0 +1,11 @@
+@if(Session::has('success'))
+    <div class="notification anim pos">
+        <i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
+    </div>
+@endif
+
+@if(Session::has('error'))
+    <div class="notification anim neg stopped">
+        <i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
+    </div>
+@endif
+\ No newline at end of file
diff --git a/resources/views/public.blade.php b/resources/views/public.blade.php

index ae087cee994b07c046469cc41df322905efa9956..7145b4fbee5ed133b8c52dc5d5203d78a077ff2d 100644 (file)
--- a/resources/views/public.blade.php
+++ b/resources/views/public.blade.php
@@ -2,27 +2,24 @@
  <html>
  <head>
      <title>BookStack</title>
  <html>
  <head>
      <title>BookStack</title>
+
+    <!-- Meta -->
      <meta name="viewport" content="width=device-width">
      <meta name="viewport" content="width=device-width">
+    <meta charset="utf-8">
+
+    <!-- Styles and Fonts -->
      <link rel="stylesheet" href="{{ elixir('css/styles.css') }}">
      <link rel="stylesheet" href="{{ elixir('css/styles.css') }}">
+    <link rel="stylesheet" media="print" href="{{ elixir('css/print-styles.css') }}">
      <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
      <link href='//fonts.googleapis.com/css?family=Roboto:400,400italic,500,500italic,700,700italic,300italic,100,300' rel='stylesheet' type='text/css'>
-    <link rel="stylesheet" href="/bower/material-design-iconic-font/dist/css/material-design-iconic-font.min.css">
+    <link rel="stylesheet" href="/libs/material-design-iconic-font/css/material-design-iconic-font.min.css">
  
      <!-- Scripts -->
      <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
  
      <!-- Scripts -->
      <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
+
  </head>
  <body class="@yield('body-class')" id="app">
  
  </head>
  <body class="@yield('body-class')" id="app">
  
-@if(Session::has('success'))
-    <div class="notification anim pos">
-        <i class="zmdi zmdi-mood"></i> <span>{{ Session::get('success') }}</span>
-    </div>
-@endif
-
-@if(Session::has('error'))
-    <div class="notification anim neg stopped">
-        <i class="zmdi zmdi-alert-circle"></i> <span>{{ Session::get('error') }}</span>
-    </div>
-@endif
+@include('partials/notifications')
  
  <header id="header">
      <div class="container">
  
  <header id="header">
      <div class="container">
author	Dan Brown <redacted>
	Mon, 30 Nov 2015 22:23:48 +0000 (22:23 +0000)
committer	Dan Brown <redacted>
	Mon, 30 Nov 2015 22:23:48 +0000 (22:23 +0000)
resources/views/base.blade.php		patch \| blob \| history
resources/views/partials/notifications.blade.php	[new file with mode: 0644]	patch \| blob
resources/views/public.blade.php		patch \| blob \| history