| @@ -149,13 +149,10 @@ | ||
| 149 | 149 | 'start' => $start, |
| 150 | 150 | 'end' => $end, |
| 151 | 151 | 'employee' => $employee, |
| 152 | 152 | 'calendar' => $calendar, |
| 153 | - 'hideui' => $hideui, | |
| 154 | - 't' => null, | |
| 155 | - 't1' => null, | |
| 156 | - 't2' => null, | |
| 157 | - ); | |
| 153 | + 'hideui' => $hideui | |
| 154 | + ); | |
| 158 | 155 | |
| 159 | 156 | $params = $this->request->getParams(); |
| 160 | 157 | $params = array_merge( $defaultParams, $params ); |
| 161 | 158 | |
| @@ -186,8 +183,15 @@ | ||
| 186 | 183 | HC3_Session::instance() |
| 187 | 184 | ->setUserdata( 'scheduleLink', $scheduleLink ) |
| 188 | 185 | ; |
| 189 | 186 | |
| 187 | +// $scheduleLink2 = HC3_Session::instance() | |
| 188 | +// ->getUserdata( 'scheduleLink' ) | |
| 189 | +// ; | |
| 190 | +// $to = $this->uri->makeUrl( $scheduleLink2 ); | |
| 191 | +// echo "TO = '$to'<br>"; | |
| 192 | +// exit; | |
| 193 | + | |
| 190 | 194 | $type = $params['type']; |
| 191 | 195 | $groupby = $params['groupby']; |
| 192 | 196 | |
| 193 | 197 | $view = NULL; |
| @@ -293,26 +297,27 @@ | ||
| 293 | 297 | |
| 294 | 298 | $modal = $this->_renderModal(); |
| 295 | 299 | $out = $this->ui->makeCollection( array($out, $modal) ); |
| 296 | 300 | |
| 301 | + $header = '__My Schedule__'; | |
| 302 | + $header = $this->ui->makeBlock( $header ) | |
| 303 | + ->tag('font-size', 5) | |
| 304 | + ; | |
| 297 | 305 | |
| 298 | 306 | $toCheck = 'schedule'; |
| 299 | 307 | $everyoneScheduleDisabled = $this->checkEveryoneScheduleDisabled(); |
| 300 | 308 | |
| 301 | - $hideui = isset( $params['hideui'] ) ? $params['hideui'] : array(); | |
| 302 | - if( ! array_intersect(array('pagetitle', 'all'), $hideui) ){ | |
| 303 | - $header = '__My Schedule__'; | |
| 304 | - $header = $this->ui->makeBlock( $header ) | |
| 305 | - ->tag('font-size', 5) | |
| 306 | - ; | |
| 307 | - $out = $this->ui->makeList( array($header, $out) ) | |
| 308 | - ->gutter(3) | |
| 309 | - ; | |
| 310 | - } | |
| 309 | + $out = $this->ui->makeList( array($header, $out) ) | |
| 310 | + ->gutter(3) | |
| 311 | + ; | |
| 311 | 312 | |
| 312 | 313 | // is wp? |
| 313 | 314 | if( defined('WPINC') && (! is_admin()) ){ |
| 314 | 315 | $tos = $this->self->toplinks(); |
| 316 | + // $tos = array( | |
| 317 | + // array( 'admin', '__Administration__' ), | |
| 318 | + // array( 'user/profile', '__Profile__' ), | |
| 319 | + // ); | |
| 315 | 320 | |
| 316 | 321 | $headerLinks = array(); |
| 317 | 322 | foreach( $tos as $to ){ |
| 318 | 323 | $checkTo = is_array( $to[0] ) ? $to[0][0] : $to[0]; |
| @@ -573,11 +578,9 @@ | ||
| 573 | 578 | 'start' => $start, |
| 574 | 579 | 'end' => $end, |
| 575 | 580 | 'employee' => $employee, |
| 576 | 581 | 'calendar' => $calendar, |
| 577 | - 'hideui' => $hideui, | |
| 578 | - 't1' => null, | |
| 579 | - 't2' => null, | |
| 582 | + 'hideui' => $hideui | |
| 580 | 583 | ); |
| 581 | 584 | |
| 582 | 585 | $params = $this->request->getParams(); |
| 583 | 586 | $params = array_merge( $defaultParams, $params ); |
