Changeset 2134277
- Timestamp:
- 08/05/2019 01:17:31 PM (7 years ago)
- Location:
- shiftcontroller/trunk
- Files:
-
- 12 edited
-
languages/shiftcontroller-nl_NL.mo (modified) (previous)
-
languages/shiftcontroller-nl_NL.po (modified) (60 diffs)
-
readme.txt (modified) (1 diff)
-
sh4/schedule/assets/js/calendar.js (modified) (1 diff)
-
sh4/schedule/html/view/day.php (modified) (2 diffs)
-
sh4/schedule/html/view/index.php (modified) (4 diffs)
-
sh4/schedule/html/view/list.php (modified) (3 diffs)
-
sh4/schedule/html/view/month.php (modified) (3 diffs)
-
sh4/schedule/html/view/week.php (modified) (2 diffs)
-
sh4/shifts/view/widget.php (modified) (4 diffs)
-
sh4/shifts/view/zoom.php (modified) (1 diff)
-
shiftcontroller4.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
shiftcontroller/trunk/languages/shiftcontroller-nl_NL.po
r2107416 r2134277 8 8 "Content-Type: text/plain; charset=UTF-8\n" 9 9 "Content-Transfer-Encoding: 8bit\n" 10 "X-Generator: Poedit 2.2.1\n"11 "Last-Translator: Sebastiaan Moltmaker (Failed@Design) \n"10 "X-Generator: Poedit 1.8.8\n" 11 "Last-Translator: Sebastiaan Moltmaker (Failed@Design)\n" 12 12 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 13 13 "Language: nl_NL\n" … … 32 32 33 33 msgid "Add New User" 34 msgstr " "34 msgstr "Nieuwe gebruiker toevoegen" 35 35 36 36 msgid "Add To Managers" … … 38 38 39 39 msgid "Add To Viewers" 40 msgstr " "40 msgstr "Aan kijkers toevoegen" 41 41 42 42 msgid "Addons" … … 56 56 57 57 msgid "All Calendars" 58 msgstr "Alle agenda "58 msgstr "Alle agenda's" 59 59 60 60 msgid "All Day" … … 83 83 84 84 msgid "Assign Employee" 85 msgstr "Medewerker Toewijzen"85 msgstr "Medewerker toewijzen" 86 86 87 87 msgid "At least one shift type is required for a calendar." 88 msgstr "Er is minimaal één dienst type nodig voor een agenda"88 msgstr "Er is minimaal één diensttype nodig voor een agenda." 89 89 90 90 msgid "Availability" … … 95 95 96 96 msgid "Biweekly" 97 msgstr " "97 msgstr "Tweewekelijks" 98 98 99 99 msgid "Body" … … 125 125 126 126 msgid "Calendar Updated" 127 msgstr "Agenda Geüpdated"127 msgstr "Agenda aangepast" 128 128 129 129 msgid "Calendars" 130 msgstr "Agenda s"130 msgstr "Agenda's" 131 131 132 132 msgid "Cancel" … … 134 134 135 135 msgid "Cancel Pickup Request" 136 msgstr "Op haalopdrachtannuleren"136 msgstr "Oppakverzoek annuleren" 137 137 138 138 msgid "Cancel Pickup Request For Own Shifts" 139 msgstr "Op haalopdrachtvan eigen dienst annuleren"139 msgstr "Oppakverzoek van eigen dienst annuleren" 140 140 141 141 msgid "Change Employee" … … 143 143 144 144 msgid "Change Password" 145 msgstr " "145 msgstr "Verander wachtwoord" 146 146 147 147 msgid "Change Time" … … 149 149 150 150 msgid "Changing time here will not affect existing shifts." 151 msgstr " "151 msgstr "Het veranderen van de tijd heeft geen invloed op bestaande diensten." 152 152 153 153 msgid "Click one of these links to set it up." … … 167 167 168 168 msgid "Confirm Password" 169 msgstr " "169 msgstr "Bevestig wachtwoord" 170 170 171 171 msgid "Conflicts" … … 179 179 180 180 msgid "Create Own Draft Shifts" 181 msgstr "Maak eigen dienst ontwerp"181 msgstr "Maak eigen dienstontwerp" 182 182 183 183 msgid "Create Own Published Shifts" … … 185 185 186 186 msgid "Create Pickup Request For Own Shifts" 187 msgstr "Maak een op haalopdrachtvoor eigen dienst"187 msgstr "Maak een oppakverzoek voor eigen dienst" 188 188 189 189 msgid "Create Published" 190 msgstr " Maak gepubliseerd"190 msgstr "Publiceren" 191 191 192 192 msgid "Current Time" … … 206 206 207 207 msgid "Daily" 208 msgstr " "208 msgstr "Dagelijks" 209 209 210 210 msgid "Database Error" 211 msgstr "Database foutmelding"211 msgstr "Databasefout" 212 212 213 213 msgid "Date" … … 230 230 231 231 msgid "Days Of Week Disabled" 232 msgstr " Dagen of weken uitgezet"232 msgstr "Niet gebruikte weekdagen" 233 233 234 234 msgid "Default" 235 msgstr " "235 msgstr "Standaard" 236 236 237 237 msgid "Delete" 238 msgstr "Verwijder "238 msgstr "Verwijderen" 239 239 240 240 msgid "Delete All Shifts" … … 242 242 243 243 msgid "Description" 244 msgstr " Omschrijving"244 msgstr "Beschrijving" 245 245 246 246 msgid "Disable" … … 248 248 249 249 msgid "Display Name" 250 msgstr " "250 msgstr "Naam weergeven" 251 251 252 252 msgid "Download" … … 257 257 258 258 msgid "Draft Shift Created" 259 msgstr "Concept dienst gecreë rd"259 msgstr "Concept dienst gecreëerd" 260 260 261 261 msgid "Drop Down" … … 275 275 276 276 msgid "Email Address" 277 msgstr " "277 msgstr "E-mailadres" 278 278 279 279 msgid "Email Format" 280 msgstr "E-mail type"280 msgstr "E-mailtype" 281 281 282 282 msgid "Email Sent To" … … 293 293 294 294 msgid "Employee Can View In Others Shifts" 295 msgstr "Medewerker kan andere hun diensten inzien"295 msgstr "Medewerker kan diensten van anderen inzien" 296 296 297 297 msgid "Employee Can View In Own Shifts" … … 335 335 336 336 msgid "Everyone Schedule" 337 msgstr " Iedereens schema"337 msgstr "Volledig rooster" 338 338 339 339 msgid "Filter" … … 347 347 348 348 msgid "Full Day Counts As" 349 msgstr "Volledig dag tellen als"349 msgstr "Volledige dag tellen als" 350 350 351 351 msgid "Get New Password" 352 msgstr " "352 msgstr "Voer nieuw wachtwoord in" 353 353 354 354 msgid "Group By" … … 359 359 360 360 msgid "Hide Hours Reports In Schedule View" 361 msgstr "Ver schuil uren in rapporten in schemaoverzicht"361 msgstr "Verberg uren in roosteroverzicht" 362 362 363 363 msgid "Holidays" … … 371 371 372 372 msgid "Import WordPress Users" 373 msgstr " "373 msgstr "Importeer WordPress-gebruikers" 374 374 375 375 msgid "Import WordPress Users As Employees" 376 msgstr " "376 msgstr "Importeer WordPress-gebruikers als medewerkers" 377 377 378 378 msgid "Inside your Google Calendar open the Other Calendars menu in the left sidebar and select the Add by URL option. Paste one of these links then click the Add Calendar button. This will automatically add your shifts to Google Calendar." … … 383 383 384 384 msgid "Is Viewer" 385 msgstr " "385 msgstr "Is kijker" 386 386 387 387 msgid "Label" … … 389 389 390 390 msgid "Language" 391 msgstr " "391 msgstr "Taal" 392 392 393 393 msgid "Link Employee To User Account" … … 407 407 408 408 msgid "Linked Employee" 409 msgstr " medewerker gekoppeld"409 msgstr "Medewerker gekoppeld" 410 410 411 411 msgid "Linked User Account" … … 419 419 420 420 msgid "Logged In" 421 msgstr " "421 msgstr "Ingelogd" 422 422 423 423 msgid "Logged Out" 424 msgstr " "424 msgstr "Uitgelogd" 425 425 426 426 msgid "Login" 427 msgstr " "427 msgstr "Inloggen" 428 428 429 429 msgid "Logout" 430 msgstr " "430 msgstr "Uitloggen" 431 431 432 432 msgid "Lost Your Password?" 433 msgstr " "433 msgstr "Wachtwoord vergeten?" 434 434 435 435 msgid "Lunch Break" … … 437 437 438 438 msgid "Lunch break should be within shift hours." 439 msgstr "Middagpauze moet binnen de dienst vallen "439 msgstr "Middagpauze moet binnen de dienst vallen." 440 440 441 441 msgid "Make sure you change it after first login!" 442 msgstr " "442 msgstr "Zorg ervoor dat je het na de eerste keer inloggen aanpast!" 443 443 444 444 msgid "Managed Calendars" 445 msgstr "Beheerde agenda s"445 msgstr "Beheerde agenda's" 446 446 447 447 msgid "Manager" … … 458 458 459 459 msgid "Max" 460 msgstr "Max "460 msgstr "Max." 461 461 462 462 msgid "Max End Time" 463 msgstr "Max eindtijd"463 msgstr "Max. eindtijd" 464 464 465 465 msgid "Max value should not be less than min value" 466 msgstr "Max waarde kan niet groter zijn dan minwaarde"466 msgstr "Max. waarde kan niet groter zijn dan min. waarde" 467 467 468 468 msgid "Menu" … … 470 470 471 471 msgid "Message" 472 msgstr " "472 msgstr "Bericht" 473 473 474 474 msgid "Message Sent" 475 msgstr " "475 msgstr "Bericht verstuurd" 476 476 477 477 msgid "Min" … … 491 491 492 492 msgid "More Calendars" 493 msgstr "Meer agenda "493 msgstr "Meer agenda's" 494 494 495 495 msgid "More Employees" … … 500 500 501 501 msgid "My Schedule" 502 msgstr "Mijn schema"502 msgstr "Mijn rooster" 503 503 504 504 msgid "N/A" … … 521 521 522 522 msgid "New Password" 523 msgstr " "523 msgstr "Nieuw wachtwoord" 524 524 525 525 msgid "New Shift Type Added" 526 msgstr "Nieuwe dienst type toegevoegd"526 msgstr "Nieuwe diensttype toegevoegd" 527 527 528 528 msgid "New User Added" 529 msgstr " "529 msgstr "Nieuwe gebruiker toegevoegd" 530 530 531 531 msgid "No" … … 557 557 558 558 msgid "Notification Updated" 559 msgstr "Berichtgev enaangepast"559 msgstr "Berichtgeving aangepast" 560 560 561 561 msgid "Notifications" 562 msgstr "Berichtgeving en"562 msgstr "Berichtgeving" 563 563 564 564 msgid "Notifications Turned Off" … … 572 572 573 573 msgid "One option per line." 574 msgstr "Eén optie per regel "574 msgstr "Eén optie per regel." 575 575 576 576 msgid "Online Services" … … 584 584 585 585 msgid "Or" 586 msgstr " "586 msgstr "Of" 587 587 588 588 msgid "Other Employees" … … 593 593 594 594 msgid "Password" 595 msgstr " "595 msgstr "Wachtwoord" 596 596 597 597 msgid "Password Reset Information Sent To Your Email" … … 647 647 648 648 msgid "Profile Updated" 649 msgstr " "649 msgstr "Profiel aangepast" 650 650 651 651 msgid "Publish" 652 msgstr "Publi seren"652 msgstr "Publiceren" 653 653 654 654 msgid "Published" 655 msgstr "Gepubli seerd"655 msgstr "Gepubliceerd" 656 656 657 657 msgid "Reinstall" … … 659 659 660 660 msgid "Reinstalled" 661 msgstr " Herinstalleerd"661 msgstr "Geherinstalleerd" 662 662 663 663 msgid "Remove From Managers" … … 665 665 666 666 msgid "Remove From Viewers" 667 msgstr " "667 msgstr "Van kijkers verwijderen" 668 668 669 669 msgid "Repeat" … … 671 671 672 672 msgid "Repeat Type" 673 msgstr " "673 msgstr "Herhaal type" 674 674 675 675 msgid "Report" … … 677 677 678 678 msgid "Request Pickup" 679 msgstr "Verzoek om afhaling"679 msgstr "Verzoek om dienst op te pakken" 680 680 681 681 msgid "Required Field" … … 707 707 708 708 msgid "Select All" 709 msgstr " "709 msgstr "Alles selecteren" 710 710 711 711 msgid "Select Date" … … 728 728 729 729 msgid "Send" 730 msgstr " "730 msgstr "Verzenden" 731 731 732 732 msgid "Send Email From Address" 733 msgstr " "733 msgstr "E-mailadres afzender" 734 734 735 735 msgid "Send Email From Name" 736 msgstr " "736 msgstr "Naam afzender" 737 737 738 738 msgid "Send Test Email" 739 msgstr " "739 msgstr "Verstuur testmail" 740 740 741 741 msgid "Settings" … … 752 752 753 753 msgid "Shift Picked Up" 754 msgstr " "754 msgstr "Dienst opgepakt" 755 755 756 756 msgid "Shift Pickup Request" 757 msgstr "Dienst oppakverzoek"757 msgstr "Dienstoppakverzoek" 758 758 759 759 msgid "Shift Pickup Request Cancelled" 760 msgstr "Dienst oppakverzoek geannuleerd"760 msgstr "Dienstoppakverzoek geannuleerd" 761 761 762 762 msgid "Shift Pickup Request Recorded" 763 msgstr "Dienst oppakverzoek opgenomen"763 msgstr "Dienstoppakverzoek genoteerd" 764 764 765 765 msgid "Shift Published" 766 msgstr "Dienst gepubli seerd"766 msgstr "Dienst gepubliceerd" 767 767 768 768 msgid "Shift Rescheduled" … … 779 779 780 780 msgid "Shift Unpublished" 781 msgstr "Dienst ongepubliseerd"781 msgstr "Dienst niet gepubliceerd" 782 782 783 783 msgid "Shift Updated" 784 msgstr "Dienst geüpdated"784 msgstr "Dienst aangepast" 785 785 786 786 msgid "Shifts" … … 788 788 789 789 msgid "Shifts Feed" 790 msgstr "Diensten Feed"790 msgstr "Diensten-feed" 791 791 792 792 msgid "Show In Calendar" … … 794 794 795 795 msgid "Show Shift Type Title In Calendar" 796 msgstr "Toon t ype dienst titelin agenda"796 msgstr "Toon titel van type dienst in agenda" 797 797 798 798 msgid "Skip Notifications" … … 836 836 837 837 msgid "Time Format" 838 msgstr "Tijds vorm"838 msgstr "Tijdsnotatie" 839 839 840 840 msgid "Time Off" … … 851 851 852 852 msgid "To Date" 853 msgstr " Dateren"853 msgstr "Tot datum" 854 854 855 855 msgid "Toggle All" … … 866 866 867 867 msgid "Turn Off Notifications" 868 msgstr " Kennisgeving uitzetten"868 msgstr "Berichtgeving uitzetten" 869 869 870 870 msgid "Turn On" … … 881 881 882 882 msgid "Unpublish" 883 msgstr " Ongepubliseerd"883 msgstr "Niet gepubliceerd" 884 884 885 885 msgid "Until" 886 msgstr " "886 msgstr "Totdat" 887 887 888 888 msgid "Upgrade From 3.x" … … 896 896 897 897 msgid "User Deleted" 898 msgstr " "898 msgstr "Gebruiker verwijderd" 899 899 900 900 msgid "User Updated" 901 msgstr " "901 msgstr "Gebruiker aangepast" 902 902 903 903 msgid "Username" 904 msgstr " "904 msgstr "Gebruikersnaam" 905 905 906 906 msgid "Users" … … 914 914 915 915 msgid "View Conflicts" 916 msgstr "Conflicten zien laten"916 msgstr "Conflicten laten zien" 917 917 918 918 msgid "View Open Draft Shifts" … … 923 923 924 924 msgid "View Others Draft Shifts" 925 msgstr "Andere hun open werkverschuiving laten zien"925 msgstr "Anderen hun open werkverschuiving laten zien" 926 926 927 927 msgid "View Others Published Shifts" 928 msgstr "Andere hun gepubliceerde diensten laten zien"928 msgstr "Anderen hun gepubliceerde diensten laten zien" 929 929 930 930 msgid "View Own Draft Shifts" … … 935 935 936 936 msgid "Viewer Added To Calendar" 937 msgstr " "937 msgstr "Kijker aan agenda toegevoegd" 938 938 939 939 msgid "Viewer Removed From Calendar" 940 msgstr " "940 msgstr "Kijker van agenda verwijderd" 941 941 942 942 msgid "Viewers" 943 msgstr " "943 msgstr "Kijkers" 944 944 945 945 msgid "Visitor" … … 959 959 960 960 msgid "Weekly" 961 msgstr " "961 msgstr "Wekelijks" 962 962 963 963 msgid "When a calendar is deleted, all its data and information is permanently removed." … … 968 968 969 969 msgid "WordPress User Role" 970 msgstr " "970 msgstr "WordPress gebruikersrol" 971 971 972 972 msgid "Work 1 day, off 3 days" … … 995 995 996 996 msgid "iCal Sync" 997 msgstr "iCal Synchronisatie" 998 997 msgstr "iCal synchronisatie" -
shiftcontroller/trunk/readme.txt
r2132253 r2134277 60 60 61 61 == Changelog == 62 63 = 4.4.5 = 64 * Changed how links to shifts in calendar are displayed. That allows other links in custom fields if any to work properly. 65 * Schedule navigation links now in the footer too. 62 66 63 67 = 4.4.4 = -
shiftcontroller/trunk/sh4/schedule/assets/js/calendar.js
r2077277 r2134277 25 25 }); 26 26 27 $calendar.on( 'click', '.sh4-shift-widget a ', function(e)27 $calendar.on( 'click', '.sh4-shift-widget a.sh4-widget-loader', function(e) 28 28 { 29 29 $this = jQuery(this); -
shiftcontroller/trunk/sh4/schedule/html/view/day.php
r2120574 r2134277 24 24 { 25 25 $this->self = $hooks->wrap($this); 26 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js ');26 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js?hcver=' . SH4_VERSION); 27 27 28 28 $this->ui = $ui; … … 557 557 558 558 foreach( $shifts as $shift ){ 559 $thisView = $this->widget->render( $shift, $iknow, $hori );559 $thisView = $this->widget->render( $shift, $iknow, $hori, $noZoom ); 560 560 $shiftId = $shift->getId(); 561 562 if( ! $noZoom ){563 $to = 'shifts/' . $shiftId;564 $thisView = $this->ui->makeAhref( $to, $thisView )565 ->tag('unstyled-link')566 ->tag('block')567 ->tag('print')568 ;569 }570 561 571 562 $menu = array(); -
shiftcontroller/trunk/sh4/schedule/html/view/index.php
r2107416 r2134277 2 2 class SH4_Schedule_Html_View_Index 3 3 { 4 protected $linksInFooter = TRUE; 5 4 6 public function __construct( 5 7 HC3_Hooks $hooks, … … 62 64 $this->viewNewOptions = $hooks->wrap( $viewNewOptions ); 63 65 64 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js ');66 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js?hcver=' . SH4_VERSION); 65 67 } 66 68 … … 276 278 ; 277 279 280 // add links to footer 281 if( $this->linksInFooter && $headerDate ){ 282 $out = $this->ui->makeList( array($out, $headerDate) ) 283 ->gutter(3) 284 ; 285 } 286 278 287 $this->layout 279 288 ->setContent( $out ) … … 574 583 } 575 584 585 // add links to footer 586 if( $this->linksInFooter && $headerDate ){ 587 $out = $this->ui->makeList( array($out, $headerDate) ) 588 ->gutter(3) 589 ; 590 } 591 576 592 $this->layout 577 593 ->setContent( $out ) -
shiftcontroller/trunk/sh4/schedule/html/view/list.php
r2120574 r2134277 50 50 foreach( $shifts as $shift ){ 51 51 $id = $shift->getId(); 52 53 $thisView = $this->renderShift( $shift, $iknow, $hori ); 54 55 if( ! $noZoom ){ 56 $to = 'shifts/' . $id; 57 $thisView = $this->ui->makeAhref( $to, $thisView ) 58 ->tag('unstyled-link') 59 ->tag('block') 60 ->tag('print') 61 ; 62 } 52 $thisView = $this->renderShift( $shift, $iknow, $hori, $noZoom ); 63 53 64 54 $menu = array(); … … 154 144 foreach( $shiftsBy[$calendarId] as $shift ){ 155 145 $id = $shift->getId(); 156 157 $thisView = $this->renderShift( $shift, $iknow, $hori ); 158 159 if( ! $noZoom ){ 160 $to = 'shifts/' . $id; 161 $thisView = $this->ui->makeAhref( $to, $thisView ) 162 ->tag('unstyled-link') 163 ->tag('block') 164 ->tag('print') 165 ; 166 } 146 $thisView = $this->renderShift( $shift, $iknow, $hori, $noZoom ); 167 147 168 148 $menu = array(); … … 301 281 foreach( $shiftsBy[$employeeId] as $shift ){ 302 282 $id = $shift->getId(); 303 304 $thisView = $this->renderShift( $shift, $iknow, $hori ); 305 306 if( ! $noZoom ){ 307 $to = 'shifts/' . $id; 308 $thisView = $this->ui->makeAhref( $to, $thisView ) 309 ->tag('unstyled-link') 310 ->tag('block') 311 ->tag('print') 312 ; 313 } 283 $thisView = $this->renderShift( $shift, $iknow, $hori, $noZoom ); 314 284 315 285 $menu = array(); -
shiftcontroller/trunk/sh4/schedule/html/view/month.php
r2120574 r2134277 23 23 { 24 24 $this->self = $hooks->wrap($this); 25 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js ');25 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js?hcver=' . SH4_VERSION); 26 26 27 27 $this->ui = $ui; … … 687 687 foreach( $shifts as $shift ){ 688 688 $id = $shift->getId(); 689 690 689 $thisView = $this->widget->renderCompact( $shift ); 691 690 … … 696 695 ->tag('block') 697 696 ->tag('print') 697 ->addAttr('class', 'sh4-widget-loader') 698 698 ; 699 699 } -
shiftcontroller/trunk/sh4/schedule/html/view/week.php
r2120574 r2134277 22 22 { 23 23 $this->self = $hooks->wrap($this); 24 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js ');24 $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js?hcver=' . SH4_VERSION); 25 25 26 26 $this->ui = $ui; … … 735 735 $return = array(); 736 736 foreach( $shifts as $shift ){ 737 $thisView = $this->widget->render( $shift, $iknow, $hori );738 739 737 $id = $shift->getId(); 740 741 if( ! $noZoom ){ 742 $to = 'shifts/' . $id; 743 $thisView = $this->ui->makeAhref( $to, $thisView ) 744 ->tag('unstyled-link') 745 ->tag('block') 746 ->tag('print') 747 ; 748 } 738 $thisView = $this->widget->render( $shift, $iknow, $hori, $noZoom ); 749 739 750 740 $menu = array(); -
shiftcontroller/trunk/sh4/shifts/view/widget.php
r1909721 r2134277 157 157 } 158 158 159 public function render( SH4_Shifts_Model $model, $iknow = array(), $hori = FALSE )159 public function render( SH4_Shifts_Model $model, $iknow = array(), $hori = FALSE, $noLink = FALSE ) 160 160 { 161 161 $out = $this->self->prepare( $model, $iknow ); 162 $return = $this->self->renderPrepared( $model, $out, $iknow, $hori );162 $return = $this->self->renderPrepared( $model, $out, $iknow, $hori, $noLink ); 163 163 return $return; 164 164 } … … 244 244 } 245 245 246 public function renderPrepared( SH4_Shifts_Model $model, $out, $iknow = array(), $hori = FALSE )246 public function renderPrepared( SH4_Shifts_Model $model, $out, $iknow = array(), $hori = FALSE, $noLink = FALSE ) 247 247 { 248 248 $id = $model->getId(); … … 294 294 $keys = array_keys($out); 295 295 $firstKey = array_shift($keys); 296 297 // LINK 298 if( ! $noLink ){ 299 $to = 'shifts/' . $id; 300 $out[$firstKey] = $this->ui->makeAhref( $to, $out[$firstKey] ) 301 // ->tag('unstyled-link') 302 ->tag('block') 303 ->tag('print') 304 ->addAttr('class', 'sh4-widget-loader') 305 ; 306 } 296 307 297 308 if( $hori ){ … … 317 328 ; 318 329 330 // return $out; 331 319 332 if( $conflicts ){ 320 333 $out -
shiftcontroller/trunk/sh4/shifts/view/zoom.php
r2072586 r2134277 73 73 } 74 74 75 public function rows( SH4_Shifts_Model $model ) 76 { 75 public function rows( SH4_Shifts_Model $model = NULL ) 76 { 77 $rows = array(); 78 if( ! $model ){ 79 return $rows; 80 } 81 77 82 $menu = $this->common->menu( $model ); 78 83 $icons = $this->common->icons( $model ); 79 80 $rows = array();81 84 82 85 // datetime -
shiftcontroller/trunk/shiftcontroller4.php
r2120574 r2134277 4 4 * Plugin URI: http://www.shiftcontroller.com/ 5 5 * Description: Staff scheduling plugin 6 * Version: 4.4. 46 * Version: 4.4.5 7 7 * Author: hitcode.com 8 8 * Author URI: http://www.shiftcontroller.com/ … … 11 11 */ 12 12 13 define( 'SH4_VERSION', 44 4);13 define( 'SH4_VERSION', 445 ); 14 14 15 15 if (! defined('ABSPATH')) exit; // Exit if accessed directly
Note: See TracChangeset
for help on using the changeset viewer.