Changeset 2101
- Timestamp:
- Sep 21, 2007, 1:45:23 AM (17 years ago)
- Location:
- trunk
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/calendar_base.class.php
r1903 r2101 4 4 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | 5 5 // +-----------------------------------------------------------------------+ 6 // | branch : BSF (Best So Far) 7 // | file : $RCSfile$ 6 // | file : $Id$ 8 7 // | last update : $Date$ 9 8 // | last modifier : $Author$ … … 134 133 * @param array date_components 135 134 * @param array items - hash of items to put in the bar (e.g. 2005,2006) 136 * @param array selected_item - item currently selected (e.g. 2005)137 135 * @param string class_prefix - html class attribute prefix for span elements 138 136 * @param bool show_any - adds any link to the end of the bar … … 141 139 * @return string the navigation bar 142 140 */ 143 function get_nav_bar_from_items($date_components, $items, $selected_item,141 function get_nav_bar_from_items($date_components, $items, 144 142 $class_prefix, $show_any, 145 143 $show_empty=false, $labels=null) … … 168 166 $label = $labels[$item]; 169 167 } 170 if (isset($selected_item) and $item == $selected_item) 171 { 172 $nav_bar .= '<span class="'.$class_prefix.'Sel">'; 173 $nav_bar .= $label; 174 } 175 elseif ($nb_images==-1) 168 if ($nb_images==-1) 176 169 { 177 170 $nav_bar .= '<span class="'.$class_prefix.'Empty">'; … … 200 193 { 201 194 $label = l10n('calendar_any'); 202 if (isset($selected_item) and 'any' === $selected_item) 203 { 204 $nav_bar .= '<span class="'.$class_prefix.'Sel">'; 205 $nav_bar .= $label; 206 } 207 else 208 { 209 $nav_bar .= '<span class="'.$class_prefix.'">'; 210 $url = duplicate_index_url( 211 array('chronology_date'=>array_merge($date_components,array('any'))), 212 array( 'start' ) 213 ); 214 $nav_bar .= '<a href="'.$url.'">'; 215 $nav_bar .= $label; 216 $nav_bar .= '</a>'; 217 } 195 $nav_bar .= '<span class="'.$class_prefix.'">'; 196 $url = duplicate_index_url( 197 array('chronology_date'=>array_merge($date_components,array('any'))), 198 array( 'start' ) 199 ); 200 $nav_bar .= '<a href="'.$url.'">'; 201 $nav_bar .= $label; 202 $nav_bar .= '</a>'; 218 203 $nav_bar.= '</span>'; 219 204 } … … 272 257 $dates, 273 258 $level_items, 274 null,275 259 'calItem', 276 260 true, -
trunk/include/calendar_monthly.class.php
r1900 r2101 258 258 259 259 $nav_bar .= $this->get_nav_bar_from_items( $chronology_date, 260 $year_data['children'], null,'calCal', false, false, $lang['month'] );260 $year_data['children'], 'calCal', false, false, $lang['month'] ); 261 261 262 262 $template->assign_block_vars( 'calendar.calbar', … … 309 309 310 310 $nav_bar .= $this->get_nav_bar_from_items( $chronology_date, 311 $month_data['children'], null,'calCal', false );311 $month_data['children'], 'calCal', false ); 312 312 313 313 $template->assign_block_vars( 'calendar.calbar', -
trunk/include/picture_comment.inc.php
r2030 r2101 56 56 57 57 include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php'); 58 58 59 59 $comment_action = insert_user_comment($comm, @$_POST['key'], $infos ); 60 60 … … 66 66 array_push( $infos, l10n('comment_added')); 67 67 break; 68 case 'reject': 68 case 'reject': 69 69 set_status_header(403); 70 70 array_push($infos, l10n('comment_not_added') ); … … 74 74 } 75 75 76 $block_var = ($comment_action=='reject') ? 'errors.error' : 'infos.info'; 76 77 foreach ($infos as $info) 77 78 { 78 79 $template->assign_block_vars( 79 'information',80 array( ' INFORMATION'=>$info )80 $block_var, 81 array( 'TEXT'=>$info ) 81 82 ); 82 83 } … … 137 138 'comments.comment', 138 139 array( 139 'COMMENT_AUTHOR' => trigger_event('render_comment_author', 140 'COMMENT_AUTHOR' => trigger_event('render_comment_author', 140 141 empty($row['author']) 141 142 ? l10n('guest') -
trunk/template/yoga/content.css
r1900 r2101 37 37 38 38 #content .pageNumberSelected { 39 font-style: italic; 39 font-style: italic; 40 font-weight: bold; 40 41 } 41 42 … … 181 182 text-align: left; 182 183 vertical-align: top; 184 color: #000; 183 185 } 184 186 … … 190 192 text-align: left; 191 193 vertical-align: top; 194 color: #fff; 192 195 } 193 196 -
trunk/template/yoga/default-colors.css
r1900 r2101 2 2 3 3 /* others */ 4 .pleaseNote {5 background: #9c9c9c;6 color: #ffff99;7 padding: 1ex;8 font-weight: bold;9 }10 4 11 5 #imageToolBar * { … … 14 8 15 9 /* So that non-links are slightly greyed out */ 16 #content .navigationBar { 17 color: #696969; 18 } 19 #content .pageNumberSelected { 20 color: #000000; 10 #content .navigationBar, SPAN.calItemEmpty, TD.calDayCellEmpty { 11 color: #b0b0b0; 21 12 } 22 13 … … 69 60 } 70 61 71 .errors UL LI72 {73 font-weight: normal;74 }75 76 62 /** 77 63 * Informations box in administration … … 79 65 .infos { 80 66 text-align: left; 67 color: #002000; 81 68 background-color: #98fb98; /* palegreen */ 82 69 background-image: url(icon/admin/infos.png); 83 70 background-repeat: no-repeat; 84 71 background-position: top right; 85 color: #006400; /* darkgreen */86 72 font-weight: bold; 87 73 margin: 5px; 88 74 padding: 10px 50px 10px 10px; 75 } 76 77 .infos UL LI 78 { 79 font-weight: normal; 89 80 } 90 81 … … 118 109 font-style: italic; 119 110 } 111 112 /*calendar*/ 113 SPAN.calItem, SPAN.calItemEmpty, 114 TD.calDayCellEmpty, TD.calDayCellFull { 115 border: 1px solid gray; 116 } 117 118 -
trunk/template/yoga/picture.tpl
r1964 r2101 1 <!-- BEGIN information --> 2 <div class="pleaseNote">{information.INFORMATION}</div> 3 <!-- END information --> 1 <!-- BEGIN errors --> 2 <div class="errors"> 3 <ul> 4 <!-- BEGIN error --> 5 <li>{errors.error.TEXT}</li> 6 <!-- END error --> 7 </ul> 8 </div> 9 <!-- END errors --> 10 <!-- BEGIN infos --> 11 <div class="infos"> 12 <ul> 13 <!-- BEGIN info --> 14 <li>{infos.info.TEXT}</li> 15 <!-- END info --> 16 </ul> 17 </div> 18 <!-- END infos --> 4 19 5 20 <div id="imageHeaderBar"> -
trunk/template/yoga/theme/clear/theme.css
r2045 r2101 35 35 36 36 FIELDSET, INPUT, SELECT, TEXTAREA, 37 #content DIV.comment A.illustration IMG, #infos,37 #content DIV.comment A.illustration IMG, 38 38 #content DIV.thumbnailCategory { 39 39 border: 1px solid gray; … … 76 76 } 77 77 78 /* others */79 .pleaseNote {80 background: #9c9c9c;81 color: #ffff99;82 padding: 1ex;83 font-weight: bold;84 }85 86 78 /*calendar elements*/ 87 SPAN.calItemEmpty { color: silver; }88 89 79 SPAN.calItem, SPAN.calItemEmpty 90 80 { … … 92 82 } 93 83 94 /* nice looking month calendar*/95 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid #7E7262;}96 97 TD.calDayCellEmpty { color: silver; }98 99 .calBackDate { color: #000; }100 .calForeDate { color: #fff; }101 84 .virtual_cat { background: #fff !important; } 102 85 #mbMenu #quicksearch > p { text-align: left; } -
trunk/template/yoga/theme/dark/theme.css
r2045 r2101 9 9 H2, #menubar DT, .throw { 10 10 color: #fff48e; 11 }12 13 #content .navigationBar {14 color: #aaaaaa;15 }16 #content .pageNumberSelected {17 color: #000000;18 11 } 19 12 … … 76 69 77 70 FIELDSET, INPUT, SELECT, TEXTAREA, 78 #content DIV.comment A.illustration IMG, #infos,71 #content DIV.comment A.illustration IMG, 79 72 #content DIV.thumbnailCategory { 80 73 border: 1px solid gray; … … 116 109 } 117 110 118 /* others */119 .pleaseNote {120 background: #9c9c9c;121 color: #ffff99;122 padding: 1ex;123 font-weight: bold;124 }125 111 #the_page { 126 112 border: 1px solid #e0e0e0; … … 131 117 } 132 118 133 /*calendar elements*/134 SPAN.calItemEmpty { color: silver; }135 136 SPAN.calItem, SPAN.calItemEmpty137 {138 border: 1px solid gray;139 }140 141 /* nice looking month calendar*/142 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}143 144 TD.calDayCellEmpty { color: silver; }145 146 .calBackDate { color: #000; }147 .calForeDate { color: #fff; }148 119 .virtual_cat { background: #3f3f3f !important; } 149 120 #mbMenu #quicksearch > p { text-align: left; } -
trunk/template/yoga/theme/p0w0/theme.css
r2045 r2101 19 19 /* Texts Only */ 20 20 BODY, H1, H3, DT, H2, .throw { color: #369; } 21 H2, #menubar DT, .throw, TD H3, #theAdminPage H3 , .calForeDate{21 H2, #menubar DT, .throw, TD H3, #theAdminPage H3 { 22 22 color: #fff; 23 23 } … … 43 43 .infoTable, 44 44 #theAdminPage #content, 45 #content .navigationBar,46 45 input#qsearchInput { color: #369; } 47 46 #content .infos { color: #036; } … … 90 89 color: #f92; 91 90 } 92 .pleaseNote { 93 color: #ff9; 94 font-weight: bold; 95 } 96 TD.calDayCellEmpty, 97 SPAN.calItemEmpty { color: silver; } 98 .calBackDate { color: #000; } 91 99 92 100 93 /******************************************************************************/ … … 130 123 input#qsearchInput { background-color: #cde; } 131 124 .virtual_cat { background: #fff !important; } 132 . pleaseNote, .selected_tab { background-color: #69c !important; }125 .selected_tab { background-color: #69c !important; } 133 126 /******************************************************************************/ 134 127 /* Borders, Margins, Padding Only */ … … 194 187 } 195 188 FIELDSET, INPUT, SELECT, TEXTAREA, 196 #content DIV.comment A.illustration IMG, #infos,189 #content DIV.comment A.illustration IMG, 197 190 #content DIV.thumbnailCategory { 198 191 border: 1px solid #69c; … … 219 212 margin: 0px; 220 213 } 221 .pleaseNote {222 padding: 1ex;223 }224 SPAN.calItem, SPAN.calItemEmpty { border: 1px solid gray; }225 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;}226 214 #theAdminPage #content table td { padding: 2px 8px; } 227 215 ul.tabsheet { border-color: #369 !important; } -
trunk/template/yoga/theme/wipi/theme.css
r2045 r2101 49 49 content: ''; 50 50 } 51 #content .navigationBar {52 color: #aaaaaa;53 }54 51 #content .pageNumberSelected { 55 52 color: #f92; … … 192 189 } 193 190 FIELDSET, INPUT, SELECT, TEXTAREA, 194 #content DIV.comment A.illustration IMG, #infos,191 #content DIV.comment A.illustration IMG, 195 192 #content DIV.thumbnailCategory { 196 193 border: 1px solid gray; … … 239 236 border-bottom: none; 240 237 } 241 /* others */242 .pleaseNote {243 background: #9c9c9c;244 color: #ffff99;245 padding: 1ex;246 font-weight: bold;247 }248 238 #the_page { 249 239 border: 1px dotted #f92; … … 257 247 color: #69c; 258 248 } 259 /*calendar elements*/ 260 SPAN.calItemEmpty { color: silver; } 261 262 SPAN.calItem, SPAN.calItemEmpty 263 { 264 border: 1px solid gray; 265 } 249 266 250 label { 267 251 cursor:pointer … … 299 283 } 300 284 301 /* nice looking month calendar*/ 302 TD.calDayCellEmpty, TD.calDayCellFull { border: 1px solid gray;} 303 304 TD.calDayCellEmpty { color: silver; } 305 306 .calBackDate { color: #000; } 307 .calForeDate { color: #fff; } 285 308 286 .virtual_cat { background: #222 !important; } 309 287
Note: See TracChangeset
for help on using the changeset viewer.