From f6aae7e0775174bad427c580184702a8cdca6754 Mon Sep 17 00:00:00 2001 From: Chouchen Date: Fri, 17 Sep 2010 13:38:57 +0000 Subject: [PATCH] Stylisation de l'application. --- GoogleMeteo.php | 5 +- class/AccueilModules.php | 21 ++++- class/Blogs.php | 2 +- class/Links.php | 2 +- class/Todo.php | 4 + class/Weather.php | 3 +- css/clock.css | 152 -------------------------------- css/jquery.fancybox-1.3.0.css | 2 +- css/main.css | 68 +------------- css/todo.css | 2 +- css/weather.css | 4 +- images/interface/blogs_edit.png | Bin 0 -> 762 bytes images/interface/config.png | Bin 0 -> 610 bytes images/interface/weather.png | Bin 0 -> 694 bytes js/getUncompletedTasks.php | 8 +- js/jquery.blogs.js | 1 + js/jquery.weather.js | 3 +- js/main.js | 14 +-- 18 files changed, 53 insertions(+), 238 deletions(-) delete mode 100644 css/clock.css create mode 100644 images/interface/blogs_edit.png create mode 100644 images/interface/config.png create mode 100644 images/interface/weather.png diff --git a/GoogleMeteo.php b/GoogleMeteo.php index 2409af6..7d462cf 100644 --- a/GoogleMeteo.php +++ b/GoogleMeteo.php @@ -2,10 +2,11 @@ require('class/GoogleWeather.class.php'); //ça récupère un truc du style : http://www.google.com/ig/api?weather=paris&hl=fr - if($city != '' || $city != null){ - $gweather = new GoogleWeatherAPI($city,'fr'); + if($ville != '' || $ville != null){ + $gweather = new GoogleWeatherAPI($ville,'fr'); if($gweather->isFound()) { + $city = $gweather->getCity(); $currentTemp = $gweather->getCurrent(); $forecastTemp = $gweather->getForecast(); diff --git a/class/AccueilModules.php b/class/AccueilModules.php index dc1c23f..7f93763 100644 --- a/class/AccueilModules.php +++ b/class/AccueilModules.php @@ -44,7 +44,7 @@ class AccueilModules { * Construit et insère le menu de changement de config */ function buildConfigMenu(){ - echo 'Configuration + echo '
@@ -56,10 +56,27 @@ class AccueilModules { if ($moduleConf->visibility == "false") echo " checked"; echo '/>false

'; } - echo 'Enregistrer + echo 'Enregistrer
'; + echo ''; } /** diff --git a/class/Blogs.php b/class/Blogs.php index f6d4caf..e7d8c7a 100644 --- a/class/Blogs.php +++ b/class/Blogs.php @@ -6,7 +6,7 @@ class blogs { $this->setParams($params); require('blogs_last_post.php'); echo ''; - echo 'Manage blog links'; + echo ''; echo '

Blogs Management


diff --git a/class/Links.php b/class/Links.php index 157fa58..00dfe84 100644 --- a/class/Links.php +++ b/class/Links.php @@ -9,7 +9,7 @@ class links {
'; } + echo ''; }else{ echo 'baaaaad persistance...'; } diff --git a/class/Weather.php b/class/Weather.php index 22051e2..c628352 100644 --- a/class/Weather.php +++ b/class/Weather.php @@ -10,11 +10,12 @@ class weather { public function __construct($params){ //$this->setParams($params); - $city = $params['city']; + $ville = $params['city']; include 'GoogleMeteo.php'; echo ' '; echo '
+ '.$city.'
'.$present_weather.'
'.$future_weather1.'
diff --git a/css/clock.css b/css/clock.css deleted file mode 100644 index 4861532..0000000 --- a/css/clock.css +++ /dev/null @@ -1,152 +0,0 @@ -#fancyClock{ - - margin:40px auto; - - height:100px; - - /*border:1px solid #111111;*/ - - width:300px; -float:left; - -} -#fancyClock:after{content: div;clear:both;} - -.clock{ - - /* The .clock div. Created dynamically by jQuery */ - background:url(../images/interface/clock.png) top left no-repeat; - background-color:#FFF; - - height:100px; - - width:100px; - - position:relative; - - overflow:hidden; - - float:left; - -} - - - -.clock .rotate{ - - /* There are two .rotate divs - one for each half of the background */ - - position:absolute; - - width:100px; - - height:100px; - - top:0; - - left:0; - -} - - - -.rotate.right{ - - display:none; - - z-index:11; - -} - - - -.clock .bg, .clock .front{ - - width:50px; - - height:100px; - - background-color:#FFF; - - position:absolute; - - top:0; - -} - - - -.clock .display{ - - /* Holds the number of seconds, minutes or hours respectfully */ - - position:absolute; - - width:100px; - - font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; - - z-index:20; - - color:#F5F5F5; - - font-size:30px; - - text-align:center; - - top:33px; - - left:0; - - - - /* CSS3 text shadow: */ - - text-shadow:4px 4px 5px #333333; - -} - - - -/* The left part of the background: */ - - - -.clock .bg.left{ left:0; } - - - -/* Individual styles for each color: */ - -.orange .bg.left{ background:url(../images/bg_orange.png) no-repeat left top; } - -.green .bg.left{ background:url(../images/bg_green.png) no-repeat left top; } - -.blue .bg.left{ background:url(../images/bg_blue.png) no-repeat left top; } - - - -/* The right part of the background: */ - -.clock .bg.right{ left:100px; } - - - -.orange .bg.right{ background:url(../images/bg_orange.png) no-repeat right top; } - -.green .bg.right{ background:url(../images/bg_green.png) no-repeat right top; } - -.blue .bg.right{ background:url(../images/bg_blue.png) no-repeat right top; } - - - - - -.clock .front.left{ - - left:0; - - z-index:10; - -} - diff --git a/css/jquery.fancybox-1.3.0.css b/css/jquery.fancybox-1.3.0.css index 5e1b5fb..2fd1d3e 100644 --- a/css/jquery.fancybox-1.3.0.css +++ b/css/jquery.fancybox-1.3.0.css @@ -305,7 +305,7 @@ div#fancy-bg-s { left: 0; width: 100%; height: 20px; - background: transparent url('../fancy_shadow_s.png') repeat-x; + background: transparent url('../images/fancy/fancy_shadow_s.png') repeat-x; } div#fancy-bg-sw { diff --git a/css/main.css b/css/main.css index cfeee81..a2e35b6 100644 --- a/css/main.css +++ b/css/main.css @@ -43,66 +43,6 @@ border-color:#BFBFBF; } - #googlemenu { - width: 100%; - padding: 0 0 0 0; - margin-left: 0px; - margin-top: 5px; - overflow:auto; - height:395px; - } - - #googlemenu ul { - margin: 0; - padding: 0; - list-style: none; - } - - #googlemenu li.item { - margin-top: 0px; - margin-bottom: 0px; - padding-left: 4px; - padding-top: 2px; - padding-bottom: 2px; - height:18px; - border-color:white; - border-width:1px; - line-height:20px; - border-left:none; - border-right:none; - background-color:rgba(235,239,249,0.0); - - -webkit-transition: background-color 0.3s ease-out ; - } - - #googlemenu li.item:hover { - background-color:#ebeff9; - border-color:#BFCDF6; - - -webkit-transition: background-color 0s ease-out ; - } - - #googlemenu li.disabled { - background-color:#fff; - } - - #googlemenu li img { - margin-top: 2px; - margin-right:4px; - } - - #googlemenu li.empty { - margin-top: 0px; - margin-bottom: 0px; - padding-left: 4px; - padding-top: 2px; - padding-bottom: 2px; - } - - #googlemenu li.empty a:hover{ - text-decoration:underline; - } - ul.iconlist li{ display:inline-block; text-align:center; @@ -273,14 +213,14 @@ border:1px solid #ccc; height:32px; } - + #menu-bar{height:40px;background: -moz-linear-gradient(top, #ECD9D9 0%, #fff 100%);background: -webkit-gradient(linear, left top, left bottom, from(#ECD9D9), to(#fff)); position:relative; top:0; left:0; border-bottom:1px solid #ECD9D9;} #recherche{margin-top:70px;} #config {width:300px;} - #config-menu, #blog-links-manager {width:100px; margin:0 auto; text-align:center;display:block;} + #config-menu, #blog-links-manager, #city-menu {float:right; margin:12px 10px 0 0;} /* Green button class: */ -a.green-button,a.green-button:visited{ +a.green-button,a.green-button:visited, span.green-button{ color:black; display:block; font-size:10px; @@ -295,7 +235,7 @@ a.green-button,a.green-button:visited{ background:url(../images/interface/button_green.png) no-repeat left top; } -a.green-button:hover{ +a.green-button:hover, span.green-button:hover{ text-decoration:none; background-position:left bottom; } diff --git a/css/todo.css b/css/todo.css index dbe936e..de4b0da 100644 --- a/css/todo.css +++ b/css/todo.css @@ -1,4 +1,4 @@ -#todoList {/*position:absolute; bottom:10px; left: 100px;*/padding:5px;width:350px;-webkit-border-radius: 5px; +#todoList {padding:5px;width:350px;-webkit-border-radius: 5px; -moz-border-radius: 5px;border: 1px solid rgba(0,0,0,0.3); -webkit-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.15); -moz-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.15);} \ No newline at end of file diff --git a/css/weather.css b/css/weather.css index 241e87e..8b1d915 100644 --- a/css/weather.css +++ b/css/weather.css @@ -1,4 +1,6 @@ #weather {position:absolute; top:10px; left: 100px;padding:5px;-webkit-border-radius: 5px; -moz-border-radius: 5px;border: 1px solid rgba(0,0,0,0.3); -webkit-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.15); - -moz-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.15);} \ No newline at end of file + -moz-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.15);} + + #city-submit{cursor:pointer;} \ No newline at end of file diff --git a/images/interface/blogs_edit.png b/images/interface/blogs_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..c61a6d847795a2c6c9f0d8e6c69d3f72cec5e77d GIT binary patch literal 762 zcmVFu+SB7fQB(wh zKmdNfpU3O3FR9n6bx(yFW?LM)(cuM#(}134tA_DETWd7rfU%`9Ss=MUcwKe7(*}5qB2i- zk1uGwpM#!f*=R`>adwu?cYRS;jk(Tzc!pa5-%tD+u18O4qC2Xf>4JzmAXc#PD9cj> zmPQIePd8!CP=*zI1Hw)dY_GEEzXf-*VXTm&DS011zVX_L^0)8ccHG9=iU}(d*Wn(> z!>C3EN6l48Pm59_3;GNo&c|{B_6$7JdMw!sutt#xjAwwFlEOQphN~tCL#8&w#Kauq z3z~1q(fw40MoBC;o*w>)IdlG>aXKj16)Zb$Vxmd{%a;$BpP!F@3l^rJLA)0;b^@b% zC6jFgH7P@IDh(c{Wc;}p7GpbRXJ@0o#O4ASx*lhtE=7p%ZEDzbPcYM;iom24?jaS% ztCN_qjvKRw%nSZ4cwc%3@H#P8m4Z(7ZuByD?R}I8$5%ZT78bDi;tLcC#U8EX02~=eBHXF=lGptrCNRnI^up*XB(T^jb z4`0v}DG1te)wmeb(>p90leRz?_mO+^JKy=v&2<29Od6?F%9%(c8los#f*@G`-%W&* z$)uBj2i@u-@SgX}gtyWPe6d*|w6h%R? zScK2#Yn%$sum0cy>90DmY*i{1XqpClEtktsRTZ)lCUe z<FogV^*tm>8*AlX za4oiR!&85LrobG57qUHUX#{>Vz(RHpB5|@>9O6N$jqB8>%($0wxE5R3)b>Y~xtCo$ zCgEk&A?_#IxHdN)9tqre^o{ho4{?hmPuf@^@I3-wncaRd%|~O3xbrKY=&TiwPYkJroM{;WUQTuMY8vp>`OVZD3%CgcZ}Xt#Wg= zUCanah`Li2Ew%ac_+ze_E?0efU+V~mRRp_uc%SF+e!k!Da}GxaK(>>T4DI=W17hEb zu#d!kJhZ_Kg#K8IP*XU*AP=RXAqbZ8^O3bd!-`Yik7OY#iXX4v$>~@UAY_yh#iTjP;@L2+%MCJ7r@Gr-(5aIBgd$2Y2*5kXT|8YNXTYnvze#aoh;qkzSx~sZp6HHb!| z&}cLsiGbhl-|zK$N8D~V?{qqO^0GX3yWMNGTC--eIcqc;1A4taq}6JhYPH& + function cbfunc(o){ $('#results').append('
      '); for(var i in o) @@ -14,8 +11,7 @@ function cbfunc2(o){ $('#uncompletedList').append('
    • '+o.content+' - '+o.date_string+'
      • '); } -$(document).ready(function(){ - $('#todoList').append('
      '); +$(document).ready(function(){ $('#todoList').resizable(); $('#todoList').draggable(); $('#todoList').append('
      '); var token = ""; var project_id = ""; var script = document.createElement('script'); diff --git a/js/jquery.blogs.js b/js/jquery.blogs.js index 24f2ffc..3d22e8d 100644 --- a/js/jquery.blogs.js +++ b/js/jquery.blogs.js @@ -1,6 +1,7 @@ $(document).ready(function(){ var zIndex = 0; +$('#menu-bar').prepend($('#blog-links-manager')); function make_draggable(elements) { diff --git a/js/jquery.weather.js b/js/jquery.weather.js index 879118d..aeb9103 100644 --- a/js/jquery.weather.js +++ b/js/jquery.weather.js @@ -1,5 +1,6 @@ $(document).ready(function(){ - $('body').append('Weather City Choice
      '); + $('body').append('
      '); + $('#menu-bar').prepend($('#city-menu')); $('#city').append('

      Quelle ville pour la météo ?


      Enregistrer'); $('#city-menu').fancybox({ 'zoomSpeedIn' : 600, diff --git a/js/main.js b/js/main.js index f11c00a..1cd5a33 100644 --- a/js/main.js +++ b/js/main.js @@ -36,6 +36,9 @@ window.open("calculator.html", "Calc", "menubar=0,resizable=0,width=320,height=360") } $(document).ready(function(){ + $('body').prepend(''); + $('#menu-bar').prepend($('#config-menu')); + $("#q").focus(); //focus sur la recherche //$('.iconlist').sortable(); $('#config-menu').fancybox({ @@ -54,24 +57,25 @@ $(document).ready(function(){ 'hideOnContentClick': false, 'padding' : 15 }); - $('#config-submit').live('click',function(e){ + /*$('#config-submit').live('click',function(e){ $(this).replaceWith(''); var data3 = { 'clock' : $('input[type=radio][name=clock_group]:checked').attr('value'), - 'meteo' : $('input[type=radio][name=meteo_group]:checked').attr('value'), + 'weather' : $('input[type=radio][name=weather_group]:checked').attr('value'), 'notes' : $('input[type=radio][name=notes_group]:checked').attr('value'), 'search' : $('input[type=radio][name=search_group]:checked').attr('value'), 'links' : $('input[type=radio][name=links_group]:checked').attr('value'), - 'blogs' : $('input[type=radio][name=blogs_group]:checked').attr('value') + 'blogs' : $('input[type=radio][name=blogs_group]:checked').attr('value'), + 'todo' : $('input[type=radio][name=todo_group]:checked').attr('value') }; - /* Sending an AJAX POST request: */ + $.post('ajax/post-config.php',data3,function(msg3){ if(msg3=="1"){ location.reload(); } }); e.preventDefault(); - }); + });*/