LenaSYS

Merge lp:~adamringhede/lenasys/branch into lp:~lenasysimpl1/lenasys/GammaBear

  1. branch
  2. Merge into GammaBear
Proposed by Adam Ringhede
Status: Merged
Merged at revision: 22
Proposed branch: lp:~adamringhede/lenasys/branch
Merge into: lp:~lenasysimpl1/lenasys/GammaBear
Diff against target: 373 lines (+138/-36)
5 files modified
Code Viewer Alt/index.js (+5/-3)
Code Viewer Alt/style.css (+16/-9)
CodeViewer/Lindex.css (+56/-21)
CodeViewer/Lindex.html (+6/-3)
CodeViewer/Lindex.js (+55/-0)
To merge this branch: bzr merge lp:~adamringhede/lenasys/branch
Reviewer Review Type Date Requested Status
GammaBjörn Pending
Review via email: mp+157338@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Code Viewer Alt/index.js'
--- Code Viewer Alt/index.js 2013-04-04 16:28:40 +0000
+++ Code Viewer Alt/index.js 2013-04-05 12:03:30 +0000
@@ -15,11 +15,13 @@
15 scrollTo(destination);15 scrollTo(destination);
16 });16 });
17 var sidebar = $('#sidebar');17 var sidebar = $('#sidebar');
18 $(document).bind('scroll', function() {18 $(window).bind('scroll', function() {
19 sidebar.css("top", $(window).scrollTop());19 sidebar.css("top", $(window).scrollTop());
20 });20 });
21 $('.ieCSS3Fix, .menuLink').each(function() {21 $('.ieCSS3Fix, .group h2').each(function() {
22 PIE.attach(this);22 if(PIE.attach) {
23 PIE.attach(this);
24 }
23 });25 });
24});26});
2527
2628
=== modified file 'Code Viewer Alt/style.css'
--- Code Viewer Alt/style.css 2013-04-04 16:28:40 +0000
+++ Code Viewer Alt/style.css 2013-04-05 12:03:30 +0000
@@ -35,11 +35,13 @@
35 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );35 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );
36 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);36 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
37 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);37 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
38 -pie-background: linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
38 font-size: 1.4em;39 font-size: 1.4em;
39 margin-top: 1em;40 margin-top: 1em;
40 margin-bottom: 0;41 margin-bottom: 0;
41 padding:3px;42 padding:3px;
42 padding-left:20px;43 padding-left:20px;
44 min-width:100%;
43}45}
4446
45a {47a {
@@ -75,13 +77,10 @@
75 position:absolute;77 position:absolute;
76 top:40px;78 top:40px;
77 left:0px;79 left:0px;
78 width:10.5%;80 width:90%;
79 width:96%;81 padding: 10px 0 8% 8%;
80 padding: 10px 0 1% 0.3%;
81 background: #c0d0e0;82 background: #c0d0e0;
82 background-color: #c0d0e0;83 background-color: #c0d0e0;
83 _border-bottom-right-radius: 1.3em;
84 _border-top-right-radius: 1.3em;
85 border-radius: 0 1.3em 1.3em 0;84 border-radius: 0 1.3em 1.3em 0;
86 border-bottom: 2px solid #000;85 border-bottom: 2px solid #000;
87 border-right: 1px solid #000;86 border-right: 1px solid #000;
@@ -93,15 +92,17 @@
93 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );92 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );
94 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);93 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
95 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);94 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
95 -pie-background: linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
96}96}
9797
98#menu #menuHeader{98#menu #menuHeader{
99 margin:0 0 1.5% 0;99 margin:0 0 1.5% 0;
100 position:relative;
100 background:#333333;101 background:#333333;
101 width:97%;102 width:97%;
102 height:31px;103 height:31px;
103 padding-left:10px;104 padding-left:14px;
104 margin-left:-10px;105 margin-left:-15px;
105 border-radius: 0 10px 10px 0;106 border-radius: 0 10px 10px 0;
106 cursor:pointer;107 cursor:pointer;
107}108}
@@ -130,6 +131,12 @@
130 text-decoration: none; 131 text-decoration: none;
131 margin-left:1%;132 margin-left:1%;
132 font-size:100%133 font-size:100%
134
135 /* For IE 8 */
136 -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=-90, Color='#444444')";
137 /* For IE 5.5 - 7 */
138 filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=-90, Color='#444444');
139 filter:DropShadow(Color=#444444, OffX=1, OffY=2);
133}140}
134141
135#menu a:hover {142#menu a:hover {
@@ -147,7 +154,7 @@
147 left:0px;154 left:0px;
148 top:0px;155 top:0px;
149 float:left;156 float:left;
150 min-width:8em;157 min-width:9.4em;
151 width:auto;158 width:auto;
152 height:100%;159 height:100%;
153 overflow:auto;160 overflow:auto;
@@ -155,7 +162,7 @@
155162
156#content { 163#content {
157 position:absolute;164 position:absolute;
158 left:8em;165 left:9.5em;
159 max-width:75%;166 max-width:75%;
160 min-width:20em;167 min-width:20em;
161}168}
162169
=== modified file 'CodeViewer/Lindex.css'
--- CodeViewer/Lindex.css 2013-04-05 08:14:27 +0000
+++ CodeViewer/Lindex.css 2013-04-05 12:03:30 +0000
@@ -1,4 +1,4 @@
1.group {1.group {
2 display: block;2 display: block;
3 padding: 1em;3 padding: 1em;
4 width: 100%;4 width: 100%;
@@ -10,18 +10,17 @@
10 font-weight: normal;10 font-weight: normal;
11 font-size: 1.8em;11 font-size: 1.8em;
12 margin-bottom: 1em;12 margin-bottom: 1em;
13
14 font-family: Cambria, Georgia, serif;13 font-family: Cambria, Georgia, serif;
15}14}
1615
17.group .info { 16.group.info {
18 padding: 0.4em;17 padding: 0.4em;
19 margin: 0.5em;18 margin: 0.5em;
20 font-size: 1em;19 font-size: 1em;
21 color: #000;20 color: #000;
22}21}
2322
24.group .info:first-letter { 23.group .info:first-letter {
25 font-size:1.3em;24 font-size:1.3em;
26}25}
2726
@@ -36,11 +35,13 @@
36 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );35 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );
37 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);36 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
38 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);37 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
38 -pie-background: linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
39 font-size: 1.4em;39 font-size: 1.4em;
40 margin-top: 1em;40 margin-top: 1em;
41 margin-bottom: 0;41 margin-bottom: 0;
42 padding:3px;42 padding:3px;
43 padding-left:20px;43 padding-left:20px;
44 min-width:100%;
44}45}
4546
46a {47a {
@@ -64,23 +65,24 @@
64 margin-left: 8px; 65 margin-left: 8px;
65}66}
6667
67.container .demo {68.container.demo {
68 float:right;69 float:right;
69}70}
7071
71body {72body{
72 margin:0;73 margin:0;
73}74}
7475
75#menu {76#menu {
76 position:fixed;77 position:absolute;
77 top:40px;78 top:40px;
79 left:0px;
78 width:10.5%;80 width:10.5%;
81 width:96%;
79 padding: 10px 0 1% 0.3%;82 padding: 10px 0 1% 0.3%;
80 background: #c0d0e0;83 background: #c0d0e0;
81 background-color: #c0d0e0;84 background-color: #c0d0e0;
82 border-bottom-right-radius: 1.3em;85 border-radius: 0 1.3em 1.3em 0;
83 border-top-right-radius: 1.3em;
84 border-bottom: 2px solid #000;86 border-bottom: 2px solid #000;
85 border-right: 1px solid #000;87 border-right: 1px solid #000;
86 color: #fff;88 color: #fff;
@@ -91,17 +93,19 @@
91 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );93 background: linear-gradient(to top, #abc 10%, #89a 90%, #678 99% );
92 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);94 background: -webkit-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
93 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);95 background: -moz-linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
9496 -pie-background: linear-gradient(bottom, #abc 10%, #89a 90%, #678 99%);
95}97}
9698
97#menu #menuHeader {99#menu #menuHeader{
98 margin:0 0 1.5% 0;100 margin:0 0 1.5% 0;
101 position:relative;
99 background:#333333;102 background:#333333;
100 width:97%;103 width:97%;
101 height:31px;104 height:31px;
102 padding-left:10px;105 padding-left:10px;
103 margin-left:-10px;106 margin-left:-10px;
104 border-radius: 0 10px 10px 0107 border-radius: 0 10px 10px 0;
108 cursor:pointer;
105}109}
106110
107#menuHeader h3{111#menuHeader h3{
@@ -115,39 +119,70 @@
115 padding:0;119 padding:0;
116}120}
117121
118#menuArrow{122#menuArrow {
119 float:left;123 float:left;
120 padding:0;124 padding:0;
121 margin-top:8px;125 margin-top:8px;
122 width:15%;126 width:15%;
123}127}
124128
125#menu a{129#menu a {
126 display:block;color:#fff;130 display:block;color:#fff;
127 font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif; 131 font-family: Calibri, Candara, Segoe, "Segoe UI", Optima, Arial, sans-serif;
128 text-decoration: none; 132 text-decoration: none;
129 margin-left:1%;133 margin-left:1%;
130 font-size:100%134 font-size:100%
135
136 /* For IE 8 */
137 -ms-filter: "progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=-90, Color='#444444')";
138 /* For IE 5.5 - 7 */
139 filter: progid:DXImageTransform.Microsoft.Shadow(Strength=4, Direction=-90, Color='#444444');
140 filter:DropShadow(Color=#444444, OffX=1, OffY=2);
131}141}
132142
133#menu a:hover{143#menu a:hover {
134 font-weight:bolder;144 font-weight:bolder;
135 text-decoration:underline;145 text-decoration:underline;
136}146}
137147
138#menuItems{148#menuItems {
139 float:left;149 float:left;
140 width:80%;150 width:80%;
141}151}
142152
143#sidebar{153#sidebar {
154 position:absolute;
155 left:0px;
156 top:0px;
144 float:left;157 float:left;
145 min-width:11%;158 min-width:8em;
146 min-height:100px;159 width:auto;
160 height:100%;
147 overflow:auto;161 overflow:auto;
148}162}
149163
150#content{164#content {
151 float:left;165 position:absolute;
166 left:8em;
152 width:75%;167 width:75%;
168 max-width:75%;
169 min-width:20em;
170}
171
172.arrow{
173 -webkit-transition-duration: 0.9s;
174 -moz-transition-duration: 0.9s;
175 -o-transition-duration: 0.9s;
176 transition-duration: 0.9s;
177 -webkit-transition-property: -webkit-transform;
178 -moz-transition-property: -moz-transform;
179 -o-transition-property: -o-transform;
180 transition-property: transform;
181 overflow:auto;
182}
183
184.rotateArrowCW {
185 -webkit-transform:rotate(180deg);
186 -moz-transform:rotate(180deg);
187 -o-transform:rotate(180deg);
153}188}
154\ No newline at end of file189\ No newline at end of file
155190
=== modified file 'CodeViewer/Lindex.html'
--- CodeViewer/Lindex.html 2013-04-05 08:33:04 +0000
+++ CodeViewer/Lindex.html 2013-04-05 12:03:30 +0000
@@ -3,17 +3,20 @@
3 <head>3 <head>
4 <title>Webbprogrammering DA330G</title>4 <title>Webbprogrammering DA330G</title>
5 <link rel="stylesheet" href="Lindex.css" type="text/css" media="screen" />5 <link rel="stylesheet" href="Lindex.css" type="text/css" media="screen" />
6 <script type="text/javascript" src="../js/jquery.js"></script>
7 <script type="text/javascript" src="../etc/PIE/PIE.js"></script>
8 <script type="text/javascript" src="Lindex.js"></script>
6 </head>9 </head>
7 <body>10 <body>
8 <div id="sidebar">11 <div id="sidebar">
9 <div id="menu">12 <div id="menu" class="ieCSS3Fix">
10 <div id="menuHeader">13 <div id="menuHeader" class="ieCSS3Fix">
11 <h3>Quick links</h3>14 <h3>Quick links</h3>
15 <img id="menuArrow" class="arrow" src="../media/codeviewer/CodeViewerLeftbutton.png" alt="arrow" />
12 </div>16 </div>
13 <div id="menuItems">17 <div id="menuItems">
14 <a href="#LectureSlides" class="menuLink">Lectures</a>18 <a href="#LectureSlides" class="menuLink">Lectures</a>
15 <a href="#Assignments" class="menuLink">Assignments</a>19 <a href="#Assignments" class="menuLink">Assignments</a>
16 <br>
17 <a href="#PHPIntro" class="menuLink">PHP Intro</a>20 <a href="#PHPIntro" class="menuLink">PHP Intro</a>
18 <a href="#SAXExamples" class="menuLink">SAX</a>21 <a href="#SAXExamples" class="menuLink">SAX</a>
19 <a href="#DOMExamples" class="menuLink">DOM</a>22 <a href="#DOMExamples" class="menuLink">DOM</a>
2023
=== added file 'CodeViewer/Lindex.js'
--- CodeViewer/Lindex.js 1970-01-01 00:00:00 +0000
+++ CodeViewer/Lindex.js 2013-04-05 12:03:30 +0000
@@ -0,0 +1,55 @@
1var menuTopOffset = 40;
2var menuLeftOffset = 25;
3
4$(document).ready(function() {
5// window.onresize = fixMenuLeft;
6 //$('#menu').offset({ top: menuTopOffset, left: $('#menu').offset().left });
7 //window.onscroll = moveMenu;
8 $('#menuHeader').click(toggleMenu);/*
9
10 */
11 $("a.menuLink").click(function(event) {
12 event.preventDefault();
13 event.stopPropagation();
14 var destination = event.target.href.substring(event.target.href.lastIndexOf('#') + 1);
15 scrollTo(destination);
16 });
17 var sidebar = $('#sidebar');
18 $(window).bind('scroll', function() {
19 sidebar.css("top", $(window).scrollTop());
20 });
21 $('.ieCSS3Fix, .group h2').each(function() {
22 PIE.attach(this);
23 });
24});
25
26function fixMenuLeft(ev) {
27 //$('#menu').offset({ top: bodyelem.scrollTop()+menuTopOffset, left: -($('#menu').width()-30) });
28 if($('#menu').offset().left != 0) {
29 $('#menu').offset({ top: $('#menu').offset().top, left: -($('#menu').width()-menuLeftOffset) });
30 }
31}
32
33function toggleMenu(ev) {
34 if($('#menu').offset().left == 0) {
35 $('#menu').stop().animate({ left: -($('#menu').width()-menuLeftOffset) },{duration:900});
36 $("#menuArrow").addClass("rotateArrowCW");
37 } else {
38 $('#menu').stop().animate({ left: 0 },{duration:900});
39 $("#menuArrow").removeClass("rotateArrowCW");
40 }
41}
42
43function moveMenu(ev){
44 if($.browser.webkit) {
45 bodyelem = $("body");
46 } else {
47 bodyelem = $("html,body");
48 }
49 $('#menu').offset({ top: bodyelem.scrollTop()+menuTopOffset, left: $('#menu').offset().left });
50}
51
52function scrollTo(id){
53 $('html,body').animate({scrollTop: $("#"+id).offset().top},{duration:900});
54 return false;
55}
0\ No newline at end of file56\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: