Merged with sanj's latest

This commit is contained in:
Johnson Chetty 2012-10-05 12:20:46 +02:00
commit beaf759310
19 changed files with 751 additions and 141 deletions

View File

@ -11,7 +11,7 @@
.foot .right img{display:inline; float:right; padding:5px 2px 5px 5px; width:15px; height:15px;}
/* primary navigation */
.banner {background:url('/static/images/header_bg.png') repeat-x; background-size:contain;} /* background image for the global nav + text logo bar */
.banner {background:url('img/header_bg.png') repeat-x; background-size:contain;} /* background image for the global nav + text logo bar */
.navlink a {color:#fff;}
.sms { float:right; background-color:green; border:2px solid green;}
.trip {float:left; background-color:#BEDB74; border:2px solid #BEDB74;}
@ -84,6 +84,8 @@
.listtitlesmall{height: 1.8em; background-color:#999;} /* for stacked lists */
.listtitlesmall h3{float:left; margin:0px; padding: 5px; color:#fff; width:80%; font-size:100%;} /* for stacked lists */
.listtitlesmall img{float:left; margin:0px; padding: 5px; height:20px; width:20px;} /* for stacked lists */
.listtitlewarning {height: 1.8em;}
.listtitlewarning h3 {float:left; margin:0px; padding: 5px 5px 0 5px; width:94%; font-size:100%;}
/* for extra info under the list header */
.listextrainfo {padding:1em 10px 0 5px; height: 2.3em;}
@ -198,11 +200,14 @@ span.half {display:inline; float:left; margin:0; padding:0; width:50%;}
.right {text-align:right !important;}
/* PERSONAL PAGES */
#box-nav {list-style:none;}
#box-nav li {padding-left:6px;}
#box-nav .selected {width: 63.8%; padding:2px 0 2px 4px !important; color:#fff; font-weight:bold; border:2px solid #FBDD09; border-radius:3px;}
/* STATIC PAGES (SMS,ANDROID,JOIN US,ABOUT US) */
/* block */
.staticpage {min-height: 1em; overflow:hidden;}
.staticpage h1{color:red; font-size: 1.75em; line-height:1.33333333333333em;}
.staticpage h1{color:red; font-size: 1.5em; line-height:1.33333333333333em;}
.staticpage h2 {font-size:100%;}
.staticpage p, .staticpage h3, .staticpage ul, .staticpage ol {font-size:80%;}
.staticpage .box {padding:10px 0.8em;}
@ -211,17 +216,27 @@ span.half {display:inline; float:left; margin:0; padding:0; width:50%;}
/* highlight box top right*/
.highlight {margin: -2px 0 0 0; padding:15px; background-color:#BEDB74; border: 2px solid #FBDD09; border-radius:0 0 15px 15px;}
.highlight .right{width:100%; text-align:center;}
.highlight .submit{float:right; margin5px 0; height:1.5em;}
.highlight h2{font-size:1em; color:#FE2423;}
.highlight ol{font-size:1.2em;}
.highlight ul{/*list-style-type:none; text-align:right;*/ padding-left:12%;}
.highlight2 {margin: -2px 0 0 0; padding:15px 0 0 0; text-align:right; /*border: 2px solid #FBDD09; border-radius:0 0 15px 15px;*/}
.highlight .right, .highlight2 .right{width:100%; text-align:center;}
.highlight .submit, .highlight2 .submit {float:right; margin:5px 0; height:1.5em;}
.highlight h2, .highlight2 h2{font-size:1em; color:#FE2423;}
.highlight ol, .highlight2 ol{font-size:1.2em;}
.highlight ul, .highlight2 ul{padding-left:6%;}
.highlight ul.sublist{font-size:0.6em;}
.highlight ul span{font-style:italic;}
.actionbutton {background-color:#FBDD09 !important; border:2px solid yellow; border-radius:15px; text-align:center !important;}
.highlight2 ul{font-size:1em; padding-left:6%; list-style-type: none;}
.highlight2 li {padding-bottom:12px;}
.highlight p span,.highlight ul span, .highlight2 p span,.highlight2 ul span{font-style:italic;}
.actionbutton {color:red; padding:2px 10px ; background-color:#FBDD09 !important; border:2px solid yellow; border-radius:15px; text-align:center !important;}
/* highlight special header */
.hwide {font-size:1.5em !important; padding:0; margin:0; color:white; text-shadow:none;}
.hwider {font-size:1em !important; padding:0; margin:10px 0 0 0; color:white; text-shadow:none; text-align:center;}
/* OTP */
/* SIGN UP / SIGN IN */
.divline {display:inline; float:left; width:100%; font-size:0.95em; margin: 0 0 6px 0;}
.divlabel {display:inline; float:left; width:20%; margin: 0 0 10px 0; padding:2px 0 0 0;}
.divinput {display:inline; float:left; width:80%;}
.divinput span {float:left; display:inline; width:100%; font-size:0.8em;}

View File

@ -112,10 +112,13 @@ span.amp{font-family:Adobe Caslon Pro,Baskerville,"Goudy Old Style","Palatino","
/* background colors */
.white {background-color:white;}
.lightgrey {background-color:#eee}
.yellow {background-color:#FBDD09;}
.red {background-color:#FE2423;}
.green {background-color:#BEDB74;}
.red {background-color:#FE2423; color:white;}
.lightgrey {background-color:#eee}
.lightgreen {background-color:#deeebf;}
.lightyellow {background-color:#FCF79A;}
.darkgrey {background-color: #ddd;}
/* MICRO CLEARFIX HACK */
.cf:before, .cf:after {content:"";display:table} /* For modern browsers */
@ -136,7 +139,7 @@ body {width: 92%; margin: 0 auto} /* Center page without wrapper */
.g6_6,.g6_3, .g6_gut,
.g7_7, .g7_4, .g7_3, .g7_gut,
.g8_8,.g8_5,.g8_3,.g8_gut,
.g9_3,.g9_6 ,.g9_9,.g9_gut,
.g9_3,.g9_4, .g9_5, .g9_6 ,.g9_9,.g9_gut,
.g12_12, .g12_8, .g12_7, .g12_6, .g12_5, .g12_4, .g12_gut
{display:block; position: relative; margin-left: 0; margin-right: 0; margin-bottom:20px;}
@ -148,8 +151,8 @@ body {width: 92%; margin: 0 auto} /* Center page without wrapper */
.g5_5, .g5_1, .g5_gut,
.g6_6, .g6_3, .g6_gut,
.g7_7, .g7_4, .g7_3, .g7_gut,
.g8_8,.g8_5,.g8_3,.g8_gut,
.g9_3,.g9_6 ,.g9_9,.g9_gut,
.g8_8, .g8_5, .g8_3, .g8_gut,
.g9_3, .g9_4, .g9_5, .g9_6 ,.g9_9,.g9_gut,
.g12_12, .g12_8, .g12_7, .g12_6, .g12_5, .g12_4, .g12_gut
{display:inline; float: left}
@ -173,12 +176,13 @@ Change widths as necessary
.nav {height:85px; margin:0;}
.foot {height:50px;}
.logoimg {display:block; float:left; height: 60px; width:32%; background:URL('/static/images/chalobestlogoS.png') #deeebf no-repeat; background-position: 4px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.logoimg {display:block; float:left; height: 60px; width:32%; background:URL('img/chalobestlogoS.png') #deeebf no-repeat; background-position: 4px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.global{display:block; float:right; width:65.95%; height:30px; padding-right:0.99%; color:#FBDD09;}
.logotext {display:block; float:left; width:100%; height:30px; margin:0; padding:0;}
.logotext img {height:100%;}
.globallinks{display:block; float:right; width:100%; height:30px; padding-right:0.99%; background-color:#deeebf; vertical-align:bottom;}
.globallinks li a {color:#333; font-family:Consolas, Lucida Console, Monaco, monospace; font-weight:bold; vertical-align:bottom;}
.globallinks li {color:#333; font-family:Consolas, Lucida Console, Monaco, monospace; vertical-align:bottom;}
.globallinks li a {color:#333; font-weight:bold;}
.navprimary{display:block; float:left; width:99%; height:25px; padding-right:0.99%;}
.navlink li {display:inline; float:left; margin:0 0 0 2%; padding:0;}
.navprimary .navlink li {margin: 0 0 0 2%; width:22%; float:right; padding:0;}
@ -197,8 +201,8 @@ Change widths as necessary
.g5_5, .g5_1, .g5_gut,
.g6_6, .g6_3, .g6_gut,
.g7_7, .g7_4, .g7_3, .g7_gut,
.g8_8,.g8_5,.g8_3,.g8_gut,
.g9_3,.g9_6 ,.g9_9,.g9_gut,
.g8_8, .g8_5, .g8_3, .g8_gut,
.g9_3, .g9_4, .g9_5, .g9_6 ,.g9_9,.g9_gut,
.g12_12, .g12_8, .g12_7, .g12_6, .g12_5, .g12_4, .g12_gut
{display:inline; float: left}
@ -248,23 +252,25 @@ Change widths as necessary
.g3_3{width:100%; margin: 0;}
.g2 {height:100%;}
.g2_2{width:100%; margin: 0;}
.g1 {height:100%;}
.maphome{height:240px;margin: 0; }
}
@media only screen and (min-width: 320px) {
/* inherited font size*/
body {}
body {font-size:80%;} /* 12px / 18px */
/* NAVIGATION */
.nav, .foot {display:inline; float:left; width:100%;}
.nav {height:55px; margin:0;}
.foot {height:50px;}
.logoimg {display:block; float:left; height: 55px; width:28%; background:URL('/static/images/chalobestlogoS.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.logoimg {display:block; float:left; height: 55px; width:28%; background:URL('img/chalobestlogoS.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.global{display:block; float:left; width:69.95%; height:30px; padding-right:0.99%;}
.logotext {display:block; float:left; width:51.01%; height:25px; margin:3px 0 0 0;}
.globallinks{display:block; float:right; width:48%; height:30px; padding:2px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li a {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; font-weight:bold; font-size:0.80em; line-height:00.9em; vertical-align:bottom;}
.globallinks{display:block; float:right; width:48%; height:30px; padding:10px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; font-size:0.80em; line-height:00.9em; vertical-align:bottom;}
.globallinks li a {color:#FBDD09; font-weight:bold; line-height:00.9em;}
.navprimary{display:block; float:left; width:69.95%; height:30px; padding-right:0.99%;}
.navlink li {display:inline; float:right; padding:0;}
.navprimary .navlink li {margin: 0 0 0 3%; width:22%;}
@ -278,8 +284,8 @@ Change widths as necessary
.g5_5, .g5_1, .g5_gut,
.g6_6,.g6_3, .g6_gut,
.g7_7, .g7_4, .g7_3, .g7_gut,
.g8_8,.g8_5,.g8_3,.g8_gut,
.g9_3,.g9_6 ,.g9_9,.g9_gut,
.g8_8, .g8_5, .g8_3, .g8_gut,
.g9_3, .g9_4, .g9_5, .g9_6 ,.g9_9,.g9_gut,
.g12_12, .g12_8, .g12_7, .g12_6, .g12_5, .g12_4, .g12_gut
{display:inline; float: left}
@ -329,12 +335,13 @@ Change widths as necessary
.g3_3{width:100%; margin: 0;}
.g2 {height:100%;}
.g2_2{width:100%; margin: 0;}
.g1 {height:100%;}
.maphome{height:300px;margin: 0; }
}
@media only screen and (min-width: 480px) {
/* inherited font size*/
body {}
body {font-size:90%;} /* 12px / 18px */
.pagetitle{font-size:100%;}
/* NAVIGATION */
@ -342,11 +349,12 @@ Change widths as necessary
.nav {height:60px; margin:0;}
.foot {height:50px;}
.logoimg {display:block; float:left; height: 60px; width:18%; background:URL('/static/images/chalobestlogoS.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.logoimg {display:block; float:left; height: 60px; width:18%; background:URL('img/chalobestlogoS.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.global{display:block; float:left; width:79.95%; height:30px; padding-right:0.99%;}
.logotext {display:block; float:left; height:30px; margin:0; padding:0;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:2px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li a {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; font-weight:bold; vertical-align:bottom;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:10px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; line-height:00.9em; vertical-align:bottom;}
.globallinks li a {color:#FBDD09; font-weight:bold;}
.navprimary{display:block; float:left; width:79.95%; height:30px; padding-right:0.99%;}
.navlink li {display:inline; float:right; padding:0;}
.navprimary .navlink li {margin: 0 0 0 2%; width:22%;}
@ -360,8 +368,8 @@ Change widths as necessary
.g5_5, .g5_1, .g5_gut,
.g6_6, .g6_3, .g6_gut,
.g7_7, .g7_4, .g7_3, .g7_gut,
.g8_8,.g8_5,.g8_3,.g8_gut,
.g9_3,.g9_6 ,.g9_9,.g9_gut,
.g8_8, .g8_5, .g8_3, .g8_gut,
.g9_3, .g9_4, .g9_5, .g9_6, .g9_9,.g9_gut,
.g12_12, .g12_8, .g12_7, .g12_6, .g12_5, .g12_4, .g12_gut
{display:inline; float: left}
@ -411,6 +419,7 @@ Change widths as necessary
.g3_3{width:100%; margin: 0;}
.g2 {width: 30.58%; height:100%;}
.g2_2{width:100%; margin: 0;}
.g1 {width: 6.35%; height:100%;}
.maphome{height:350px;margin: 0; }
}
@ -423,12 +432,12 @@ Change widths as necessary
.nav {height:60px; margin:0;}
.foot {height:50px;}
.logoimg {display:block; float:left; height: 60px; width:15%; background:URL('/static/images/chalobestlogoS.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.logoimg {display:block; float:left; height: 60px; width:15%; background:URL('img/chalobestlogoS.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.global{display:block; float:left; width:82.95%; height:30px; padding-right:0.99%;}
.logotext {display:block; float:left; width:23.01%; height:30px; margin:0; padding:0;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:2px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {vertical-align:bottom;}
.globallinks a {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; font-weight:bold; vertical-align:bottom;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:10px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; vertical-align:bottom;}
.globallinks li a {color:#FBDD09; font-size:1em; font-weight:bold;}
.navprimary{display:block; float:left; width:82.95%; height:30px; padding-right:0.99%;}
.navlink li {display:inline; float:right; padding:0;}
.navprimary .navlink li {margin: 0 0 0 2%; width:22%;}
@ -447,8 +456,8 @@ Change widths as necessary
.g5_5, .g5_1, .g5_gut,
.g6_6, .g6_3, .g6_gut,
.g7_7, .g7_4, .g7_3, .g7_gut,
.g8_8,.g8_5,.g8_3,.g8_gut,
.g9_3,.g9_6 ,.g9_9,.g9_gut,
.g8_8, .g8_5, .g8_3, .g8_gut,
.g9_3, .g9_4, .g9_5, .g9_6, .g9_9, .g9_gut,
.g12_12, .g12_8, .g12_7, .g12_6, .g12_5, .g12_4, .g12_gut
{display:inline; float: left}
@ -498,6 +507,7 @@ Change widths as necessary
.g3_3{width:100%; margin: 0;}
.g2 {width: 30.58%; height:100%;}
.g2_2{width:100%; margin: 0;}
.g1 {width: 30.58%; height:100%;}
.maphome{height:350px;margin: 0; }
}
@ -511,12 +521,12 @@ Change widths as necessary
.nav {height:70px; margin:0;}
.foot {height:50px;}
.logoimg {display:block; float:left; height: 80px; width:12.33%; background:URL('/static/images/chalobestlogoM.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.logoimg {display:block; float:left; height: 80px; width:12.33%; background:URL('img/chalobestlogoM.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.global{display:block; float:left; margin:0; width:85.65%; height:40px;}
.logotext {display:block; float:left; width:23.01%; height:40px; margin:0; padding:0;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:10px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {vertical-align:bottom;}
.globallinks a {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; font-weight:bold; vertical-align:bottom;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:17px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {color:#FBDD09; font-size:0.9em; font-family:Consolas, Lucida Console, Monaco, monospace; vertical-align:bottom;}
.globallinks li a {color:#FBDD09; font-weight:bold;}
.navprimary{display:block; float:left; width:85.65%; height:30px; }
.navlink li {display:inline; float:right; margin:0 0 0 1%; padding:0;}
.navprimary .navlink li {width:15.5%;}
@ -583,6 +593,7 @@ Change widths as necessary
.g3_3{width:100%; margin: 0;}
.g2 {width:14.68%; height:100%;}
.g2_2{width:100%; margin: 0;}
.g1 {width: 6.35%; height:100%;}
.maphome{height:500px;margin: 0;}
}
@ -596,12 +607,12 @@ Change widths as necessary
.nav {height:80px; margin:0;}
.foot {height:50px;}
.logoimg {display:block; float:left; height:80px; width:10.33%; background:URL('/static/images/chalobestlogo.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.logoimg {display:block; float:left; height:80px; width:10.33%; background:URL('img/chalobestlogo.png') #deeebf no-repeat; background-position: 12px top; overflow:hidden; margin:0; padding:0 0 0 1.03%;}
.global{display:block; float:left; width:87.65%; height:50px; margin:0;}
.logotext {display:block; float:left; width:23.01%; height:50px;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:15px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {vertical-align:bottom;}
.globallinks a {color:#FBDD09; font-family:Consolas, Lucida Console, Monaco, monospace; font-weight:bold; vertical-align:bottom;}
.globallinks{display:block; float:right; width:30%; height:30px; padding:25px 0.99% 0 0; background-color:inherit; vertical-align:bottom;}
.globallinks li {color:#FBDD09; font-size:0.9em; font-family:Consolas, Lucida Console, Monaco, monospace; vertical-align:bottom;}
.globallinks li a {color:#FBDD09; font-weight:bold;}
.navprimary{display:block; float:left; width:87.65%; height:30px;}
.navlink li {display:inline; float:right; padding:0;}
.navprimary .navlink li {margin:0 0 0 1%; width:10.5%;}
@ -615,8 +626,8 @@ Change widths as necessary
.g5_5, .g5_1, .g5_gut,
.g6_6, .g6_3, .g6_gut,
.g7_7, .g7_4, .g7_3, .g7_gut,
.g8_8,.g8_5,.g8_3,.g8_gut,
.g9_3,.g9_6 ,.g9_9,.g9_gut,
.g8_8, .g8_5, .g8_3, .g8_gut,
.g9_3, .g9_4, .g9_5, .g9_6, .g9_9, .g9_gut,
.g12_12, .g12_8, .g12_7, .g12_6, .g12_5, .g12_4, .g12_gut
{display:inline; float: left}
@ -632,6 +643,8 @@ Change widths as necessary
.g12_gut {width:2.02%; margin:0; min-height:20px;}
.g9 {width:72.99%; min-height:20px;}
.g9_3 {width:31.52%; margin:0;}
.g9_4 {width:42.94%; margin:0;}
.g9_5 {width:54.35%; margin:0;}
.g9_6{width:65.76%; margin:0;}
.g9_9{width:100%; margin:0;}
.g9_gut{width:2.71%; height: 10px; margin:0;}
@ -665,6 +678,7 @@ Change widths as necessary
.g3_3{width:100%; margin: 0;}
.g2 {width:14.68%; height:100%;}
.g2_2{width:100%; margin: 0;}
.g1 {width: 6.35%; height:100%;}
.maphome{height:500px;margin: 0;}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.6 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -0,0 +1,25 @@
{% extends 'innov/base.html' %}
{% block content %}
<div class="g3"></div>
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
<h1>Sorry!</h1>
<h2>We couldn't find what you are looking for. </h2>
<p>Did the web-address change? Try to find your directions again via <a href="index.html">ChaloBEST home</a>.</p>
<p>If you feel that you got here because of an error on the website, <a href="#">let us know what you tried to do.</a></p>
</div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
</div>
<div class="g3"></div>
{% endblock %}

View File

@ -0,0 +1,24 @@
{% extends 'innov/base.html' %}
{% block content %}
<div class="g3"></div>
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
<h1>Something is wrong!</h1>
<p>Looks like something broke on our system. When you got this page, we also got notified. We will fix it soon.</p>
<p>If feel the site is off for too long, <a href="#"> please contact us.</a></p>
</div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
</div>
<div class="g3"></div>
{% endblock %}

View File

@ -0,0 +1,38 @@
{% extends 'innov/base.html' %}
{% block content %}
<!-- Settings links & profile -->
<div class="g3">
<div class="leading20"></div>
<div class="g3_3 staticpage main">
<ul id="box-nav">
<li class="selected"><a href='/accounts/mcaro/'>My page</a></li>
<li><a href='/accounts/mcaro/edit/'>Edit profile</a></li>
<li><a href='/accounts/mcaro/password/'>Change password</a></li>
<li><a href='/accounts/mcaro/email/'>Change email</a></li>
</ul>
</div>
<div id="box">
<img class="mugshot" src="http://www.gravatar.com/avatar/8b8f3a7297801bd5cdbc6e58231ab0ed?s=140&amp;d=monsterid" alt="Your mugshot" />
<dl>
<dt>Email</dt>
<dd>carolien.klep@gmail.com</dd>
</dl>
</div>
</div>
<!-- CONTENT BLOCK-->
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
</div>
<div class="leading40"></div>
</div>
<!-- SIDE CONTENT BLOCK-->
<div class="g3">
</div>
{% endblock %}

View File

@ -0,0 +1,51 @@
{% extends 'innov/base.html' %}
{% block content %}
<!-- Settings links & profile -->
<div class="g3">
<div class="leading20"></div>
<div class="g3_3 staticpage main">
<ul id="box-nav">
<li><a href='/accounts/mcaro/'>My page</a></li>
<li><a href='/accounts/mcaro/edit/'>Edit profile</a></li>
<li><a href='/accounts/mcaro/password/'>Change password</a></li>
<li class="selected"><a href='/accounts/mcaro/email/'>Change email</a></li>
</ul>
</div>
<div id="box">
<img class="mugshot" src="http://www.gravatar.com/avatar/8b8f3a7297801bd5cdbc6e58231ab0ed?s=140&amp;d=monsterid" alt="Your mugshot" />
<dl>
<dt>Email</dt>
<dd>carolien.klep@gmail.com</dd>
</dl>
</div>
</div>
<!-- CONTENT BLOCK-->
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
<form action="" method="post" id=" ">
<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='AY0UF5lQ8hGGdnN0Ei8F15O1XQP9v399' /></div>
<fieldset>
<h1><legend>Change email address</legend></h1>
<div class="divline">
<div class="divlabel"><label for="id_email">New email:</label></div>
<div class="divinput"><input id="id_email" type="text" class="required" name="email" maxlength="75" /></div>
</div>
</fieldset>
<div class="divline">
<div class="divlabel">&nbsp;</div>
<div class="divinput"><input type="submit" class="actionbutton" value="Change email" /></div>
</div>
</form>
</div>
<div class="leading40"></div>
</div>
<!-- SIDE CONTENT BLOCK-->
<div class="g3">
</div>
{% endblock %}

View File

@ -0,0 +1,60 @@
{% extends 'innov/base.html' %}
{% block content %}
<!-- Settings links & profile -->
<div class="g3">
<div class="leading20"></div>
<div class="g3_3 staticpage main">
<ul id="box-nav">
<li><a href='/accounts/mcaro/'>My page</a></li>
<li><a href='/accounts/mcaro/edit/'>Edit profile</a></li>
<li class="selected"><a href='/accounts/mcaro/password/'>Change password</a></li>
<li><a href='/accounts/mcaro/email/'>Change email</a></li>
</ul>
</div>
<div id="box">
<img class="mugshot" src="http://www.gravatar.com/avatar/8b8f3a7297801bd5cdbc6e58231ab0ed?s=140&amp;d=monsterid" alt="Your mugshot" />
<dl>
<dt>Email</dt>
<dd>carolien.klep@gmail.com</dd>
</dl>
</div>
</div>
<!-- CONTENT BLOCK-->
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
<form action="" method="post" id="password_change_form">
<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='AY0UF5lQ8hGGdnN0Ei8F15O1XQP9v399' /></div>
<fieldset>
<h1><legend>Change Password</legend></h1>
<div class="divline">
<div class="divlabel"><label for="id_old_password">Old password:</label></div>
<div class="divinput"><input type="password" name="old_password" id="id_old_password" /></div>
</div>
<div class="leading20"></div>
<div class="divline">
<div class="divlabel"><label for="id_new_password1">New password:</label></div>
<div class="divinput"><input type="password" name="new_password1" id="id_new_password1" /></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_new_password2">Confirm new password:</label></div>
<div class="divinput"><input type="password" name="new_password2" id="id_new_password2" /></div>
</div>
</fieldset>
<div class="divline">
<div class="divlabel">&nbsp;</div>
<div class="divinput"><input type="submit" class="actionbutton" value="Change password" /></div>
</div>
</form>
</div>
<div class="leading40"></div>
</div>
<!-- SIDE CONTENT BLOCK-->
<div class="g3">
</div>
{% endblock %}

View File

@ -0,0 +1,175 @@
{% extends 'innov/base.html' %}
{% block content %}
<!-- Settings links & profile -->
<div class="g3">
<div class="leading20"></div>
<div class="g3_3 staticpage main">
<ul id="box-nav">
<li><a href='/accounts/mcaro/'>My page</a></li>
<li class="selected"><a href='/accounts/mcaro/edit/'>Edit profile</a></li>
<li><a href='/accounts/mcaro/password/'>Change password</a></li>
<li><a href='/accounts/mcaro/email/'>Change email</a></li>
</ul>
</div>
<div id="box">
<img class="mugshot" src="http://www.gravatar.com/avatar/8b8f3a7297801bd5cdbc6e58231ab0ed?s=140&amp;d=monsterid" alt="Your mugshot" />
<dl>
<dt>Email</dt>
<dd>carolien.klep@gmail.com</dd>
</dl>
</div>
</div>
<!-- CONTENT BLOCK-->
<div class="g9">
<div class="leading40"></div>
<div class="g9_9 staticpage main">
<form action="" enctype="multipart/form-data" method="post">
<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='AY0UF5lQ8hGGdnN0Ei8F15O1XQP9v399' /></div>
<fieldset>
<h1><legend>Edit Profile</legend></h1>
</div>
</div>
<div class="g4">
<div class="g4_4 staticpage main"></div>
<div class="divline">
<div class="divlabel"><label for="id_first_name">First name:</label></div>
<div class="divinput"><input id="id_first_name" type="text" name="first_name" maxlength="30" /></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_last_name">Last name:</label></div>
<div class="divinput"><input id="id_last_name" type="text" name="last_name" maxlength="30" /></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_mugshot">Mugshot:</label></div>
<div class="divinput"><input type="file" name="mugshot" id="id_mugshot" /> <span class="helptext">A personal image displayed in your profile.</span></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_gender">Gender:</label></div>
<div class="divinput"><select name="gender" id="id_gender">
<option value="" selected="selected">---------</option>
<option value="1">Male</option>
<option value="2">Female</option>
</select></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_birth_date">Birth date:</label></div>
<div class="divinput"><input type="text" name="birth_date" id="id_birth_date" /></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_website">Website:</label></div>
<div class="divinput"><input id="id_website" type="text" name="website" maxlength="200" /></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_location">Location:</label></div>
<div class="divinput"><input id="id_location" type="text" name="location" maxlength="255" /></div>
</div>
</div>
<!-- CONTENT BLOCK-->
<div class="g5">
<div class="g5_5 staticpage main">
<div class="divline">
<div class="divlabel"><label for="id_about_me">About me:</label></div>
<div class="divinput"><textarea id="id_about_me" rows="8" cols="40" name="about_me"></textarea></div>
</div>
<div class="leading10"></div>
<div class="divline">
<div class="divlabel"><label for="id_language">Language:</label></div>
<div class="divinput"><select name="language" id="id_language">
<option value="ar">Arabic</option>
<option value="az">Azerbaijani</option>
<option value="bg">Bulgarian</option>
<option value="bn">Bengali</option>
<option value="bs">Bosnian</option>
<option value="ca">Catalan</option>
<option value="cs">Czech</option>
<option value="cy">Welsh</option>
<option value="da">Danish</option>
<option value="de">German</option>
<option value="el">Greek</option>
<option value="en" selected="selected">English</option>
<option value="en-gb">British English</option>
<option value="eo">Esperanto</option>
<option value="es">Spanish</option>
<option value="es-ar">Argentinian Spanish</option>
<option value="es-mx">Mexican Spanish</option>
<option value="es-ni">Nicaraguan Spanish</option>
<option value="et">Estonian</option>
<option value="eu">Basque</option>
<option value="fa">Persian</option>
<option value="fi">Finnish</option>
<option value="fr">French</option>
<option value="fy-nl">Frisian</option>
<option value="ga">Irish</option>
<option value="gl">Galician</option>
<option value="he">Hebrew</option>
<option value="hi">Hindi</option>
<option value="hr">Croatian</option>
<option value="hu">Hungarian</option>
<option value="id">Indonesian</option>
<option value="is">Icelandic</option>
<option value="it">Italian</option>
<option value="ja">Japanese</option>
<option value="ka">Georgian</option>
<option value="kk">Kazakh</option>
<option value="km">Khmer</option>
<option value="kn">Kannada</option>
<option value="ko">Korean</option>
<option value="lt">Lithuanian</option>
<option value="lv">Latvian</option>
<option value="mk">Macedonian</option>
<option value="ml">Malayalam</option>
<option value="mn">Mongolian</option>
<option value="nb">Norwegian Bokmal</option>
<option value="ne">Nepali</option>
<option value="nl">Dutch</option>
<option value="nn">Norwegian Nynorsk</option>
<option value="pa">Punjabi</option>
<option value="pl">Polish</option>
<option value="pt">Portuguese</option>
<option value="pt-br">Brazilian Portuguese</option>
<option value="ro">Romanian</option>
<option value="ru">Russian</option>
<option value="sk">Slovak</option>
<option value="sl">Slovenian</option>
<option value="sq">Albanian</option>
<option value="sr">Serbian</option>
<option value="sr-latn">Serbian Latin</option>
<option value="sv">Swedish</option>
<option value="sw">Swahili</option>
<option value="ta">Tamil</option>
<option value="te">Telugu</option>
<option value="th">Thai</option>
<option value="tr">Turkish</option>
<option value="tt">Tatar</option>
<option value="uk">Ukrainian</option>
<option value="ur">Urdu</option>
<option value="vi">Vietnamese</option>
<option value="zh-cn">Simplified Chinese</option>
<option value="zh-tw">Traditional Chinese</option>
</select></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_privacy">Privacy:</label></div>
<div class="divinput">
<select name="privacy" id="id_privacy">
<option value="open">Open</option>
<option value="registered" selected="selected">Registered</option>
<option value="closed">Closed</option>
</select> <span class="helptext">Designates who can view your profile.</span></div>
</div>
</fieldset>
<div class="leading10"></div>
<div class="divline">
<div class="divlabel">&nbsp;</div>
<div class="divinput"><input class="actionbutton" type="submit" value="Save changes" /></div>
</div>
</form>
</div>
<div class="leading40"></div>
</div>
{% endblock %}

View File

@ -1,113 +1,172 @@
{% extends 'innov/base.html' %}
{% block content %}
<div class="g3">
<div class="leading40"></div>
<div class="g3_3 listtitlesmall"><h3>SMS service</h3></div>
<div class="g3_3 staticpage lightgrey">
<div class="box">
<p>With this service, you can send and receive simple queries by SMS about bus stops, bus numbers and routing on BEST.</p>
<p>Send SMS to 9619524420 and you will receive a return SMS with the information you need.</p>
<!-- english -->
<div class="g3 lightgrey">
<!-- english -->
<div class="g3 lightgrey">
<div class="leading60"><h2 class="hwider darkgrey">English</h2></div>
<div class="g3_3 staticpage main"><h1>SMS service</h1></div>
<div class="g3_3 staticpage">
<p>With ChaloBEST, you can send queries and receive information about bus stops, bus numbers and routing on BEST. <br />
Send SMS to <b>96195.24420</b> (*)</p>
<p>(*) Normal SMS charges applicable as per carrier rate and plan.</p>
</div>
<div class="leading20"></div>
<div class="g3_3 staticpage main">
<h2 class="hwide darkgrey">INSTRUCTIONS</h2>
<div class="leading10"></div>
<h3>Find routes between bus stops <br />(or areas)</h3>
<p>Send the names separated by "<b>to</b>". (other possible separators: "<b>+</b>", "<b>/</b>".)<br />Example: </p>
<div class="g3_3 darkgrey">
<div class="leading10"></div>
<div class="center">
<img src="img/sms_direction_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="leading10"></div>
</div>
<div class="leading40"></div>
<h3>Find all busses &plus; frequencies at your stop</h3>
<p>Send the stop name. Example:<br />
"<b>mahim</b>" (or "<b>borivali w</b>", "<b>bhandup</b>", etc)</p>
<div class="g3_3 darkgrey">
<div class="leading10"></div>
<div class="center">
<img src="img/sms_stop_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="leading10"></div>
</div>
<div class="leading40"></div>
<h3>Find bus route &amp; frequency:</h3>
<p>Send the bus number (add the letter if it has one). Example:<br />
"<b>21</b>" (Other bus types: "<b>92L</b>","<b>C-52</b>","<b>AS-440</b>")</p>
<div class="g3_3 darkgrey">
<div class="leading10"></div>
<div class="center">
<img src="img/sms_bus_send.png" alt="send message as: 21" />
</div>
<div class="leading10"></div>
</div>
</div>
</div>
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
<h1>INSTRUCTIONS SMS</h1>
<h2>Find bus options to destination</h2>
<p>To find out how to go from one stop to another, send an SMS with any stop name "TO " any stop name. Example:</p>
<div class="g6_6 lightgreen">
<!-- marathi -->
<div class="g3 lightgreen">
<div class="leading60"><h2 class="hwider green">मराठी</h2></div>
<div class="g3_3 staticpage main"><h1>एस.एम.एस. service</h1></div>
<div class="g3_3 staticpage">
<p>चलोबेस्ट या सेवेद्वारे तुम्ही बेस्ट बसेस, बसस्थानक, बसमार्ग यांची माहीती एस.एम.एस च्या माध्यमातुन मिळवू शकता.<br />
त्यासाठी <b>९६१९५२४४२०</b> या मोबाईल क्रंमाकावर एस.एम.एस पाठवा.(*)</p>
<p>(*) या सुविधेसाठी तुमच्या एस.एम.एस सेवेचा नियमीत शुल्क आकारले जातील. </p>
</div>
<div class="leading20"></div>
<div class="g3_3 staticpage main">
<h2 class="hwide green">INSTRUCTIONS</h2>
<div class="leading10"></div>
<h3>दोन बसस्थानक किंवा क्षेत्रातील बसमार्गांबद्दलच्या माहीतीसाठी</h3>
<p>त्या दोन स्थानकांच्या नावांमध्ये "<b>to</b>", "<b>+</b>", "<b>/</b>" लिहुन एस.एम.एस करा. उदाहरणार्थ:</p>
<div class="g3_3 green">
<div class="leading10"></div>
<div class="g6_3">
<div class="center">
<img src="/static/images/sms_direction_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="box">
<p>"<b>Agarwadi to Kalanagar</b>" <br />Or: "<b>agarwadi to kalanagar</b>",<br /> "<b>From Agarwadi TO Kalanagar</b>" and variations on those.</p>
</div>
</div>
<div class="g6_gut"></div>
<div class="g6_3">
<div class="center">
<img src="/static/images/sms_direction_answer.png" alt="receive message with all direct buses from mahim to churchgate stops" />
</div>
<div class="box">
<p>The answer you receive shows the bus numbers which ply between Agarwadi and Kalanagar stops.</p>
</div>
<div class="center">
<img src="img/sms_direction_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="leading10"></div>
</div>
<div class="leading20"></div>
<h2>Find all busses that pass a particular stop</h2>
<p>To see all the bus numbers served by a stop, send an SMS with "STOP " and the name of any bus stop or area: Example:</p>
<div class="g6_6 lightgreen">
<div class="leading40"></div>
<h3>कोणत्याही बसस्थानकावरील बसमार्ग व त्या स्थानकावरुन सुटणार् या दोन बसमधिल वेळेच अंतर यांच्या माहीतीसाठी</h3>
<p>स्थानकाचे नाव एस.एम.एस करा. उदाहरणार्थ:<br />
"<b>mahim</b>" (or "<b>borivali w</b>", "<b>bhandup</b>", etc)</p>
<div class="g3_3 green">
<div class="leading10"></div>
<div class="g6_3">
<div class="center">
<img src="/static/images/sms_stop_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="box">
<p>"<b>stop agarwadi</b>" <br />Or: "<b>STOP agarwadi</b>", "<b>Stop Agarwadi</b>" and variations on those.</p>
</div>
</div>
<div class="g6_gut"></div>
<div class="g6_3">
<div class="center">
<img src="/static/images/sms_stop_answer.png" alt="receive message with all direct buses from mahim to churchgate stops" />
</div>
<div class="box">
<p>The answer you receive shows the numbers of all the buses that pass through Agarwadi stop.</p>
</div>
<div class="center">
<img src="img/sms_stop_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="leading10"></div>
</div>
<div class="leading20"></div>
<h2>Find the route of a particular bus number</h2>
<p>To see the route of any bus number, send an SMS with "BUS " and the number of any bus: Example:</p>
<div class="g6_6 lightgreen">
<div class="leading40"></div>
<h3>कोणत्याही बेस्ट बसच्या बसमार्गाची व वारंवारतेची माहिती मिळवण्यासाठी</h3>
<p>बसचा पूर्ण क्रमांक एस.एम.एस करा. उदाहरणार्थ:<br />
"<b>21</b>" (Other bus types: "<b>92L</b>","<b>C-52</b>","<b>AS-440</b>")</p>
<div class="g3_3 green">
<div class="leading10"></div>
<div class="g6_3">
<div class="center">
<img src="/static/images/sms_bus_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="box">
<p>"bus 21" (Also possible: "BUS 21", "Bus 21")</p>
</div>
</div>
<div class="g6_gut"></div>
<div class="g6_3">
<div class="center">
<img src="/static/images/sms_bus_answer.png" alt="receive message with all direct buses from mahim to churchgate stops" />
</div>
<div class="box">
<p>The answer you receive shows all the stop names that Bus No. 21 passes.</p>
</div>
<div class="center">
<img src="img/sms_bus_send.png" alt="send message as: 21" />
</div>
<div class="leading10"></div>
</div>
</div>
</div>
<!-- hindi -->
<div class="g3 lightyellow">
<div class="leading60"><h2 class="hwider yellow">हिन्दी</h2></div>
<div class="g3_3 staticpage main"><h1>एस.एम.एस. service</h1></div>
<div class="g3_3 staticpage">
<p>ChaloBEST के द्वारा आप बस के क्रमांक, स्टॉप एवं बस मार्गों क़ी जानकारी पा सकते है. <br />
इस सेवा का उपयोग करने के लिए <b>96195.24420</b> पर SMS भेजें (*)</p>
<p>(*) सुविधा पे सामान्य SMS शुल्क लागू </p>
</div>
<div class="leading20"></div>
<div class="g3_3 staticpage main">
<h2 class="hwide yellow">INSTRUCTIONS</h2>
<div class="leading10"></div>
<h3>किसी स्थान या स्टॉप के बीच कौन कौन से बस मार्ग है </h3>
<p>जानने के लिए उनके नाम SMS में भेजें. नामों के बीच "<b>to</b>","<b>+</b>" या "<b>/</b>" डाल के उन्हें अलग करें. उदाहरण के लिए:</p>
<div class="g3_3 yellow">
<div class="leading10"></div>
<div class="center">
<img src="img/sms_direction_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="leading10"></div>
</div>
<div class="leading40"></div>
<h3>किसी भी स्टॉप के बस मार्ग या उस स्टॉप क़ी बसें कितने समय काल के बाद आती है</h3>
<p>जानने के लिए उस स्टॉप का नाम SMS करें. उदाहरण के लिए <br />
"<b>mahim</b>" (or "<b>borivali w</b>", "<b>bhandup</b>", etc)</p>
<div class="g3_3 yellow">
<div class="leading10"></div>
<div class="center">
<img src="img/sms_stop_send.png" alt="send message as - FROM mahim TO churchgate" />
</div>
<div class="leading10"></div>
</div>
<div class="leading40"></div>
<h3>किसी बस का मार्ग जानने के लिए या यह जानने के लिए क़ि वह कितने समय काल के बाद आती है</h3>
<p> बस का नंबर ( अंग्रेजी अक्षर सहित ) SMS करें. उदाहरण के लिए:<br />
"<b>21</b>" (Other bus types: "<b>92L</b>","<b>C-52</b>","<b>AS-440</b>")</p>
<div class="g3_3 yellow">
<div class="leading10"></div>
<div class="center">
<img src="img/sms_bus_send.png" alt="send message as: 21" />
</div>
<div class="leading10"></div>
</div>
</div>
</div>
<!-- right banner -->
<div class="g3">
<div class="g3_3 ">
<div class="highlight">
<h2>SMS ChaloBEST</h2>
<ol>
<li><b>Find bus & route info:</b></li>
<ul class="sublist">
<li>Directions: "<span>[stopname]</span><b> to </b><span>[stopname]</span>"</li>
<li>Buses at your stop: "<b>stop </b><span>[stopname]</span>"</li>
<li>Stop list: "<b>bus </b><span>[number]</span>"</li>
</ul>
<li><b>SMS it to 9619524420</b></li>
</ol>
<div class="highlight2">
<h2>ChaloBEST SMS</h2>
<div class="leading20"></div>
<ul>
<li><b>Directions: </b><br /> "<span>[stop name]</span><b> to </b><span>[stop name]</span>"</li>
<li><b>Buses at your stop:</b><br /> "<span>[stop name]</span>"</li>
<li><b>Bus stop list &amp; frequency:</b><br /> "<span>[number]</span>"</li>
<li><h2>SMS 9619524420</h2></li>
</ul>
</div>
</div>
</div>
<div class="g3">
<div class="leading20"></div>
<div class="g3_3 listtitlesmall"><h3>DISCLAIMER: TEST PHASE</h3></div>
<div class="g3_3 staticpage lightgrey">
<div class="g1"></div>
<div class="g3 right">
<div class="g3_3 listtitlewarning red"><h3 class="red">Feedback &amp; Disclaimer</h3></div>
<div class="g3_3 staticpage">
<div class="box">
<p>ChaloBEST is still being tested, we plan to release a public beta soon. We welcome your feedback and comments via email to info@chalobest.in</p>
<p>ChaloBEST SMS is in public beta, and your feedback is most welcome, <a href="contact.html">click here to contact</a>.</p>
<p>ChaloBEST सुविधा क़ी अभी जांच एवं परिक्षण जारी है. इस सेवा पे आपके विचार एवं सुझाव हमें ज़रूर भेजें. हम से समपर्क करने के लिए <a href="contact.html">इधर क्लिक करें</a>.</p>
<p>चलोबेस्ट एस.एम.एस सेवा ही लोकांकरीता असल्याने त्याचे परिक्षण चालु आहे, तुमच्या अभिप्राय आणि सुचनेचे आम्ही स्वागत करतो. संपर्क साधण्यासाठी <a href="contact.html">येथे क्लिक करा.</a></p>
</div>
</div>
</div>

View File

@ -40,10 +40,10 @@
</div> </div>
<div class="navprimary lightgreen">
<ul class="navlink">
<li><a href="/android" class="sms small">Android</a></li>
<!-- <li><a href="/android" class="sms small">Android</a></li> -->
<li><a href="/sms" class="sms small">SMS</a></li>
<li class="tripli"><a href="http://trip.chalobest.in" class="trip small">Trip planner</a></li>
<li class="tripli"><a href="/" class="trip small selected">Bus Guide</a></li>
<!-- <li class="tripli"><a href="http://trip.chalobest.in" class="trip small">Trip planner</a></li> -->
<!-- <li class="tripli"><a href="/" class="trip small selected">Bus Guide</a></li> -->
</ul>
</div>
<div class="g8_gut"></div>

View File

@ -0,0 +1,36 @@
{% extends 'innov/base.html' %}
{% block content %}
<div class="g3">
<!-- <div class="leading40"></div>
<div class="g3_3 listtitlesmall"><h3>ChaloBEST</h3></div>
<div class="g3_3 staticpage lightgrey">
<div class="box">
<p>[Some quote about ChaloBEST]</p>
</div>
</div> -->
</div>
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
<form action="" method="post">
<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='YzyQypsxOcO4XfKWrUy8jMaaWoYtmdGv' /></div>
<fieldset>
<h1><legend>Sign in</legend></h1>
<p>No account yet? <a href="signup.html">Sign up here</a></p>
<label for="id_identification">Email or username</label><input id="id_identification" class="tripinput" type="text" class="required" name="identification" />
<label for="id_password">Password</label><input id="id_password" class="tripinput" type="password" class="required" name="password" />
<p class="small"><label for="id_remember_me"><input type="checkbox" name="remember_me" id="id_remember_me" /> Remember me for a month</label></p>
</fieldset>
<input type="submit" value="Sign in" />
<p class="small"><a href='/accounts/password/reset/' title="Forgot your password?">Forgot your password?</a></p>
</form>
</div>
<div class="leading40"></div>
<div class="leading40"></div>
</div>
<div class="g3">
</div>
{% endblock %}

View File

@ -0,0 +1,61 @@
{% extends 'innov/base.html' %}
{% block content %}
<div class="g3">
<!-- <div class="leading40"></div>
<div class="g3_3 listtitlesmall"><h3>ChaloBEST</h3></div>
<div class="g3_3 staticpage lightgrey">
<div class="box">
<p>[Some quote about ChaloBEST]</p>
</div>
</div> -->
</div>
<div class="g6">
<div class="leading40"></div>
<div class="g6_6 staticpage main">
<form action="" method="post">
<div style='display:none'><input type='hidden' name='csrfmiddlewaretoken' value='YzyQypsxOcO4XfKWrUy8jMaaWoYtmdGv' /></div>
<fieldset>
<h1><legend>Sign up</legend></h1>
<p>Already have an account? <a href="signin.html">Sign in here</a></p>
<div class="divline">
<div class="divlabel"><label for="id_username">Username</label></div>
<div class="divinput"><input id="id_username" type="text" class="required" name="username" maxlength="30" /></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_email">Email</label></div>
<div class="divinput"><input id="id_email" type="text" class="required" name="email" maxlength="75" /></div>
</div>
<div class="leading20"></div>
<div class="divline">
<div class="divlabel"><label for="id_password1">Create password</label></div>
<div class="divinput"><input id="id_password1" type="password" class="required" name="password1" /></div>
</div>
<div class="divline">
<div class="divlabel"><label for="id_password2">Repeat password</label></div>
<div class="divinput"><input id="id_password2" type="password" class="required" name="password2" /></div>
</div>
</fieldset>
<div class="divline">
<div class="divlabel">&nbsp;</div>
<div class="divinput"><input type="submit" value="Sign up" /></div>
</div>
</form>
</div>
<div class="leading40"></div>
<div class="leading40"></div>
<div class="leading40"></div>
</div>
<div class="g3">
<!-- <div class="g3_3 ">
<div class="highlight">
<h2>ChaloBEST newsletter</h2>
<div class="leading20"></div>
<p class="small">Sign up for our newsletter.</p>
</div>
</div> -->
</div>
{% endblock %}

View File

@ -0,0 +1,46 @@
{% extends 'innov/base.html' %}
{% block content %}
<div class="g2"></div>
<div class="g7">
<div class="leading30"></div>
<div class="g9_9 staticpage main">
<div class=""><h1 class="hwider darkgrey">Free public transport tools for Mumbai on SMS, web & smartphone</h1></div>
<div class="leading20"></div>
<h1>SMS 96195.24420 &nbsp; &nbsp; - &nbsp; &nbsp; एस.एम.एस. ९६१९५२४४२०</h1>
<h3>Find your way by SMS(*))! <a href="sms.html">Available for English, मराठी and हिन्दी</a></h3>
<p></p>
<p>(*) Normal SMS charges applicable as per carrier rate and plan.<br />
(*) या सुविधेसाठी तुमच्या एस.एम.एस सेवेचा नियमीत शुल्क आकारले जातील. <br />
(*) सुविधा पे सामान्य SMS शुल्क लागू </p>
<div class="leading40"></div>
<h2>Coming soon:</h2>
<div class="g9_9">
<div class="g9_3">
<img src="img/ChaloBEST_laptop.png" alt="ChaloBEST Mumbai BEST Bus Guide to be launched soon" />
</div>
<div class="g9_3">
<img src="img/android_screenshot.png" alt="ChaloBEST Mumbai Android Route planner to be launched soon" />
</div>
</div>
</div>
</div>
<div class="g3">
<div class="g3_3 ">
<div class="highlight">
<h2>ChaloBEST SMS:</h2>
<p>In English, मराठी and हिन्दी </p>
<ul>
<li><b>Directions: </b><br /> "<span>[stop name]</span><b> to </b><span>[stop name]</span>"</li>
<li><b>Buses at your stop:</b><br /> "<span>[stop name]</span>"</li>
<li><b>Bus stop list &amp; frequency:</b><br /> "<span>[number]</span>"</li>
<li>SMS to <b>9619524420</b></li>
</ul>
<p><a href="SMS.html">Detailed instructions</a></p>
</div>
</div>
</div>
{% endblock content %}

View File

@ -31,6 +31,11 @@ def get_routes_for_matches(stops):
return routes
def get_stops_for_string(s):
'''
Returns a dict with name and stops to associate with given search string.
First looks at areas, if string matches an area, returns area as name and all stops within that area as stops.
If search term does not match an area, returns the first / best match of stop to string. If there are multiple stops with the same name, returns all of them in the list of stops.
'''
stops = []
s = s.strip()
# areas = ChaloBest.areas(q=s)
@ -78,8 +83,9 @@ class App(AppBase):
origin_name, dest_name = origin['display_name'], dest['display_name']
origin_area, dest_area = PUNCT.sub('', origin['area']), PUNCT.sub('', dest['area'])
url = "http://chalobest.in" + detail['route']['url']
msg.respond("%s: %s (%s) to %s (%s) %s" % (
",".join(routes), origin_name, origin_area, dest_name, dest_area, url))
response = "%s: %s (%s) to %s (%s) %s" % (
",".join(routes), origin_name, origin_area, dest_name, dest_area, url)
elif msg.text.find(" to ") != -1:
from_txt = msg.text.lower().split("to")[0].strip()
@ -109,9 +115,8 @@ class App(AppBase):
response = "%s to %s: %s" % (from_matches['name'], to_matches['name'], routesFound,)
if len(response) > MAX_MSG_LEN:
response = response[0:MAX_MSG_LEN]
msg.respond(response)
#msg.respond("%s to %s: %s" % (from_matches['name'], to_matches['name'], routesFound,))
return
else:
@ -135,4 +140,5 @@ class App(AppBase):
if len(response) > MAX_MSG_LEN:
response = response[:MAX_MSG_LEN-(len(STYLE["end"])+4)] + "..."
response += STYLE["end"]
msg.respond(response)
msg.respond(response)