pyc-website

commit bb8ef519e939d49e0093f06de35be1e62f84c209
parent 550a233f6b5ac52bdf90dcf5697c59a025d65a9b
Author: Jul <jul@9o.is>
Date:   Tue, 15 Apr 2014 17:47:19 -0400

nguirouter: removed controller and added more configurable options -> html5mode, ignoreUiRouterGroup

Diffstat:
M
src/main/scala/com/pyd/config/Site.scala
 | 
22
+++++++++++-----------
M
src/main/scala/com/pyd/lib/NgUIRouter.scala
 | 
20
++++++++++++++++----

2 files changed, 27 insertions(+), 15 deletions(-)
diff --git a/src/main/scala/com/pyd/config/Site.scala b/src/main/scala/com/pyd/config/Site.scala
@@ -31,13 +31,13 @@ object Site extends Locs {
   val domain = "pydcoin.com"
 
   // locations (for top group)
-  val home = MenuLoc(Menu.i("Bitcoin ATM Services") / "index" >> TopBarGroup >> UiRouterGroup)
-  val locations = MenuLoc(Menu.i("ATM Locations") / "locations" >> TopBarGroup >> SiteMapGroup >> UiRouterGroup >> UiRouterController("NearAtmNotifyCtrl"))
-  val whatsBitcoin = MenuLoc(Menu.i("What Is Bitcoin") / "what-is-bitcoin" >> SiteMapGroup >> UiRouterGroup)
-  val about = MenuLoc(Menu.i("About Us") / "about" >> TopBarGroup >> SiteMapGroup >> UiRouterGroup)
+  val home = MenuLoc(Menu.i("Bitcoin ATM Services") / "index" >> TopBarGroup)
+  val locations = MenuLoc(Menu.i("ATM Locations") / "locations" >> TopBarGroup >> SiteMapGroup)
+  val whatsBitcoin = MenuLoc(Menu.i("What Is Bitcoin") / "what-is-bitcoin" >> SiteMapGroup)
+  val about = MenuLoc(Menu.i("About Us") / "about" >> TopBarGroup >> SiteMapGroup)
   val blog = MenuLoc(Menu.i("Blog") / "blog" >> TopBarGroup >> RedirectBlog >> SiteMapGroup)
-  val faqs = MenuLoc(Menu.i("FAQs") / "faqs" >> TopBarGroup >> SiteMapGroup >> UiRouterGroup)
-  val atmHowTo = MenuLoc(Menu.i("How To Use ATM") / "how-to-use-atm" >> SiteMapGroup >> UiRouterGroup)
+  val faqs = MenuLoc(Menu.i("FAQs") / "faqs" >> TopBarGroup >> SiteMapGroup)
+  val atmHowTo = MenuLoc(Menu.i("How To Use ATM") / "how-to-use-atm" >> SiteMapGroup)
     
   val loginToken = MenuLoc(buildLoginTokenMenu)
   val logout = MenuLoc(buildLogoutMenu)
@@ -47,15 +47,15 @@ object Site extends Locs {
   ) / "user" >> Loc.CalcValue(() => User.currentUser)
   lazy val profileLoc = profileParamMenu.toLoc
 
-  val settings = MenuLoc(Menu.i("Settings") / "settings" >> SettingsGroup >> UiRouterGroup >> RequireLoggedIn)
-  val password = MenuLoc(Menu.i("Password") / "settings" / "password" >> SettingsGroup >> UiRouterGroup >> RequireLoggedIn)
+  val settings = MenuLoc(Menu.i("Settings") / "settings" >> SettingsGroup >> RequireLoggedIn)
+  val password = MenuLoc(Menu.i("Password") / "settings" / "password" >> SettingsGroup >> RequireLoggedIn)
   
   val account = MenuLoc(Menu.i("Account") / "settings" / "account" >> SettingsGroup >> RequireLoggedIn)
   val editProfile = MenuLoc(Menu("EditProfile", "Profile") / "settings" / "profile" >> SettingsGroup >> RequireLoggedIn)
   
-  val register = MenuLoc(Menu.i("Register") / "register" >> RequireNotLoggedIn >> SiteMapGroup >> UiRouterGroup)
-  val login = MenuLoc(Menu.i("Login") / "login" >> RequireNotLoggedIn >> SiteMapGroup >> UiRouterGroup)
-  val forgotPassword = MenuLoc(Menu.i("Forgot Password") / "forgot-password" >> RequireNotLoggedIn >> UiRouterGroup)
+  val register = MenuLoc(Menu.i("Register") / "register" >> RequireNotLoggedIn >> SiteMapGroup)
+  val login = MenuLoc(Menu.i("Login") / "login" >> RequireNotLoggedIn >> SiteMapGroup)
+  val forgotPassword = MenuLoc(Menu.i("Forgot Password") / "forgot-password" >> RequireNotLoggedIn)
 
   private def menus = List(
     home.menu,
diff --git a/src/main/scala/com/pyd/lib/NgUIRouter.scala b/src/main/scala/com/pyd/lib/NgUIRouter.scala
@@ -17,6 +17,16 @@ import net.liftmodules.extras.SnippetHelper
 object NgUIRouterFactory extends Factory {    
   
   /**
+   * Ignore the UiRouter Loc Group and add all menus in sitemap.
+   */
+  val html5mode = new FactoryMaker[Boolean](true) {}
+  
+  /**
+   * Ignore the UiRouter Loc Group and add all menus in sitemap.
+   */
+  val ignoreUiRouterGroup = new FactoryMaker[Boolean](true) {}
+  
+  /**
    * Default route when page lands on index.
    */
   val defaultRoute = new FactoryMaker[Box[Menu]](Empty) {}
@@ -32,11 +42,13 @@ object NgUIRouterFactory extends Factory {
    */
   val UiRouterGroup = LocGroup("uirouter")
   
-  case class UiRouterController(controller: String) extends AnyLocParam
-  
   /* Finds menu items that are in UiRouterGroup group. */
   private def findRoutes = LiftRules.siteMap map {
-    _.menus.filter(_.loc.inGroup_?(UiRouterGroup.group.head))
+    siteMap =>
+      if(ignoreUiRouterGroup.vend)
+        siteMap.menus
+        
+    siteMap.menus.filter(_.loc.inGroup_?(UiRouterGroup.group.head))
   } openOr Nil
 }
 
@@ -60,7 +72,7 @@ trait NgUIRouterSnip extends SnippetHelper {
       } openOr ""
       
       app+".config(function($stateProvider, $urlRouterProvider,$locationProvider) {"+
-      "$locationProvider.html5Mode(true);"+
+      "$locationProvider.html5Mode("+html5mode.vend.toString+");"+
       otherwise+"$stateProvider"+
       routes.vend.map { menu =>