Skip to content

Commit

Permalink
Added lift co. to the resource menu and fixed a glitch in the menu
Browse files Browse the repository at this point in the history
rendering.
  • Loading branch information
karma4u101 committed Jul 30, 2012
1 parent 0e00d6b commit 75eaf29
Show file tree
Hide file tree
Showing 5 changed files with 184 additions and 10 deletions.
18 changes: 9 additions & 9 deletions site/lift_blog.cms.xml
@@ -1,20 +1,20 @@
<cms path="/lift_blog" serve="true" type="html" locale="en_US" host="liftweb.net"> <cms path="/lift_co" serve="true" type="html" locale="en_US" host="liftweb.net">
<tag name="redirect" value="http://lift.la/"/> <tag name="redirect" value="http://liftweb.com/"/>
<tag name="name" value="lift_blog"/> <tag name="name" value="lift_co"/>
<tag name="menu" value=" The Official Lift Blog"/> <tag name="menu" value=" Lift Co."/>
<tag name="menu-locgroup" value="locgroup2" /> <tag name="menu-locgroup" value="locgroup1" />
<tag name="menu-icon" value="icon-pencil" /> <tag name="menu-icon" value="icon-briefcase" />
<tag name="order" value="5"/> <tag name="order" value="7"/>
<content> <content>
<lift:surround with="default" at="content"> <lift:surround with="default" at="content">
<head> <head>
<title>Lift :: Blog</title> <title>Lift :: Co.</title>
</head> </head>


<div id="left"> <div id="left">
<script> <script>
// <![CDATA[ // <![CDATA[
window.location = "http://lift.la/"; window.location = "http://liftweb.com/";
// ]]> // ]]>
</script> </script>
</div> <!-- left --> </div> <!-- left -->
Expand Down
23 changes: 23 additions & 0 deletions site/lift_co.cms.xml
@@ -0,0 +1,23 @@
<cms path="/lift_blog" serve="true" type="html" locale="en_US" host="liftweb.net">
<tag name="redirect" value="http://lift.la/"/>
<tag name="name" value="lift_blog"/>
<tag name="menu" value=" The Official Lift Blog"/>
<tag name="menu-locgroup" value="locgroup2" />
<tag name="menu-icon" value="icon-pencil" />
<tag name="order" value="5"/>
<content>
<lift:surround with="default" at="content">
<head>
<title>Lift :: Blog</title>
</head>

<div id="left">
<script>
// <![CDATA[
window.location = "http://lift.la/";
// ]]>
</script>
</div> <!-- left -->
</lift:surround>
</content>
</cms>
1 change: 1 addition & 0 deletions site/src/style-app.cms.xml
Expand Up @@ -50,6 +50,7 @@ h1, h2, h3 {
font-weight: bold; font-weight: bold;
padding: 10px 10px 10px 10px; padding: 10px 10px 10px 10px;
text-shadow: 2px 4px 5px #777; text-shadow: 2px 4px 5px #777;
margin-left: 10px;
} }
.navbar-inner { .navbar-inner {
background-color: #222; background-color: #222;
Expand Down
150 changes: 150 additions & 0 deletions site/templates-hidden/default2.cms.xml
@@ -0,0 +1,150 @@
<cms path="/templates-hidden/default" serve="false" type="html" locale="en_US" host="liftweb.net">
<content>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Language" content="en-US" />
<meta http-equiv="imagetoolbar" content="no" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link type="image/x-icon" href="https://karma4u101lifthome.telegr.am/images/logo-icon.png" rel="shortcut icon"/>

<!-- Including font from Google's Font Directory -->
<link rel="stylesheet" type="text/css"
href="http://fonts.googleapis.com/css?family=Crushed|Gruppo|Orbitron:bold" />
<link rel="stylesheet" type="text/css"
href="http://fonts.googleapis.com/css?family=Lobster" />


<link href="/style/bootstrap/2.0.4/bootstrap.css" rel="stylesheet" />
<link href="/style/bootstrap/2.0.4/bootstrap-responsive.css"
rel="stylesheet" />

<link href="/style/google-code/prettify.css" rel="stylesheet" />

<link rel="stylesheet" href="/style/style-app.css" type="text/css"
media="screen" />

<!--[if lte IE 6]> <link rel="stylesheet" type="text/css" href="/style/style-ie6.css"
/> <![endif] -->
<!--[if lte IE 7]> <link rel="stylesheet" type="text/css" href="/style/style-ie7.css"
/> <![endif] -->

<script id="jquery" src="/javascript/jquery/1.7.2/jquery.js"
type="text/javascript"></script>

<script type="text/javascript" src="http://www.google-analytics.com/ga.js">
</script>
</head>

<body onload="prettyPrint()" id="back" data-spy="scroll" data-target=".subnav" data-offset="50">

<!-- if you want page specific navbars surround with lift:if test -->
<!-- for more info look at how this is done for quotes -->
<!-- The overall site menu -->
<lift:embed what="mainNavbar" />


<div id="container-bg" class="container-fluid">
<div class="row-fluid">
<div class="span12">

<div class="row-fluid">
<div class="span12">
<div id="header">
<div id="hdr">
<a href="/" class="header-home">
<span>Lift</span>
</a>
</div>
<a class="lh-top-btn btn btn-primary" href="http://demo.liftweb.net">Lift Demo</a>
</div>
</div>
</div>

<lift:if toTest="quotes">
<div class="row-fluid">
<div class="span12">
<lift:choose refresh="14" class="hello">
<lift:embed what="/quotes/luke" />
<lift:embed what="/quotes/lukasz" />
<lift:embed what="/quotes/ebay" />
<lift:embed what="/quotes/esme" />
<lift:embed what="/quotes/tyler" />
<lift:embed what="/quotes/foursquare" />
<lift:embed what="/quotes/pongr" />
<lift:embed what="/quotes/dale" />
<lift:embed what="/quotes/sgrouples" />
</lift:choose>
</div>
</div>
</lift:if>

<div id="content">
<lift:bind name="content" />
</div>

<div id="footer">
<div class="ftr-links">
<lift:xmenu active_class="active">
<a menu:href="index">
<menu:item />
</a> &nbsp;
</lift:xmenu>
</div>

<div class="ftr-copy">Copyright &copy;
2010-2011 WorldWide Conferencing, LLC
</div>
<p>
Lift performance and tuning is courtesy of
<a href="http://yourkit.com">YourKit. </a>
<br />
Design by
<a href="http://www.joyreyes.com" target="_blank">Joy Reyes</a>
and
<a href="http://www.media4u101.se" target="_blank">Peter Petersson</a>
<br />
Powered by
<a href="http://liftweb.net">Lift</a>
Hosted by
<a href="https://telegr.am">Telegram</a>
</p>
</div>
<!--footer -->
<div class="alert alert-error" style="float:left;margin-left:3px;max-width:100%;">
<strong>
This is a demo site for a alternative
<a href="http://liftweb.net/">Lift Home</a>
.
The LOGO images IS NOT REPLACED and should be UPDATED to blend
in better on a production site.
</strong>
The goal has been to keep things clean and simple with a
minimum
of application specific styling
but
<i>of course</i>
have it fluid and mobile scalable.
<br />
<a href="https://groups.google.com/forum/?fromgroups#!topic/liftweb/whDSE37ltsw"
target="_blank">Tell me Peter Petersson (karma4u101) what you think!
</a>
</div>
</div>
</div>
</div>

<script type="text/javascript">
//<![CDATA[
try { var pageTracker = _gat._getTracker("UA-334500-19"); pageTracker._trackPageview(); } catch(err) {}
//]]>
</script>
<script type="text/javascript" src="/javascript/google-code/prettify.js"></script>
<script type="text/javascript" src="/javascript/google-code/lang-scala.js"></script>
<script type="text/javascript" src="/javascript/bootstrap/2.0.4/bootstrap.js"></script>

</body>

</html>
</content>
</cms>
2 changes: 1 addition & 1 deletion site/templates-hidden/mainNavbar.cms.xml
Expand Up @@ -2,7 +2,7 @@
<content> <content>
<div class="navbar navbar-fixed-top"> <div class="navbar navbar-fixed-top">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container"> <div style="width: auto;" class="container">
<a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar"> <a data-target=".nav-collapse" data-toggle="collapse" class="btn btn-navbar">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
Expand Down

0 comments on commit 75eaf29

Please sign in to comment.