[Notice] Announcing the End of Demo Server [Read me]
yona-projects / yona star
Sangcheol Hwang 2012-11-24
remove unimplemented link
@fcfd390c6431ae2a0c92ff937f2a17c659458123
3f43df3
fcfd390
app/views/navbar.scala.html
--- app/views/navbar.scala.html
+++ app/views/navbar.scala.html
@@ -33,10 +33,12 @@
 
         </div>
 
         <div class="gnb-knob right"><i class="ico gnb-right orange"></i></div>
 
     </div>
 
+     @if(session.contains("userId") && session.get("userId").equals("1")){
 
     <div class="sub-menu-sp"></div>
 
         <div class="side-menu-wrap">
 
         <ul class="side-menus ico bg-side-menu unstyled">
 
-            <li class="side-menu"><a href="@routes.SiteApp.setting()"><i class="ico ico-setting"></i></a></li>
 
+            <li class="side-menu"><a href="@routes.SiteApp.userList(1,session.get("loginId"))"><i class="ico ico-setting"></i></a></li>
 
         </ul>
 
     </div>
 
+    }
 
 </header>
3f43df3
fcfd390
app/views/site/sidebar.scala.html
--- app/views/site/sidebar.scala.html
+++ app/views/site/sidebar.scala.html
@@ -11,18 +11,18 @@
 
 <div class="well" style="padding: 8px 0;">
 
     <ul class="nav nav-list">
 
         <li class="nav-header">@Messages("site.sidebar")</li>
 
-        <li class="@isActiveMenu(routes.SiteApp.setting())">
 
+        <!-- li class="@isActiveMenu(routes.SiteApp.setting())">
 
             <a href="@routes.SiteApp.setting()"><i class="icon-cog"></i>@Messages("site.sidebar.setting")</a>
 
-        </li>
 
+        </li-->
 
         <li class="@isActiveMenu(routes.SiteApp.userList())">
 
             <a href="@routes.SiteApp.userList()"><i class="icon-user"></i>@Messages("site.sidebar.userList")</a>
 
         </li>
 
         <li class="@isActiveMenu(routes.SiteApp.projectList())">
 
             <a href="@routes.SiteApp.projectList()"><i class="icon-folder-open"></i>@Messages("site.sidebar.projectList")</a>
 
         </li>
 
-        <li class="@isActiveMenu(routes.SiteApp.softwareMap())">
 
+        <!-- li class="@isActiveMenu(routes.SiteApp.softwareMap())">
 
             <a href="@routes.SiteApp.softwareMap()"><i class="icon-road"></i>@Messages("site.sidebar.softwareMap")</a>
 
-        </li>
 
+        </li-->
 
         <li class="divider"></li>
 
         <li class="@isActiveMenu(routes.Application.index())">
 
             <a href="@routes.SiteApp.writeMail()"><i class="icon-envelope"></i>@Messages("site.sidebar.mailSend")</a>
3f43df3
fcfd390
project/Build.scala
--- project/Build.scala
+++ project/Build.scala
@@ -32,6 +32,9 @@
 
       "commons-lang" % "commons-lang" % "2.6",
 
       "org.apache.tika" % "tika-core" % "1.2",
 
       "commons-io" % "commons-io" % "2.4"
 
+//      "org.jacoco" % "org.jacoco.core" % "0.6.1-SNAPSHOT",
 
+//      "org.jacoco" % "org.jacoco.report" % "0.6.1-SNAPSHOT"
 
+      
     )
 
 
     val projectSettings = Play2WarPlugin.play2WarSettings ++ Seq(
@@ -41,9 +44,12 @@
 
       resolvers += "scm-manager release repository" at "http://maven.scm-manager.org/nexus/content/groups/public",
 
       templatesImport += "models.enumeration._",
 
       lessEntryPoints <<= baseDirectory(_ / "app" / "assets" / "stylesheets" ** "*.less"),
 
+//      jacoco.settings:_*,
 
       Play2WarKeys.servletVersion := "3.0"
 
       // Or Play2WarKeys.servletVersion := "2.5"
 
     )
 
 
-    val main = PlayProject(appName, appVersion, appDependencies, mainLang = JAVA).settings(projectSettings: _*)
 
+    val main = PlayProject(appName, appVersion, appDependencies, mainLang = JAVA).settings(projectSettings: _*
 
+//        parallelExecution in jacoco.Config := false
 
+    )
 
 }
3f43df3
fcfd390
project/plugins.sbt
--- project/plugins.sbt
+++ project/plugins.sbt
@@ -11,3 +11,4 @@
 
 addSbtPlugin("play" % "sbt-plugin" % "2.0.4")
 
 
 addSbtPlugin("com.github.play2war" % "play2-war-plugin" % "0.7.4")
 
+
Add a comment
List