Skip to content

Commit 2e3efb7

Browse files
galadrilgaladril
committed
Added a News page (RSS)
Added a News page (RSS)
1 parent 3f5bd12 commit 2e3efb7

13 files changed

+365
-2
lines changed

‎css/main.css

+28-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,34 @@ h5 {
2626
margin-left:5px;
2727
}
2828

29+
/***********NEWS***********/
30+
.rssHeader{
31+
font-family: 'Open Sans', sans-serif;
32+
font-weight: bold;
33+
font-size: 30px;
34+
line-height: 26px;
35+
letter-spacing: 0px;
36+
padding-top:10px;
37+
padding-bottom:14px;
38+
padding-left:5px;
39+
margin-top:2px;
40+
text-align:center;
41+
}
42+
.rssMedia{
43+
display:none;
44+
}
45+
46+
.rssRow div{
47+
float:right;
48+
color: #9e9e9e;
49+
font-size: 10px;
50+
padding-right: 10px;
51+
margin-top: -25px;
52+
}
53+
.rssRow {
54+
padding: 10px;
55+
}
56+
2957
/***********BLOCKS & WRAPS***********/
3058

3159
/*--- Dash Unit / Used in Dashboard page ---*/
@@ -81,7 +109,6 @@ h5 {
81109
font-size: 30px;
82110
line-height: 26px;
83111
letter-spacing: 0px;
84-
color: #ffffff;
85112
padding-top:10px;
86113
padding-left:5px;
87114
margin-top:2px;

‎css/mainLight.css

+29
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,35 @@ h5 {
4444
margin-left:5px;
4545
}
4646

47+
48+
/***********NEWS***********/
49+
.rssHeader{
50+
font-family: 'Open Sans', sans-serif;
51+
font-weight: bold;
52+
font-size: 30px;
53+
line-height: 26px;
54+
letter-spacing: 0px;
55+
padding-top:10px;
56+
padding-bottom:14px;
57+
padding-left:5px;
58+
margin-top:2px;
59+
text-align:center;
60+
}
61+
.rssMedia{
62+
display:none;
63+
}
64+
65+
.rssRow div{
66+
float:right;
67+
color: #9e9e9e;
68+
font-size: 10px;
69+
padding-right: 10px;
70+
margin-top: -25px;
71+
}
72+
.rssRow {
73+
padding: 10px;
74+
}
75+
4776
/***********BLOCKS & WRAPS***********/
4877

4978
/*--- Dash Unit / Used in Dashboard page ---*/

‎css/mainPurple.css

+29
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,35 @@ h5 {
4747
margin-left:5px;
4848
}
4949

50+
51+
/***********NEWS***********/
52+
.rssHeader{
53+
font-family: 'Open Sans', sans-serif;
54+
font-weight: bold;
55+
font-size: 30px;
56+
line-height: 26px;
57+
letter-spacing: 0px;
58+
padding-top:10px;
59+
padding-bottom:14px;
60+
padding-left:5px;
61+
margin-top:2px;
62+
text-align:center;
63+
}
64+
.rssMedia{
65+
display:none;
66+
}
67+
68+
.rssRow div{
69+
float:right;
70+
color: #9e9e9e;
71+
font-size: 10px;
72+
padding-right: 10px;
73+
margin-top: -25px;
74+
}
75+
.rssRow {
76+
padding: 10px;
77+
}
78+
5079
/***********BLOCKS & WRAPS***********/
5180

5281
/*--- Dash Unit / Used in Dashboard page ---*/

‎css/mainRounded.css

+29
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,35 @@ h5 {
2626
margin-left:5px;
2727
}
2828

29+
30+
/***********NEWS***********/
31+
.rssHeader{
32+
font-family: 'Open Sans', sans-serif;
33+
font-weight: bold;
34+
font-size: 30px;
35+
line-height: 26px;
36+
letter-spacing: 0px;
37+
padding-top:10px;
38+
padding-bottom:14px;
39+
padding-left:5px;
40+
margin-top:2px;
41+
text-align:center;
42+
}
43+
.rssMedia{
44+
display:none;
45+
}
46+
47+
.rssRow div{
48+
float:right;
49+
color: #9e9e9e;
50+
font-size: 10px;
51+
padding-right: 10px;
52+
margin-top: -25px;
53+
}
54+
.rssRow {
55+
padding: 10px;
56+
}
57+
2958
/***********BLOCKS & WRAPS***********/
3059

3160
/*--- Dash Unit / Used in Dashboard page ---*/

‎frontpage.html

+1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<li><a class="stay" href="lights.html"><i class="icon-th icon-white"></i> Lights</a></li>
5050
<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>
5151
<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>
52+
<li ><a class="stay" href="news.html"><i class="icon-th icon-white"></i> News</a></li>
5253
<li><a class="stay" href="logs.html"><i class="icon-th icon-white"></i> Logs</a></li>
5354
</ul>
5455
</div>

‎graph.html

+1
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<li><a class="stay" href="lights.html"><i class="icon-th icon-white"></i> Lights</a></li>
5151
<li class="active"><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>
5252
<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>
53+
<li ><a class="stay" href="news.html"><i class="icon-th icon-white"></i> News</a></li>
5354
<li><a class="stay" href="logs.html"><i class="icon-th icon-white"></i> Logs</a></li>
5455
</ul>
5556
</div>

‎js/jquery.vticker.js

+77
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
/*
2+
* Tadas Juozapaitis ( [email protected] )
3+
*
4+
* Modifed by Zazar:
5+
* 24.06.2011 - Corrected pausing issue with multiple instances
6+
*
7+
*/
8+
9+
(function($){
10+
11+
$.fn.vTicker = function(options) {
12+
var defaults = {
13+
speed: 700,
14+
pause: 4000,
15+
showItems: 3,
16+
animation: '',
17+
mousePause: true,
18+
isPaused: false
19+
};
20+
21+
var options = $.extend(defaults, options);
22+
23+
moveUp = function(obj2, height, paused){
24+
if(paused) return;
25+
26+
var obj = obj2.children('ul');
27+
28+
first = obj.children('li:first').clone(true);
29+
30+
obj.animate({top: '-=' + height + 'px'}, options.speed, function() {
31+
$(this).children('li:first').remove();
32+
$(this).css('top', '0px');
33+
});
34+
35+
if(options.animation == 'fade') {
36+
obj.children('li:first').fadeOut(options.speed);
37+
obj.children('li:last').hide().fadeIn(options.speed);
38+
}
39+
40+
first.appendTo(obj);
41+
};
42+
43+
return this.each(function() {
44+
var obj = $(this);
45+
var maxHeight = 0;
46+
var itempause = options.isPaused;
47+
48+
obj.css({overflow: 'hidden', position: 'relative'})
49+
.children('ul').css({position: 'absolute', margin: 0, padding: 0})
50+
.children('li').css({margin: 0, padding: 0});
51+
52+
obj.children('ul').children('li').each(function(){
53+
54+
if($(this).height() > maxHeight) {
55+
maxHeight = $(this).height();
56+
}
57+
});
58+
59+
obj.children('ul').children('li').each(function() {
60+
$(this).height(maxHeight);
61+
});
62+
63+
obj.height(maxHeight * options.showItems);
64+
65+
var interval = setInterval(function(){ moveUp(obj, maxHeight, itempause); }, options.pause);
66+
67+
if (options.mousePause)
68+
{
69+
obj.bind("mouseenter",function() {
70+
itempause = true;
71+
}).bind("mouseleave",function() {
72+
itempause = false;
73+
});
74+
}
75+
});
76+
};
77+
})(jQuery);

‎js/jquery.zrssfeed.min.js

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lights.html

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<li class="active"><a class="stay" href="lights.html"><i class="icon-th icon-white"></i> Lights</a></li>
7070
<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>
7171
<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>
72+
<li ><a class="stay" href="news.html"><i class="icon-th icon-white"></i> News</a></li>
7273
<li><a class="stay" href="logs.html"><i class="icon-th icon-white"></i> Logs</a></li>
7374
</ul>
7475
</div>

‎logs.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212

1313
<link href="css/icons.css" rel="stylesheet">
1414
<script type="text/javascript" src="js/jquery-2.1.4.js"></script>
15-
<script type="text/javascript" src="js/highcharts.js"></script>
1615
<script type="text/javascript" src="js/jquery.noty.packaged.js"></script>
1716
<script type="text/javascript" src="settings/settings.js"></script>
1817
<script type="text/javascript" src="js/noty.js"></script>
1918
<link rel="stylesheet" href="css/main.css" />
2019
<script type="text/javascript" src="js/methods.js"></script>
2120
<script type="text/javascript" src="js/jquery.stayInWebApp.min.js"></script>
21+
2222
<style type="text/css">
2323
body {
2424
padding-top: 60px;
@@ -64,6 +64,7 @@
6464
<li><a class="stay" href="lights.html"><i class="icon-th icon-white"></i> Lights</a></li>
6565
<li><a class="stay" href="graph.html"><i class="icon-th icon-white"></i> Graph</a></li>
6666
<li ><a class="stay" href="weather.html"><i class="icon-th icon-white"></i> Weather</a></li>
67+
<li ><a class="stay" href="news.html"><i class="icon-th icon-white"></i> News</a></li>
6768
<li class="active"><a class="stay" href="logs.html"><i class="icon-th icon-white"></i> Logs</a></li>
6869
</ul>
6970
</div>

0 commit comments

Comments
 (0)