diff options
author | christophd@sugarlabs.org <christophd@sugarlabs.org> | 2009-08-27 08:30:37 (GMT) |
---|---|---|
committer | christophd@sugarlabs.org <christophd@sugarlabs.org> | 2009-08-27 08:30:37 (GMT) |
commit | f6ae665680781f086985945095d6e43841085cb0 (patch) | |
tree | 121fe35c81d198dc1318f793d55dc694787946fc | |
parent | 4b7359a53af5ba0fa4c08259a604a8f0a7c8642f (diff) |
added back button in b/w, renamed index_iphone chakra html / css to index (old versions are tagged with _OLD), added back button to chakra navigation bar
-rwxr-xr-x | chakra/css/chakra.css | 170 | ||||
-rwxr-xr-x | chakra/css/chakra_OLD.css | 223 | ||||
-rwxr-xr-x | chakra/css/chakra_iphone.css | 367 | ||||
-rwxr-xr-x | chakra/grade1.html | 2 | ||||
-rwxr-xr-x | chakra/grade1e.html | 2 | ||||
-rwxr-xr-x | chakra/index.html | 78 | ||||
-rwxr-xr-x | chakra/index_OLD.html | 85 | ||||
-rwxr-xr-x | chakra/index_iphone.html | 45 | ||||
-rw-r--r-- | chakra/testdata/back_bw.png | bin | 0 -> 3368 bytes |
9 files changed, 486 insertions, 486 deletions
diff --git a/chakra/css/chakra.css b/chakra/css/chakra.css index 387f8d4..02886ad 100755 --- a/chakra/css/chakra.css +++ b/chakra/css/chakra.css @@ -5,46 +5,187 @@ margin:0; padding:0; } -#nav-menu +#navigation +{ +background:#BDBDBD; +font-weight: bold; +} + +#navigation img +{ +border: none; +height: 30px; +} + +#month +{ +vertical-align: middle; +float: right; +} + +#mainmenu +{ +width:28em; +position: fixed; +left: 50%; +top: 50%; +margin-left: -14em; +margin-top: -10.75em; +} + +#grades { list-style: none; padding: 0; margin: 0; -background:#1C1C1C; +background:#BDBDBD; float:left; -width:100%; +width:auto; } -#nav-menu li +#grades li { float: left; } -#nav-menu li a +#grades li a { -height: 7%; +height: auto; line-height: 2em; width: 7em; text-decoration: none; text-align: center; font-weight: bold; float: left; -color:#FFFFFF; +color:#000000; +} + +#grades img +{ +border: none; +} + +#grades a:hover { + text-decoration: underline; +} + +#grades a.selected { +text-decoration: underline; +} + +#month +{ +list-style: none; +padding: 0; +margin: 0; +background:#BDBDBD; +float:left; +} + +#month li +{ +float: left; +} + +#month li a +{ +height: auto; +padding: 5; +text-decoration: none; +text-align: center; +font-weight: bold; +float: left; +color:#000000; +width: 4em; } -#nav-menu img +#month img { border: none; } -#nav-menu a:hover { +#month a:hover { text-decoration: underline; } -#nav-menu a.selected { +#month a.selected { text-decoration: underline; } + + +#admin +{ +list-style: none; +padding: 0; +margin: 0; +background:#5858FA; +float:left; +width:28em; +} + +#admin li +{ +float: left; +} + +#admin li a +{ +height: 7em; +line-height: 2em; +width: 9em; +text-decoration: none; +text-align: center; +font-weight: bold; +float: left; +color:#000000; +} + +#week +{ +list-style: none; +padding: 0; +margin: 0; +background:#BDBDBD; +float:left; +width: 100%; +} + +#week li +{ +float: left; +} + +#week li a +{ +height: auto; +padding: 5; +text-decoration: none; +text-align: center; +font-weight: bold; +float: left; +color:#000000; +width: 25%; +} + +#week img +{ +border: none; +} + +#week a:hover { + text-decoration: underline; +} + +#week a.selected { +text-decoration: underline; +} + +#admin img +{ +border: none; +} + #chakra { background: #FFFFFF; @@ -143,9 +284,12 @@ text-decoration: underline; #weeks { -background: #A4A4A4; -float: left; -width: 26%; +height: 10em; +} + +#weeks img +{ +border: none; } #lesson_select diff --git a/chakra/css/chakra_OLD.css b/chakra/css/chakra_OLD.css new file mode 100755 index 0000000..387f8d4 --- /dev/null +++ b/chakra/css/chakra_OLD.css @@ -0,0 +1,223 @@ +body +{ +background:#A4A4A4; +margin:0; +padding:0; +} + +#nav-menu +{ +list-style: none; +padding: 0; +margin: 0; +background:#1C1C1C; +float:left; +width:100%; +} + +#nav-menu li +{ +float: left; +} + +#nav-menu li a +{ +height: 7%; +line-height: 2em; +width: 7em; +text-decoration: none; +text-align: center; +font-weight: bold; +float: left; +color:#FFFFFF; +} + +#nav-menu img +{ +border: none; +} + +#nav-menu a:hover { + text-decoration: underline; +} + +#nav-menu a.selected { +text-decoration: underline; +} + +#chakra +{ +background: #FFFFFF; +width: 50px; +} + +#chakra img +{ +float: left; +width: 50px; +height: 50px; +} + +#grade-menu +{ +list-style: none; +padding: 0; +margin: 0; +background: #585858; +float:left; +width:100%; +} + +#grade-menu li +{ +float: left; +} + +#grade-menu li a +{ +height: 7%; +width: 7em; +text-decoration: none; +text-align: center; +font-weight: bold; +float: left; +color:#000000; +} + +#grade-menu a:hover { +text-decoration: underline; +} + +#grade-menu a.selected { +text-decoration: underline; +} + +#lessonlist ul +{ +list-style: none; +padding: 0.1em; +float: left; +} + +#lessonlist ul li ul +{ +float: right; +} + +#lessonlist li +{ +float: left; +margin: 0 0.15em; +} + +#lessonlist +{ +#float: left; +} + +#lessonlist li a +{ +height: 1.5em; +line-height: 1.5em; +width: 1.5em; +display: block; +border: 0.1em solid #dcdce9; +color: #0d2474; +text-decoration: none; +text-align: center; +background: #BDBDBD; +} + +#lessons a:hover { +background:#FFFFFF; +border-bottom:1px solid #dcdce9; +text-decoration: underline; +} + +#lessons a.selected { +background:#FFFFFF; +color:#CC0000; +font-weight:bold; +text-decoration: underline; +} + +#weeks +{ +background: #A4A4A4; +float: left; +width: 26%; +} + +#lesson_select +{ +width: 74%; +height: 100%; +background: #BDBDBD; +float: left; +text-align: center; +} + +#topleft_lesson +{ +float: left; +width: 50%; +} + +#topright_lesson +{ +float: left; +width: 50%; +} + +#bottomleft_lesson +{ +float: left; +width: 50%; +} + +#bottomright_lesson +{ +float: left; +width: 50%; +} + +#lesson_list +{ +padding: 0.4em; +} + +#lesson_item +{ +height: 15em; +background: #848484; +} + +#lesson_separator +{ +height: 0.5em; +} + +#name a +{ +font-size: 150%; +font-weight: bold; +} + +#name img +{ +float: right; +padding: 0.5em; +} + +#grade_week a +{ +font-size: 120%; +} + +#menu_assessment a +{ +} + +#docs +{ +} diff --git a/chakra/css/chakra_iphone.css b/chakra/css/chakra_iphone.css deleted file mode 100755 index 02886ad..0000000 --- a/chakra/css/chakra_iphone.css +++ /dev/null @@ -1,367 +0,0 @@ -body -{ -background:#A4A4A4; -margin:0; -padding:0; -} - -#navigation -{ -background:#BDBDBD; -font-weight: bold; -} - -#navigation img -{ -border: none; -height: 30px; -} - -#month -{ -vertical-align: middle; -float: right; -} - -#mainmenu -{ -width:28em; -position: fixed; -left: 50%; -top: 50%; -margin-left: -14em; -margin-top: -10.75em; -} - -#grades -{ -list-style: none; -padding: 0; -margin: 0; -background:#BDBDBD; -float:left; -width:auto; -} - -#grades li -{ -float: left; -} - -#grades li a -{ -height: auto; -line-height: 2em; -width: 7em; -text-decoration: none; -text-align: center; -font-weight: bold; -float: left; -color:#000000; -} - -#grades img -{ -border: none; -} - -#grades a:hover { - text-decoration: underline; -} - -#grades a.selected { -text-decoration: underline; -} - -#month -{ -list-style: none; -padding: 0; -margin: 0; -background:#BDBDBD; -float:left; -} - -#month li -{ -float: left; -} - -#month li a -{ -height: auto; -padding: 5; -text-decoration: none; -text-align: center; -font-weight: bold; -float: left; -color:#000000; -width: 4em; -} - -#month img -{ -border: none; -} - -#month a:hover { - text-decoration: underline; -} - -#month a.selected { -text-decoration: underline; -} - - - -#admin -{ -list-style: none; -padding: 0; -margin: 0; -background:#5858FA; -float:left; -width:28em; -} - -#admin li -{ -float: left; -} - -#admin li a -{ -height: 7em; -line-height: 2em; -width: 9em; -text-decoration: none; -text-align: center; -font-weight: bold; -float: left; -color:#000000; -} - -#week -{ -list-style: none; -padding: 0; -margin: 0; -background:#BDBDBD; -float:left; -width: 100%; -} - -#week li -{ -float: left; -} - -#week li a -{ -height: auto; -padding: 5; -text-decoration: none; -text-align: center; -font-weight: bold; -float: left; -color:#000000; -width: 25%; -} - -#week img -{ -border: none; -} - -#week a:hover { - text-decoration: underline; -} - -#week a.selected { -text-decoration: underline; -} - -#admin img -{ -border: none; -} - -#chakra -{ -background: #FFFFFF; -width: 50px; -} - -#chakra img -{ -float: left; -width: 50px; -height: 50px; -} - -#grade-menu -{ -list-style: none; -padding: 0; -margin: 0; -background: #585858; -float:left; -width:100%; -} - -#grade-menu li -{ -float: left; -} - -#grade-menu li a -{ -height: 7%; -width: 7em; -text-decoration: none; -text-align: center; -font-weight: bold; -float: left; -color:#000000; -} - -#grade-menu a:hover { -text-decoration: underline; -} - -#grade-menu a.selected { -text-decoration: underline; -} - -#lessonlist ul -{ -list-style: none; -padding: 0.1em; -float: left; -} - -#lessonlist ul li ul -{ -float: right; -} - -#lessonlist li -{ -float: left; -margin: 0 0.15em; -} - -#lessonlist -{ -#float: left; -} - -#lessonlist li a -{ -height: 1.5em; -line-height: 1.5em; -width: 1.5em; -display: block; -border: 0.1em solid #dcdce9; -color: #0d2474; -text-decoration: none; -text-align: center; -background: #BDBDBD; -} - -#lessons a:hover { -background:#FFFFFF; -border-bottom:1px solid #dcdce9; -text-decoration: underline; -} - -#lessons a.selected { -background:#FFFFFF; -color:#CC0000; -font-weight:bold; -text-decoration: underline; -} - -#weeks -{ -height: 10em; -} - -#weeks img -{ -border: none; -} - -#lesson_select -{ -width: 74%; -height: 100%; -background: #BDBDBD; -float: left; -text-align: center; -} - -#topleft_lesson -{ -float: left; -width: 50%; -} - -#topright_lesson -{ -float: left; -width: 50%; -} - -#bottomleft_lesson -{ -float: left; -width: 50%; -} - -#bottomright_lesson -{ -float: left; -width: 50%; -} - -#lesson_list -{ -padding: 0.4em; -} - -#lesson_item -{ -height: 15em; -background: #848484; -} - -#lesson_separator -{ -height: 0.5em; -} - -#name a -{ -font-size: 150%; -font-weight: bold; -} - -#name img -{ -float: right; -padding: 0.5em; -} - -#grade_week a -{ -font-size: 120%; -} - -#menu_assessment a -{ -} - -#docs -{ -} diff --git a/chakra/grade1.html b/chakra/grade1.html index 66aa555..721a35a 100755 --- a/chakra/grade1.html +++ b/chakra/grade1.html @@ -20,7 +20,7 @@ <div id="mainmenu"> <div id="navigation"> -<a href="index_iphone.html"><img src="testdata/chakra_logo.png" alt="Home" title="Home"></a> <img src="testdata/grade1.png" alt="Grade 1" title="Grade 1"> <img align="right" src="testdata/help.png" alt="Help" title="Help"> +<a href="index.html"><img src="testdata/chakra_logo.png" alt="Home" title="Home"></a> <img src="testdata/back.png" alt="Back" title="Back"> <img align="right" src="testdata/help.png" alt="Help" title="Help"> </div> <ul id="grades" class="usual"> <li id="grade1"><a href="grade1e.html"><img src="testdata/01_10.png" width="100px" alt="English" title="English">English</a></li> diff --git a/chakra/grade1e.html b/chakra/grade1e.html index 0c23aab..3bd321f 100755 --- a/chakra/grade1e.html +++ b/chakra/grade1e.html @@ -20,7 +20,7 @@ <div id="mainmenu"> <div id="navigation"> -<a href="index_iphone.html"><img src="testdata/chakra_logo.png" alt="Home" title="Home"></a> <a href="grade1.html"><img src="testdata/grade1.png" alt="Grade 1" title="Grade 1"></a> <img src="testdata/01_10.png" alt="English" title="Grade 1 - English"> <img align="right" src="testdata/help.png" alt="Help" title="Help"> +<a href="index.html"><img src="testdata/chakra_logo.png" alt="Home" title="Home"></a> <a href="grade1.html"><img src="testdata/back.png" alt="Back" title="Back"></a> <img align="right" src="testdata/help.png" alt="Help" title="Help"> </div> <div id="month_select"> <ul id="month" class="usual"> diff --git a/chakra/index.html b/chakra/index.html index 16dde99..2afc9ab 100755 --- a/chakra/index.html +++ b/chakra/index.html @@ -18,68 +18,28 @@ <body> -<ul id="nav-menu" class="usual"> -<li id="grade2"><a href="#tab_grade2">Grade 2</a></li> -<li id="grade3"><a href="#tab_grade3">Grade 3</a></li> -<li id="grade6"><a href="#tab_grade6">Grade 6</a></li> -<li id="menu_assessment"><a href="#tab_assessment">Assessment</a></li> +<div id="mainmenu"> +<div id="navigation"> +<img src="testdata/chakra_logo.png" alt="Home" title="Home"> <img src="testdata/back_bw.png" alt="Back"> <img align="right" src="testdata/help.png" alt="Help" title="Help"> +</div> +<ul id="grades" class="usual"> +<li id="grade1"><a href="grade1.html"><img src="testdata/grade1.png" alt="Grade 1" title="grade1">Grade 1</a></li> +<li id="grade2"><a href="#tab_grade2"><img src="testdata/grade2.png" alt="Grade 2" title="grade2">Grade 2</a></li> +<li id="grade3"><a href="#tab_grade3"><img src="testdata/grade3.png" alt="Grade 3" title="grade3">Grade 3</a></li> +<li id="grade4"><a href="#tab_grade4"><img src="testdata/grade4.png" alt="Grade 4" title="grade4">Grade 4</a></li> </ul> - -<div id="tab_grade2"> -<div id="grade-menu"> -<ul id="grade-menu" class="usual"> -<li id="grade2"><a href="#tab_grade2e">English</a></li> -<li id="grade3"><a href="#tab_grade2m">Mathematics</a></li> -<li id="grade6"><a href="#tab_grade2n">Nepali</a></li> +<ul id="grades" class="usual"> +<li id="grade5"><a href="#tab_grade5"><img src="testdata/grade5.png" alt="Grade 5" title="grade5">Grade 5</a></li> +<li id="grade6"><a href="#tab_grade6"><img src="testdata/grade6.png" alt="Grade 6" title="grade6">Grade 6</a></li> +<li id="grade7"><a href="#tab_grade7"><img src="testdata/grade7.png" alt="Grade 7" title="grade7">Grade 7</a></li> +<li id="grade8"><a href="#tab_grade8"><img src="testdata/grade8.png" alt="Grade 8" title="grade8">Grade 8</a></li> +</ul> +<ul id="admin" class="usual"> +<li id="profile"><a href="#tab_profile"><img src="testdata/profile.png" alt="Student Profile" title="profile"><br />Student Profile</a></li> +<li id="mystuff"><a href="#tab_mystuff"><img src="testdata/mystuff.png" alt="My Stuff" title="mystuff"><br />My Stuff</a></li> +<li id="about"><a href="#tab_about"><img src="testdata/about.png" width="80px" alt="About Karma" title="about"><br />About Karma</a></li> </ul> - -<div id="tab_grade2e"> -<div id="grade2e"> -<iframe frameborder="0" src="grade2e.html" width="100%" height="85%" name="grade_subject"> -</iframe> -</div> -</div> - -<div id="tab_grade2m"> -<div id="grade2m"> -<iframe frameborder="0" src="grade2m.html" width="100%" height="85%" name="grade_subject"> -</iframe> -</div> -</div> - -<div id="tab_grade2n"> -<div id="grade2n"> -<iframe frameborder="0" src="grade2n.html" width="100%" height="86%" name="grade_subject"> -</iframe> -</div> -</div> - -</div> -</div> - -<div id="tab_grade3"> -<div id="grade3"> -Grade 3 -</div> -</div> - -<div id="tab_grade6"> -<div id="grade6"> -Grade 6 -</div> -</div> - -<div id="tab_assessment"> -Assessment </div> -<script type="text/javascript"> - $("#grade-menu").idTabs(); -</script> - -<script type="text/javascript"> - $("#nav-menu").idTabs(); -</script> - </body> </html> diff --git a/chakra/index_OLD.html b/chakra/index_OLD.html new file mode 100755 index 0000000..16dde99 --- /dev/null +++ b/chakra/index_OLD.html @@ -0,0 +1,85 @@ +<html lang="en"> + +<head> +<title>Chakra (Alpha)</title> +<meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal"> +<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> +<meta charset="utf-8"> + +<link rel="stylesheet" href="css/chakra.css" type="text/css"/> +<link rel="stylesheet" href="css/jquery.jgrowl.css" type="text/css"/> + +<script type="text/javascript" src="js/jquery-1.3.2.min.js"></script> +<script type="text/javascript" src="js/jquery.ui.all.js"></script> +<script type="text/javascript" src="js/jquery.jgrowl_minimized.js"></script> +<script type="text/javascript" src="js/jquery.idTabs.min.js"></script> + +</head> + +<body> + +<ul id="nav-menu" class="usual"> +<li id="grade2"><a href="#tab_grade2">Grade 2</a></li> +<li id="grade3"><a href="#tab_grade3">Grade 3</a></li> +<li id="grade6"><a href="#tab_grade6">Grade 6</a></li> +<li id="menu_assessment"><a href="#tab_assessment">Assessment</a></li> +</ul> + +<div id="tab_grade2"> +<div id="grade-menu"> +<ul id="grade-menu" class="usual"> +<li id="grade2"><a href="#tab_grade2e">English</a></li> +<li id="grade3"><a href="#tab_grade2m">Mathematics</a></li> +<li id="grade6"><a href="#tab_grade2n">Nepali</a></li> +</ul> + +<div id="tab_grade2e"> +<div id="grade2e"> +<iframe frameborder="0" src="grade2e.html" width="100%" height="85%" name="grade_subject"> +</iframe> +</div> +</div> + +<div id="tab_grade2m"> +<div id="grade2m"> +<iframe frameborder="0" src="grade2m.html" width="100%" height="85%" name="grade_subject"> +</iframe> +</div> +</div> + +<div id="tab_grade2n"> +<div id="grade2n"> +<iframe frameborder="0" src="grade2n.html" width="100%" height="86%" name="grade_subject"> +</iframe> +</div> +</div> + +</div> +</div> + +<div id="tab_grade3"> +<div id="grade3"> +Grade 3 +</div> +</div> + +<div id="tab_grade6"> +<div id="grade6"> +Grade 6 +</div> +</div> + +<div id="tab_assessment"> +Assessment +</div> + +<script type="text/javascript"> + $("#grade-menu").idTabs(); +</script> + +<script type="text/javascript"> + $("#nav-menu").idTabs(); +</script> + +</body> +</html> diff --git a/chakra/index_iphone.html b/chakra/index_iphone.html deleted file mode 100755 index e27ee57..0000000 --- a/chakra/index_iphone.html +++ /dev/null @@ -1,45 +0,0 @@ -<html lang="en"> - -<head> -<title>Chakra (Alpha)</title> -<meta name="keywords" content="karma,javascript,html5,sugar,sugarlabs,gsoc,ole,nepal"> -<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> -<meta charset="utf-8"> - -<link rel="stylesheet" href="css/chakra_iphone.css" type="text/css"/> -<link rel="stylesheet" href="css/jquery.jgrowl.css" type="text/css"/> - -<script type="text/javascript" src="js/jquery-1.3.2.min.js"></script> -<script type="text/javascript" src="js/jquery.ui.all.js"></script> -<script type="text/javascript" src="js/jquery.jgrowl_minimized.js"></script> -<script type="text/javascript" src="js/jquery.idTabs.min.js"></script> - -</head> - -<body> - -<div id="mainmenu"> -<div id="navigation"> -<img src="testdata/chakra_logo.png" alt="Home" title="Home"> <img align="right" src="testdata/help.png" alt="Help" title="Help"> -</div> -<ul id="grades" class="usual"> -<li id="grade1"><a href="grade1.html"><img src="testdata/grade1.png" alt="Grade 1" title="grade1">Grade 1</a></li> -<li id="grade2"><a href="#tab_grade2"><img src="testdata/grade2.png" alt="Grade 2" title="grade2">Grade 2</a></li> -<li id="grade3"><a href="#tab_grade3"><img src="testdata/grade3.png" alt="Grade 3" title="grade3">Grade 3</a></li> -<li id="grade4"><a href="#tab_grade4"><img src="testdata/grade4.png" alt="Grade 4" title="grade4">Grade 4</a></li> -</ul> -<ul id="grades" class="usual"> -<li id="grade5"><a href="#tab_grade5"><img src="testdata/grade5.png" alt="Grade 5" title="grade5">Grade 5</a></li> -<li id="grade6"><a href="#tab_grade6"><img src="testdata/grade6.png" alt="Grade 6" title="grade6">Grade 6</a></li> -<li id="grade7"><a href="#tab_grade7"><img src="testdata/grade7.png" alt="Grade 7" title="grade7">Grade 7</a></li> -<li id="grade8"><a href="#tab_grade8"><img src="testdata/grade8.png" alt="Grade 8" title="grade8">Grade 8</a></li> -</ul> -<ul id="admin" class="usual"> -<li id="profile"><a href="#tab_profile"><img src="testdata/profile.png" alt="Student Profile" title="profile"><br />Student Profile</a></li> -<li id="mystuff"><a href="#tab_mystuff"><img src="testdata/mystuff.png" alt="My Stuff" title="mystuff"><br />My Stuff</a></li> -<li id="about"><a href="#tab_about"><img src="testdata/about.png" width="80px" alt="About Karma" title="about"><br />About Karma</a></li> -</ul> -</div> - -</body> -</html> diff --git a/chakra/testdata/back_bw.png b/chakra/testdata/back_bw.png Binary files differnew file mode 100644 index 0000000..126380d --- /dev/null +++ b/chakra/testdata/back_bw.png |