Few changes made on the Smartmirror Project

README.md

@@ -1,8 +1,35 @@
-MagicMirror
+Smartmirror
 ===========
 
-The super magic interface of my personal Magic Mirror. More information about this project can be found on my [blog](http://michaelteeuw.nl/tagged/magicmirror).
+Added some improvements to MichMichs [project](http://michaelteeuw.nl/tagged/magicmirror).
 
-Runs as a php script on a web server with basically no external dependencies. Can use socket.io for XBEE integration, but isn't required for basic functionality.
+-Translation to other Languages (compliments and DateLabel needs to be translated manually, moment.js for everything else)
 
-Modify js/config.js to change some general variables (language, wather location, compliments, news feed RSS) and calendar.php to add your own ICS calendar
+-Override system-locale with user profiles -> http://127.0.0.1/smartmirror?user=user1 (for user1). You can define newsfeed,language, weather,openhab URL for each profile.
+
+-Inlcuded a newer Version of moment-with-langs.js and weathericons
+
+-Added OpenHAB Support
+
+-Some optical improvements
+
+
+To-Do:
+
+Display Graph and Values from OpenHAB
+
+Add support for public transport (efa.vrr.de for example)
+
+Add support for gas-price monitor (in Germany)
+
+
+
+
+
+
+
+
+Screenshot:
+
+
+![Screenshot](https://cloud.githubusercontent.com/assets/8407566/9839264/4fbd2f7c-5a74-11e5-8d79-078886477cd6.png)

calendar.php

@@ -1,17 +1,7 @@
 <?php
-
-	// Set the url of the calendar feed.
-	$url = 'https://p01-calendarws.icloud.com/ca/subscribe/1/n6x7Farxpt7m9S8bHg1TGArSj7J6kanm_2KEoJPL5YIAk3y70FpRo4GyWwO-6QfHSY5mXtHcRGVxYZUf7U3HPDOTG5x0qYnno1Zr_VuKH2M';
 
-	/*****************************************/
 
-	// Run the helper function with the desired URL and echo the contents.
-	echo get_url($url);
-
-	// Define the helper function that retrieved the data and decodes the content.
-	function get_url($url)
-	{
-	    //user agent is very necessary, otherwise some websites like google.com wont give zipped content
+		//user agent is very necessary, otherwise some websites like google.com wont give zipped content
 	    $opts = array(
 	        'http'=>array(
 	            'method'=>"GET",
@@ -21,7 +11,10 @@ function get_url($url)
 	                        "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:19.0) Gecko/20100101 Firefox/19.0 FirePHP/0.4rn"
 	        )
 	    );
-
+
+	function get_url($url)
+	{
+
 	    $context = stream_context_create($opts);
 	    $content = file_get_contents($url ,false,$context); 
 
@@ -37,3 +30,7 @@ function get_url($url)
 
 	    return $content;
 	}
+
+
+	$url = $_GET['url'];
+	echo get_url($url);

css/main.css

@@ -50,21 +50,28 @@ body, html {
 	top: 66.666%;
 	height: 200px;
 	margin-top: -100px;
-	line-height: 100px;	
+	line-height: 100px;
 }
 
 .center-hor
 {
 	position: absolute;
 	right: 50px;
 	left: 50px;
-	text-align: center;	
+	text-align: center;
+	font-size: 60px;
+}
+
+.bottomhead
+{
+	position: absolute;
+	bottom: 250px;
 }
 
 .bottom
 {
 	position: absolute;
-	bottom: 50px;
+	bottom: 25px;
 }
 
 .xxsmall
@@ -111,7 +118,7 @@ body, html {
 .xdimmed
 {
 	color: #666;
-} 
+}
 
 .dimmed
 {
@@ -123,7 +130,7 @@ body, html {
 	font-family: "HelveticaNeue-UltraLight";
 }
 
-.icon 
+.icon
 {
 	position: relative;
 	top :-10px;
@@ -158,13 +165,13 @@ body, html {
 	font-size: 20px;
 	line-height: 20px;
 }
-.forecast-table .day, .forecast-table .temp-min, .forecast-table .temp-max  
+.forecast-table .day, .forecast-table .temp-min, .forecast-table .temp-max
 {
 	width: 50px;
 	text-align: right;
 }
 
-.forecast-table .temp-max 
+.forecast-table .temp-max
 {
 	width: 60px;
 }
@@ -174,6 +181,13 @@ body, html {
 	color: #999;
 }
 
+
+
+
+
+
+
+
 .calendar-table {
 	font-size: 14px;
 	line-height: 20px;
@@ -194,6 +208,18 @@ body, html {
 	display: none;
 }
 
+.newsh{
+	font-size: 25px;
+	letter-spacing: -1px;
+	font-family: "HelveticaNeue-Light";
+}
+
+.newsd{
+	font-size: 20px;
+	letter-spacing: -1px;
+	font-family: "HelveticaNeue-Light";
+}
+
 @font-face {
   font-family: 'HelveticaNeue-UltraLight';
   src: url('font/HelveticaNeue-UltraLight.eot'); /* IE9 Compat Modes */
@@ -213,7 +239,7 @@ body, html {
   src: url('font/HelveticaNeue-Medium.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
        url('font/HelveticaNeue-Medium.woff') format('woff'), /* Modern Browsers */
        url('font/HelveticaNeue-Medium.ttf')  format('truetype'), /* Safari, Android, iOS */
-       url('font/HelveticaNeue-Medium.svg#d7af0fd9278f330eed98b60dddea7bd6') format('svg'); /* Legacy iOS */ 
+       url('font/HelveticaNeue-Medium.svg#d7af0fd9278f330eed98b60dddea7bd6') format('svg'); /* Legacy iOS */
   font-style:   normal;
   font-weight:  400;
 }
@@ -224,8 +250,7 @@ body, html {
   src: url('font/HelveticaNeue-Light.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
        url('font/HelveticaNeue-Light.woff') format('woff'), /* Modern Browsers */
        url('font/HelveticaNeue-Light.ttf')  format('truetype'), /* Safari, Android, iOS */
-       url('font/HelveticaNeue-Light.svg#7384ecabcada72f0e077cd45d8e1c705') format('svg'); /* Legacy iOS */      
+       url('font/HelveticaNeue-Light.svg#7384ecabcada72f0e077cd45d8e1c705') format('svg'); /* Legacy iOS */
   font-style:   normal;
   font-weight:  200;
 }
-