# HG changeset patch # User hurons@caf4f556-3d62-0410-8435-a86758001935 # Date 1274090918 0 # Node ID d8780eeb2607e7e4457b44e2106a840f2a03a523 # Parent cd4c37c65a2c3c0f50f09a813d6aeeda52e1b790 - delete time in the home calendar - color in seminar menu - order element by dae in the menu - delete item's number restriction in menu - acces to Language navigation menu - navigation correction - change traduction diff -r cd4c37c65a2c -r d8780eeb2607 web/version.php --- a/web/version.php Wed Apr 07 13:11:04 2010 +0000 +++ b/web/version.php Mon May 17 10:08:38 2010 +0000 @@ -1,3 +1,3 @@ diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/plugins/event-calendar/day.php --- a/web/wp-content/plugins/event-calendar/day.php Wed Apr 07 13:11:04 2010 +0000 +++ b/web/wp-content/plugins/event-calendar/day.php Mon May 17 10:08:38 2010 +0000 @@ -39,7 +39,7 @@ ); if($is_event) { - $safe_title.=' @'.$time; + // $safe_title.=' @ '.$time; $this->is_event=True; } $this->titles[]=$safe_title; diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/plugins/xili-language/xili-language-fr_FR.mo Binary file web/wp-content/plugins/xili-language/xili-language-fr_FR.mo has changed diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/plugins/xili-language/xili-language-fr_FR.po --- a/web/wp-content/plugins/xili-language/xili-language-fr_FR.po Wed Apr 07 13:11:04 2010 +0000 +++ b/web/wp-content/plugins/xili-language/xili-language-fr_FR.po Mon May 17 10:08:38 2010 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: xili_language\n" "POT-Creation-Date: 2009-04-04 11:58+0100\n" -"PO-Revision-Date: 2010-02-20 23:01+0100\n" -"Last-Translator: dev.xiligroup.com \n" +"PO-Revision-Date: 2010-05-17 11:31+0100\n" +"Last-Translator: Samuel Huron \n" "Language-Team: dev.xiligroup.com \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -21,6 +21,21 @@ msgid "Language to update." msgstr "Langue à mettre à jour." +msgid "in english" +msgstr "en anglais" + +msgid "in french" +msgstr "en français" + +msgid "in " +msgstr "en " + +msgid "Website in english" +msgstr "Site web en anglais" + +msgid "Website in french" +msgstr "Site web en anglais" + msgid "A language was updated." msgstr "Une langue a été mise à jour." diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/plugins/xili-language/xili-language.php --- a/web/wp-content/plugins/xili-language/xili-language.php Wed Apr 07 13:11:04 2010 +0000 +++ b/web/wp-content/plugins/xili-language/xili-language.php Mon May 17 10:08:38 2010 +0000 @@ -1728,13 +1728,13 @@ } foreach ($listlanguages as $language) { if ($language->slug != $this->curlang ) { - $a .= $before ."description,THEME_TEXTDOMAIN)."'>". __('in '.$language->description,THEME_TEXTDOMAIN) ."".$after; + $a .= $before ."description,THEME_TEXTDOMAIN)."'>". __('in '.$language->description,THEME_TEXTDOMAIN) ."".$after; } } echo $a; } else { /* current list */ foreach ($listlanguages as $language) { - $a .= $before ."description,THEME_TEXTDOMAIN)."'>". __('in '.$language->description,THEME_TEXTDOMAIN) ."".$after; + $a .= $before ."description,THEME_TEXTDOMAIN)."'>". __('in '.$language->description,THEME_TEXTDOMAIN) ."".$after; } echo $a; } diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/themes/IRI-Theme/functions.php --- a/web/wp-content/themes/IRI-Theme/functions.php Wed Apr 07 13:11:04 2010 +0000 +++ b/web/wp-content/themes/IRI-Theme/functions.php Mon May 17 10:08:38 2010 +0000 @@ -377,7 +377,7 @@ } echo '
    '; - $category_posts = get_posts('numberposts=15&order=ASC&orderby=parent&category='.$category->cat_ID); + $category_posts = get_posts('numberposts=30&order=DSC&orderby=date&category='.$category->cat_ID);// $count2 = 0; /*$categoryN2 = get_category_link($category->cat_ID); @@ -395,25 +395,27 @@ // Affiche les posts de la langue courante + les indéfinis //if (get_cur_language($post->ID)==$current_lang['lang'] or get_cur_language($post->ID)==""){ // Affiche seulement les posts de la langue courante + les indéfinis + //echo ("
    ID = ".$post->ID." : ".get_cur_language($post->ID)."
    "); if (get_cur_language($post->ID)==$current_lang['lang']){ // gestion des niv 2 ajout de class si nécessaire $MyCategoryPost = get_the_category($post->ID); //var_dump($MyCategoryPost); - + + //echo ("
    MyC:".count($MyCategoryPost)."
    "); $MoreStyle=""; $title =""; if (count($MyCategoryPost)>1){ foreach($MyCategoryPost as $MyCategory) { - $MoreStyle.= " ".$MyCategory->category_nicename; - $title.= " ".$MyCategory->category_nicename; + $MoreStyle.= $MyCategory->category_nicename." "; + $title.= $MyCategory->category_nicename." "; //category_parent!=0 } } else { - $MoreStyle ="menu-h-li2"; + $MoreStyle ="menu-h-li2"; } - echo '
  • '.text_cutter($post->post_title,200).'
    • '; + echo '
  • '.text_cutter($post->post_title,200).'
    • '; $count2++; //if ($count2>6) break; } diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/themes/IRI-Theme/header.php --- a/web/wp-content/themes/IRI-Theme/header.php Wed Apr 07 13:11:04 2010 +0000 +++ b/web/wp-content/themes/IRI-Theme/header.php Mon May 17 10:08:38 2010 +0000 @@ -143,7 +143,7 @@
      -
    diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/themes/IRI-Theme/language/fr_FR.mo Binary file web/wp-content/themes/IRI-Theme/language/fr_FR.mo has changed diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/themes/IRI-Theme/language/fr_FR.po --- a/web/wp-content/themes/IRI-Theme/language/fr_FR.po Wed Apr 07 13:11:04 2010 +0000 +++ b/web/wp-content/themes/IRI-Theme/language/fr_FR.po Mon May 17 10:08:38 2010 +0000 @@ -3,7 +3,7 @@ "Project-Id-Version: WordPress 2.9.1 IriTheme\n" "Report-Msgid-Bugs-To: samuel.huron@centrepompidou.fr\n" "POT-Creation-Date: 2010-03-14 04:57+0000\n" -"PO-Revision-Date: 2010-03-16 15:19+0100\n" +"PO-Revision-Date: 2010-05-17 11:33+0100\n" "Last-Translator: Samuel Huron \n" "Language-Team: IRI\n" "MIME-Version: 1.0\n" @@ -21,6 +21,18 @@ msgid "Home" msgstr "Accueil" +msgid "in english" +msgstr "en anglais" + +msgid "in french" +msgstr "en français" + +msgid "in " +msgstr "en " + +msgid "Website" +msgstr "Site web" + msgid "Research" msgstr "Recherches" @@ -48,8 +60,11 @@ msgid "Last Publications" msgstr "Dernières publications" -msgid "News" -msgstr "Actualités" +msgid "Links and external news" +msgstr "Liens et actualités externes" + +msgid "in" +msgstr "en" msgid "Cloud of Tags" msgstr "Nuage de tags" diff -r cd4c37c65a2c -r d8780eeb2607 web/wp-content/themes/IRI-Theme/style.css --- a/web/wp-content/themes/IRI-Theme/style.css Wed Apr 07 13:11:04 2010 +0000 +++ b/web/wp-content/themes/IRI-Theme/style.css Mon May 17 10:08:38 2010 +0000 @@ -947,16 +947,26 @@ padding-right:10px; } + .design-du-nouveau-monde-industriel { - background-color:#00ff1e; + background:none repeat scroll 0 0 #050019 !important; } +.design-du-nouveau-monde-industriel a:hover{ + background:none repeat scroll 0 0 #001736 !important; +} .figures-de-lamateur{ - background-color:#ff2a00; + background:none repeat scroll 0 0 #0F0004 !important; +} +.figures-de-lamateur a:hover{ + background:none repeat scroll 0 0 #260004 !important; } -.ecologie-de-lattention{ - background-color:#eaff00; +.ecologie-de-lattention { + background:none repeat scroll 0 0 #100017 !important; +} +.ecologie-de-lattention a:hover{ + background:none repeat scroll 0 0 #260044 !important; +} -} .lang{ padding-left:650px; }