Merge branch 'release/0.3.9'

lnds · Aug 21, 2017 · a388a63 · a388a63
2 parents 9fbd056 + 4232576
commit a388a63
Show file tree

Hide file tree

Showing 168 changed files with 102 additions and 36,928 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,16 @@
 
 ## [Unreleased]
 
+## 0.3.9 -2017-08-21
+
+### Fixed
+- menu login 
+
+### Changed
+- uses webjars jquery
+- uses webjars font-awesome
+- refactor formatElapsed in PostAux
+
 ## 0.3.8 - 2017-08-20
 
 ### Fixed

diff --git a/app/tools/PostAux.scala b/app/tools/PostAux.scala
@@ -85,10 +85,6 @@ object PostAux  {
     u.getHost
   }
 
-
-
-
-
   def formatElapsed(date:Option[LocalDateTime])(implicit messages:Messages): String = {
 
     date match {
@@ -97,53 +93,84 @@ object PostAux  {
         val now = new LocalDateTime()
         val period = new Period(base, now)
         namePeriod(period)
-
     }
   }
 
   private[this] def namePeriod(period: Period)(implicit messages:Messages) : String = {
+    nameYears(period)
+  }
+
+  private[this] def nameYears(period: Period)(implicit messages:Messages) : String = {
     lazy val year = Messages("dates.year")
     lazy val years = Messages("dates.years")
+    period.getYears match {
+      case y if y > 1 => s"$y $years"
+      case 1 => s"1 $year"
+      case _ => nameMonths(period)
+    }
+  }
+
+  private[this] def nameMonths(period: Period)(implicit messages:Messages) : String = {
     lazy val month = Messages("dates.month")
     lazy val months = Messages("dates.months")
+    period.getMonths match {
+      case m if m > 1 => s"$m $months"
+      case 1 => s"1 $month"
+      case _ => nameWeeks(period)
+    }
+  }
+
+  private[this] def nameWeeks(period: Period)(implicit messages:Messages) : String = {
     lazy val week = Messages("dates.week")
     lazy val weeks = Messages("dates.weeks")
+    period.getWeeks match {
+      case w if w > 1 => s"$w $weeks"
+      case 1 => s"1 $week"
+      case _ => nameDays(period)
+    }
+  }
+
+  private[this] def nameDays(period: Period)(implicit messages:Messages) : String = {
     lazy val day = Messages("dates.day")
     lazy val days = Messages("dates.days")
+    period.getDays match {
+      case d if d > 1 => s"$d $days"
+      case 1 =>  s"1 $day"
+      case _ => nameHours(period)
+    }
+  }
+
+
+  private[this] def nameHours(period: Period)(implicit messages:Messages) : String = {
     lazy val hour = Messages("dates.hour")
     lazy val hours = Messages("dates.hours")
+    period.getHours match {
+      case h if h > 1 =>  s"$h $hours"
+      case 1 =>  s"1 $hour"
+      case _ => nameMinutes(period)
+    }
+  }
+
+
+  private[this] def nameMinutes(period: Period)(implicit messages:Messages) : String = {
     lazy val minute = Messages("dates.minute")
     lazy val minutes = Messages("dates.minutes")
+    period.getMinutes match {
+      case m if m > 1 =>  s"$m $minutes"
+      case 1 => s"1 $minute"
+      case _ => nameSeconds(period)
+    }
+  }
+
+  private[this] def nameSeconds(period: Period)(implicit messages:Messages) : String = {
     lazy val second = Messages("dates.second")
     lazy val seconds = Messages("dates.seconds")
-    if (period.getYears > 1)
-      s"${period.getYears} $years"
-    else if (period.getYears == 1)
-      s"${period.getYears} $year"
-    else if (period.getMonths > 1)
-      s"${period.getMonths} $months"
-    else if (period.getMonths == 1)
-      s"${period.getMonths} $month"
-    else if (period.getWeeks > 1)
-      s"${period.getWeeks} $weeks"
-    else if (period.getWeeks == 1)
-      s"${period.getWeeks} $week"
-    else if (period.getDays > 1)
-      s"${period.getDays} $days"
-    else if (period.getDays == 1)
-      s"${period.getDays} $day"
-    else if (period.getHours > 1)
-      s"${period.getHours} $hours"
-    else if (period.getHours == 1)
-      s"${period.getHours} $hour"
-    else if (period.getMinutes > 1)
-      s"${period.getMinutes} $minutes"
-    else if (period.getMinutes == 1)
-      s"${period.getMinutes} $minute"
-    else if (period.getSeconds > 1)
-      s"${period.getSeconds} $seconds"
-    else
-      s"${period.getSeconds} $second"
+    period.getSeconds match {
+      case 1 => s"${period.getSeconds} $second"
+      case s => s"$s $seconds"
+    }
   }
 
+
+
 }
diff --git a/app/views/blogs_menu.scala.html b/app/views/blogs_menu.scala.html
@@ -21,23 +21,20 @@
                 <li><a href="@routes.PostsController.drafts(blog.alias)"><i class="fa fa-edit"></i>&nbsp;  @Messages("menu.drafts")</a></li>
             }
         }
-        <li><hr/></li>
-        <li><a href="@routes.PostsController.index(blog.alias)"><i class="fa fa-lock"></i>&nbsp; @Messages("menu.login")</a></li>
-    } else {
-        <li><hr/></li>
-        <li><a href="@routes.AuthController.login"><i class="fa fa-lock"></i>&nbsp; @Messages("menu.login")</a></li>
     }
 
 }.getOrElse {
     <li><a href="@routes.Application.index"><i class="fa fa-home"></i>&nbsp;  @Messages("menu.home")</a></li>
     <li><a href="@routes.BlogsGuestController.index()"><i class="glyphicon glyphicon-th"></i>&nbsp;  @Messages("menu.blogs")</a></li>
-    <li></li>
-    <li><a href="@routes.AuthController.login()"><i class="fa fa-lock"></i>&nbsp; @Messages("menu.login")</a></li>
+
 }
 @user match {
-case Guest => {}
-case _ => {
-<li><a href="@routes.AuthorsController.changePassword"><i class="fa fa-key"></i>&nbsp;  @Messages("menu.change_password")</a></li>
-<li><a href="@routes.AuthController.logout"><i class="fa fa-power-off"></i>&nbsp;  @Messages("menu.logout")</a></li>
-}
+    case Guest => {
+        <li></li>
+        <li><a href="@routes.AuthController.login()"><i class="fa fa-lock"></i>&nbsp; @Messages("menu.login")</a></li>
+    }
+    case _ => {
+        <li><a href="@routes.AuthorsController.changePassword"><i class="fa fa-key"></i>&nbsp;  @Messages("menu.change_password")</a></li>
+        <li><a href="@routes.AuthController.logout"><i class="fa fa-power-off"></i>&nbsp;  @Messages("menu.logout")</a></li>
+    }
 }
diff --git a/app/views/change_password.scala.html b/app/views/change_password.scala.html
@@ -6,8 +6,8 @@
     <title>@Messages("Login")</title>
     <link rel='stylesheet' href='@routes.WebJarAssets.at(webJarAssets.locate("css/bootstrap.min.css"))'>
     <link rel='stylesheet' href='@routes.Assets.versioned("css/signin.css")'>
-    <script src="@routes.Assets.versioned("js/jquery-1.10.2.js")" ></script>
-    <script src="@routes.Assets.versioned("js/bootstrap.min.js")"></script>
+    <script src="@routes.WebJarAssets.at("js/jquery.min.js")" ></script>
+    <script src="@routes.WebJarAssets.at("js/bootstrap.min.js")"></script>
 </head>
 <body>
 

diff --git a/app/views/index.scala.html b/app/views/index.scala.html
@@ -3,7 +3,16 @@
 <li><a href="@routes.Application.index()"><i class="fa fa-home"></i>&nbsp;  @Messages("menu.home")</a></li>
 <li><a href="@routes.BlogsGuestController.index()"><i class="glyphicon glyphicon-th"></i>&nbsp;  @Messages("menu.blogs")</a></li>
 <li></li>
-<li><a href="@routes.AuthController.login()"><i class="fa fa-lock"></i>&nbsp; @Messages("menu.login")</a></li>
+    @user match {
+        case Guest => {
+            <li></li>
+            <li><a href="@routes.AuthController.login()"><i class="fa fa-lock"></i>&nbsp; @Messages("menu.login")</a></li>
+        }
+        case _ => {
+            <li><a href="@routes.AuthorsController.changePassword"><i class="fa fa-key"></i>&nbsp;  @Messages("menu.change_password")</a></li>
+            <li><a href="@routes.AuthController.logout"><i class="fa fa-power-off"></i>&nbsp;  @Messages("menu.logout")</a></li>
+        }
+    }
 }{
 }{
 <div class="jumbotron cover-image" data-load-image="@routes.Assets.versioned("images/header.jpg")" >

diff --git a/app/views/login.scala.html b/app/views/login.scala.html
@@ -6,8 +6,8 @@
     <title>@Messages("Login")</title>
     <link rel='stylesheet' href='@routes.WebJarAssets.at(webJarAssets.locate("css/bootstrap.min.css"))'>
     <link rel='stylesheet' href='@routes.Assets.versioned("css/signin.css")'>
-    <script src="@routes.Assets.versioned("bower_components/jquery/dist/jquery.min.js")" ></script>
-    <script src='@routes.WebJarAssets.at(webJarAssets.locate("js/bootstrap.min.js"))'></script>
+    <script src='@routes.WebJarAssets.at(webJarAssets.locate("jquery.min.js"))' ></script>
+    <script src='@routes.WebJarAssets.at(webJarAssets.locate("bootstrap.min.js"))'></script>
 </head>
 <body>
 

diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -67,16 +67,16 @@
     <!-- end fonts -->
     <link rel='stylesheet' href='@routes.WebJarAssets.at(webJarAssets.locate("css/bootstrap.min.css"))'>
     <link rel='shortcut icon' type='image/png' href='@routes.Assets.versioned("images/favicon.png")'>
-    <link rel='stylesheet' href='@routes.Assets.versioned("bower_components/font-awesome/css/font-awesome.min.css")'>
+    <link rel='stylesheet' href='@routes.WebJarAssets.at(webJarAssets.locate("font-awesome.min.css"))'>
     <link rel="stylesheet" href='@routes.Assets.versioned("bower_components/medium-editor-insert-plugin/dist/css/medium-editor-insert-plugin.min.css")' >
     <link rel="stylesheet" href='@routes.Assets.versioned("css/dropzone.css")'>
     <link rel='stylesheet' href='@routes.Assets.versioned("css/prosa-main.css")'>
 
     @blogOpt.map { blog =>
     <link href="@tools.PostAux.atomUrl(blog.url.getOrElse(""))" rel="alternate" type="application/atom.xml" />
     }
-    <script src="@routes.Assets.versioned("bower_components/jquery/dist/jquery.min.js")" ></script>
-    <script src='@routes.WebJarAssets.at(webJarAssets.locate("js/bootstrap.min.js"))'></script>
+    <script src='@routes.WebJarAssets.at(webJarAssets.locate("jquery.min.js"))'></script>
+    <script src='@routes.WebJarAssets.at(webJarAssets.locate("bootstrap.min.js"))'></script>
     <script src="@routes.Assets.versioned("js/prosa.js")"> </script>
     @user match {
         case Guest => {}

diff --git a/app/views/main_editor.scala.html b/app/views/main_editor.scala.html
@@ -10,7 +10,7 @@
 
     <link rel='stylesheet' href='@routes.WebJarAssets.at(webJarAssets.locate("css/bootstrap.min.css"))'>
     <link rel='shortcut icon' type='image/png' href='@routes.Assets.versioned("images/favicon.png")'>
-    <link rel='stylesheet' href='@routes.Assets.versioned("bower_components/font-awesome/css/font-awesome.min.css")'>
+    <link rel='stylesheet' href='@routes.WebJarAssets.at(webJarAssets.locate("font-awesome.min.css"))'>
     <link rel="stylesheet" href='@routes.Assets.versioned("css/dropzone.css")'>
 
     <link href='https://fonts.googleapis.com/css?family=Raleway' rel='stylesheet' type='text/css'>
@@ -79,15 +79,15 @@
 
     <!-- scripts -->
 
-    <script src="@routes.Assets.versioned("bower_components/jquery/dist/jquery.min.js")" ></script>
+    <script src='@routes.WebJarAssets.at(webJarAssets.locate("jquery.min.js"))'></script>
     <script src="@routes.Assets.versioned("bower_components/blueimp-file-upload/js/vendor/jquery.ui.widget.js")"></script>
     <script src="@routes.Assets.versioned("bower_components/blueimp-file-upload/js/jquery.iframe-transport.js")"></script>
     <script src="@routes.Assets.versioned("bower_components/blueimp-file-upload/js/jquery.fileupload.js")"></script>
     <script src="@routes.Assets.versioned("bower_components/medium-editor/dist/js/medium-editor.min.js")"></script>
     <script src="@routes.Assets.versioned("bower_components/handlebars/handlebars.runtime.min.js")"></script>
     <script src="@routes.Assets.versioned("bower_components/jquery-sortable/source/js/jquery-sortable-min.js")"></script>
     <script src="@routes.Assets.versioned("bower_components/medium-editor-insert-plugin/dist/js/medium-editor-insert-plugin.min.js")"></script>
-    <script src='@routes.WebJarAssets.at(webJarAssets.locate("js/bootstrap.min.js"))'></script>
+    <script src='@routes.WebJarAssets.at(webJarAssets.locate("bootstrap.min.js"))'></script>
     <script src="@routes.Assets.versioned("js/prosa.js")"> </script>
 <script>
     $body = document.body;

diff --git a/build.sbt b/build.sbt
@@ -4,7 +4,7 @@ name := """prosa-blog-server"""
 
 val conf = ConfigFactory.parseFile(new File("conf/application.conf")).resolve()
 
-version := "0.3.8"
+version := "0.3.9"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala).enablePlugins(SbtWeb).enablePlugins(BuildInfoPlugin).
   settings(
@@ -60,7 +60,9 @@ libraryDependencies ++= Seq(
   evolutions,
   specs2 % Test,
   "org.webjars" %% "webjars-play" % "2.5.0-4",
+  "org.webjars" % "jquery" % "3.2.1",
   "org.webjars" % "bootstrap" % "3.3.7",
+  "org.webjars" % "font-awesome" % "4.7.0",
   "org.scalatestplus.play" %% "scalatestplus-play" % "1.5.1" % Test,
   "com.typesafe.play" %% "play-mailer" % "3.0.1",
   "org.mindrot" % "jbcrypt" % "0.3m",

diff --git a/public/bower_components/font-awesome/.bower.json b/public/bower_components/font-awesome/.bower.json
diff --git a/public/bower_components/font-awesome/.gitignore b/public/bower_components/font-awesome/.gitignore
diff --git a/public/bower_components/font-awesome/.npmignore b/public/bower_components/font-awesome/.npmignore