Plugin Directory

Changeset 2134277


Ignore:
Timestamp:
08/05/2019 01:17:31 PM (7 years ago)
Author:
hitcode
Message:

4.4.5

Location:
shiftcontroller/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • shiftcontroller/trunk/languages/shiftcontroller-nl_NL.po

    r2107416 r2134277  
    88"Content-Type: text/plain; charset=UTF-8\n"
    99"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"
    1212"Plural-Forms: nplurals=2; plural=(n != 1);\n"
    1313"Language: nl_NL\n"
     
    3232
    3333msgid "Add New User"
    34 msgstr ""
     34msgstr "Nieuwe gebruiker toevoegen"
    3535
    3636msgid "Add To Managers"
     
    3838
    3939msgid "Add To Viewers"
    40 msgstr ""
     40msgstr "Aan kijkers toevoegen"
    4141
    4242msgid "Addons"
     
    5656
    5757msgid "All Calendars"
    58 msgstr "Alle agenda"
     58msgstr "Alle agenda's"
    5959
    6060msgid "All Day"
     
    8383
    8484msgid "Assign Employee"
    85 msgstr "Medewerker Toewijzen"
     85msgstr "Medewerker toewijzen"
    8686
    8787msgid "At least one shift type is required for a calendar."
    88 msgstr "Er is minimaal één dienst type nodig voor een agenda"
     88msgstr "Er is minimaal één diensttype nodig voor een agenda."
    8989
    9090msgid "Availability"
     
    9595
    9696msgid "Biweekly"
    97 msgstr ""
     97msgstr "Tweewekelijks"
    9898
    9999msgid "Body"
     
    125125
    126126msgid "Calendar Updated"
    127 msgstr "Agenda Geüpdated"
     127msgstr "Agenda aangepast"
    128128
    129129msgid "Calendars"
    130 msgstr "Agendas"
     130msgstr "Agenda's"
    131131
    132132msgid "Cancel"
     
    134134
    135135msgid "Cancel Pickup Request"
    136 msgstr "Ophaalopdracht annuleren"
     136msgstr "Oppakverzoek annuleren"
    137137
    138138msgid "Cancel Pickup Request For Own Shifts"
    139 msgstr "Ophaalopdracht van eigen dienst annuleren"
     139msgstr "Oppakverzoek van eigen dienst annuleren"
    140140
    141141msgid "Change Employee"
     
    143143
    144144msgid "Change Password"
    145 msgstr ""
     145msgstr "Verander wachtwoord"
    146146
    147147msgid "Change Time"
     
    149149
    150150msgid "Changing time here will not affect existing shifts."
    151 msgstr ""
     151msgstr "Het veranderen van de tijd heeft geen invloed op bestaande diensten."
    152152
    153153msgid "Click one of these links to set it up."
     
    167167
    168168msgid "Confirm Password"
    169 msgstr ""
     169msgstr "Bevestig wachtwoord"
    170170
    171171msgid "Conflicts"
     
    179179
    180180msgid "Create Own Draft Shifts"
    181 msgstr "Maak eigen dienst ontwerp"
     181msgstr "Maak eigen dienstontwerp"
    182182
    183183msgid "Create Own Published Shifts"
     
    185185
    186186msgid "Create Pickup Request For Own Shifts"
    187 msgstr "Maak een ophaalopdracht voor eigen dienst"
     187msgstr "Maak een oppakverzoek voor eigen dienst"
    188188
    189189msgid "Create Published"
    190 msgstr "Maak gepubliseerd"
     190msgstr "Publiceren"
    191191
    192192msgid "Current Time"
     
    206206
    207207msgid "Daily"
    208 msgstr ""
     208msgstr "Dagelijks"
    209209
    210210msgid "Database Error"
    211 msgstr "Database foutmelding"
     211msgstr "Databasefout"
    212212
    213213msgid "Date"
     
    230230
    231231msgid "Days Of Week Disabled"
    232 msgstr "Dagen of weken uitgezet"
     232msgstr "Niet gebruikte weekdagen"
    233233
    234234msgid "Default"
    235 msgstr ""
     235msgstr "Standaard"
    236236
    237237msgid "Delete"
    238 msgstr "Verwijder"
     238msgstr "Verwijderen"
    239239
    240240msgid "Delete All Shifts"
     
    242242
    243243msgid "Description"
    244 msgstr "Omschrijving"
     244msgstr "Beschrijving"
    245245
    246246msgid "Disable"
     
    248248
    249249msgid "Display Name"
    250 msgstr ""
     250msgstr "Naam weergeven"
    251251
    252252msgid "Download"
     
    257257
    258258msgid "Draft Shift Created"
    259 msgstr "Concept dienst gecreërd"
     259msgstr "Concept dienst gecreëerd"
    260260
    261261msgid "Drop Down"
     
    275275
    276276msgid "Email Address"
    277 msgstr ""
     277msgstr "E-mailadres"
    278278
    279279msgid "Email Format"
    280 msgstr "E-mail type"
     280msgstr "E-mailtype"
    281281
    282282msgid "Email Sent To"
     
    293293
    294294msgid "Employee Can View In Others Shifts"
    295 msgstr "Medewerker kan andere hun diensten inzien"
     295msgstr "Medewerker kan diensten van anderen inzien"
    296296
    297297msgid "Employee Can View In Own Shifts"
     
    335335
    336336msgid "Everyone Schedule"
    337 msgstr "Iedereens schema"
     337msgstr "Volledig rooster"
    338338
    339339msgid "Filter"
     
    347347
    348348msgid "Full Day Counts As"
    349 msgstr "Volledig dag tellen als"
     349msgstr "Volledige dag tellen als"
    350350
    351351msgid "Get New Password"
    352 msgstr ""
     352msgstr "Voer nieuw wachtwoord in"
    353353
    354354msgid "Group By"
     
    359359
    360360msgid "Hide Hours Reports In Schedule View"
    361 msgstr "Verschuil uren in rapporten in schemaoverzicht"
     361msgstr "Verberg uren in roosteroverzicht"
    362362
    363363msgid "Holidays"
     
    371371
    372372msgid "Import WordPress Users"
    373 msgstr ""
     373msgstr "Importeer WordPress-gebruikers"
    374374
    375375msgid "Import WordPress Users As Employees"
    376 msgstr ""
     376msgstr "Importeer WordPress-gebruikers als medewerkers"
    377377
    378378msgid "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."
     
    383383
    384384msgid "Is Viewer"
    385 msgstr ""
     385msgstr "Is kijker"
    386386
    387387msgid "Label"
     
    389389
    390390msgid "Language"
    391 msgstr ""
     391msgstr "Taal"
    392392
    393393msgid "Link Employee To User Account"
     
    407407
    408408msgid "Linked Employee"
    409 msgstr "medewerker gekoppeld"
     409msgstr "Medewerker gekoppeld"
    410410
    411411msgid "Linked User Account"
     
    419419
    420420msgid "Logged In"
    421 msgstr ""
     421msgstr "Ingelogd"
    422422
    423423msgid "Logged Out"
    424 msgstr ""
     424msgstr "Uitgelogd"
    425425
    426426msgid "Login"
    427 msgstr ""
     427msgstr "Inloggen"
    428428
    429429msgid "Logout"
    430 msgstr ""
     430msgstr "Uitloggen"
    431431
    432432msgid "Lost Your Password?"
    433 msgstr ""
     433msgstr "Wachtwoord vergeten?"
    434434
    435435msgid "Lunch Break"
     
    437437
    438438msgid "Lunch break should be within shift hours."
    439 msgstr "Middagpauze moet binnen de dienst vallen"
     439msgstr "Middagpauze moet binnen de dienst vallen."
    440440
    441441msgid "Make sure you change it after first login!"
    442 msgstr ""
     442msgstr "Zorg ervoor dat je het na de eerste keer inloggen aanpast!"
    443443
    444444msgid "Managed Calendars"
    445 msgstr "Beheerde agendas"
     445msgstr "Beheerde agenda's"
    446446
    447447msgid "Manager"
     
    458458
    459459msgid "Max"
    460 msgstr "Max"
     460msgstr "Max."
    461461
    462462msgid "Max End Time"
    463 msgstr "Max eindtijd"
     463msgstr "Max. eindtijd"
    464464
    465465msgid "Max value should not be less than min value"
    466 msgstr "Max waarde kan niet groter zijn dan min waarde"
     466msgstr "Max. waarde kan niet groter zijn dan min. waarde"
    467467
    468468msgid "Menu"
     
    470470
    471471msgid "Message"
    472 msgstr ""
     472msgstr "Bericht"
    473473
    474474msgid "Message Sent"
    475 msgstr ""
     475msgstr "Bericht verstuurd"
    476476
    477477msgid "Min"
     
    491491
    492492msgid "More Calendars"
    493 msgstr "Meer agenda"
     493msgstr "Meer agenda's"
    494494
    495495msgid "More Employees"
     
    500500
    501501msgid "My Schedule"
    502 msgstr "Mijn schema"
     502msgstr "Mijn rooster"
    503503
    504504msgid "N/A"
     
    521521
    522522msgid "New Password"
    523 msgstr ""
     523msgstr "Nieuw wachtwoord"
    524524
    525525msgid "New Shift Type Added"
    526 msgstr "Nieuwe dienst type toegevoegd"
     526msgstr "Nieuwe diensttype toegevoegd"
    527527
    528528msgid "New User Added"
    529 msgstr ""
     529msgstr "Nieuwe gebruiker toegevoegd"
    530530
    531531msgid "No"
     
    557557
    558558msgid "Notification Updated"
    559 msgstr "Berichtgeven aangepast"
     559msgstr "Berichtgeving aangepast"
    560560
    561561msgid "Notifications"
    562 msgstr "Berichtgevingen"
     562msgstr "Berichtgeving"
    563563
    564564msgid "Notifications Turned Off"
     
    572572
    573573msgid "One option per line."
    574 msgstr "Eén optie per regel "
     574msgstr "Eén optie per regel."
    575575
    576576msgid "Online Services"
     
    584584
    585585msgid "Or"
    586 msgstr ""
     586msgstr "Of"
    587587
    588588msgid "Other Employees"
     
    593593
    594594msgid "Password"
    595 msgstr ""
     595msgstr "Wachtwoord"
    596596
    597597msgid "Password Reset Information Sent To Your Email"
     
    647647
    648648msgid "Profile Updated"
    649 msgstr ""
     649msgstr "Profiel aangepast"
    650650
    651651msgid "Publish"
    652 msgstr "Publiseren"
     652msgstr "Publiceren"
    653653
    654654msgid "Published"
    655 msgstr "Gepubliseerd"
     655msgstr "Gepubliceerd"
    656656
    657657msgid "Reinstall"
     
    659659
    660660msgid "Reinstalled"
    661 msgstr "Herinstalleerd"
     661msgstr "Geherinstalleerd"
    662662
    663663msgid "Remove From Managers"
     
    665665
    666666msgid "Remove From Viewers"
    667 msgstr ""
     667msgstr "Van kijkers verwijderen"
    668668
    669669msgid "Repeat"
     
    671671
    672672msgid "Repeat Type"
    673 msgstr ""
     673msgstr "Herhaal type"
    674674
    675675msgid "Report"
     
    677677
    678678msgid "Request Pickup"
    679 msgstr "Verzoek om afhaling"
     679msgstr "Verzoek om dienst op te pakken"
    680680
    681681msgid "Required Field"
     
    707707
    708708msgid "Select All"
    709 msgstr ""
     709msgstr "Alles selecteren"
    710710
    711711msgid "Select Date"
     
    728728
    729729msgid "Send"
    730 msgstr ""
     730msgstr "Verzenden"
    731731
    732732msgid "Send Email From Address"
    733 msgstr ""
     733msgstr "E-mailadres afzender"
    734734
    735735msgid "Send Email From Name"
    736 msgstr ""
     736msgstr "Naam afzender"
    737737
    738738msgid "Send Test Email"
    739 msgstr ""
     739msgstr "Verstuur testmail"
    740740
    741741msgid "Settings"
     
    752752
    753753msgid "Shift Picked Up"
    754 msgstr ""
     754msgstr "Dienst opgepakt"
    755755
    756756msgid "Shift Pickup Request"
    757 msgstr "Dienst oppakverzoek"
     757msgstr "Dienstoppakverzoek"
    758758
    759759msgid "Shift Pickup Request Cancelled"
    760 msgstr "Dienst oppakverzoek geannuleerd"
     760msgstr "Dienstoppakverzoek geannuleerd"
    761761
    762762msgid "Shift Pickup Request Recorded"
    763 msgstr "Dienst oppakverzoek opgenomen"
     763msgstr "Dienstoppakverzoek genoteerd"
    764764
    765765msgid "Shift Published"
    766 msgstr "Dienst gepubliseerd"
     766msgstr "Dienst gepubliceerd"
    767767
    768768msgid "Shift Rescheduled"
     
    779779
    780780msgid "Shift Unpublished"
    781 msgstr "Dienst ongepubliseerd"
     781msgstr "Dienst niet gepubliceerd"
    782782
    783783msgid "Shift Updated"
    784 msgstr "Dienst geüpdated"
     784msgstr "Dienst aangepast"
    785785
    786786msgid "Shifts"
     
    788788
    789789msgid "Shifts Feed"
    790 msgstr "Diensten Feed"
     790msgstr "Diensten-feed"
    791791
    792792msgid "Show In Calendar"
     
    794794
    795795msgid "Show Shift Type Title In Calendar"
    796 msgstr "Toon type dienst titel in agenda"
     796msgstr "Toon titel van type dienst in agenda"
    797797
    798798msgid "Skip Notifications"
     
    836836
    837837msgid "Time Format"
    838 msgstr "Tijdsvorm"
     838msgstr "Tijdsnotatie"
    839839
    840840msgid "Time Off"
     
    851851
    852852msgid "To Date"
    853 msgstr "Dateren"
     853msgstr "Tot datum"
    854854
    855855msgid "Toggle All"
     
    866866
    867867msgid "Turn Off Notifications"
    868 msgstr "Kennisgeving uitzetten"
     868msgstr "Berichtgeving uitzetten"
    869869
    870870msgid "Turn On"
     
    881881
    882882msgid "Unpublish"
    883 msgstr "Ongepubliseerd"
     883msgstr "Niet gepubliceerd"
    884884
    885885msgid "Until"
    886 msgstr ""
     886msgstr "Totdat"
    887887
    888888msgid "Upgrade From 3.x"
     
    896896
    897897msgid "User Deleted"
    898 msgstr ""
     898msgstr "Gebruiker verwijderd"
    899899
    900900msgid "User Updated"
    901 msgstr ""
     901msgstr "Gebruiker aangepast"
    902902
    903903msgid "Username"
    904 msgstr ""
     904msgstr "Gebruikersnaam"
    905905
    906906msgid "Users"
     
    914914
    915915msgid "View Conflicts"
    916 msgstr "Conflicten zien laten"
     916msgstr "Conflicten laten zien"
    917917
    918918msgid "View Open Draft Shifts"
     
    923923
    924924msgid "View Others Draft Shifts"
    925 msgstr "Andere hun open werkverschuiving laten zien"
     925msgstr "Anderen hun open werkverschuiving laten zien"
    926926
    927927msgid "View Others Published Shifts"
    928 msgstr "Andere hun gepubliceerde diensten laten zien"
     928msgstr "Anderen hun gepubliceerde diensten laten zien"
    929929
    930930msgid "View Own Draft Shifts"
     
    935935
    936936msgid "Viewer Added To Calendar"
    937 msgstr ""
     937msgstr "Kijker aan agenda toegevoegd"
    938938
    939939msgid "Viewer Removed From Calendar"
    940 msgstr ""
     940msgstr "Kijker van agenda verwijderd"
    941941
    942942msgid "Viewers"
    943 msgstr ""
     943msgstr "Kijkers"
    944944
    945945msgid "Visitor"
     
    959959
    960960msgid "Weekly"
    961 msgstr ""
     961msgstr "Wekelijks"
    962962
    963963msgid "When a calendar is deleted, all its data and information is permanently removed."
     
    968968
    969969msgid "WordPress User Role"
    970 msgstr ""
     970msgstr "WordPress gebruikersrol"
    971971
    972972msgid "Work 1 day, off 3 days"
     
    995995
    996996msgid "iCal Sync"
    997 msgstr "iCal Synchronisatie"
    998 
     997msgstr "iCal synchronisatie"
  • shiftcontroller/trunk/readme.txt

    r2132253 r2134277  
    6060
    6161== 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.
    6266
    6367= 4.4.4 =
  • shiftcontroller/trunk/sh4/schedule/assets/js/calendar.js

    r2077277 r2134277  
    2525    });
    2626
    27     $calendar.on( 'click', '.sh4-shift-widget a', function(e)
     27    $calendar.on( 'click', '.sh4-shift-widget a.sh4-widget-loader', function(e)
    2828    {
    2929        $this = jQuery(this);
  • shiftcontroller/trunk/sh4/schedule/html/view/day.php

    r2120574 r2134277  
    2424    {
    2525        $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);
    2727
    2828        $this->ui = $ui;
     
    557557
    558558        foreach( $shifts as $shift ){
    559             $thisView = $this->widget->render( $shift, $iknow, $hori );
     559            $thisView = $this->widget->render( $shift, $iknow, $hori, $noZoom );
    560560            $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             }
    570561
    571562            $menu = array();
  • shiftcontroller/trunk/sh4/schedule/html/view/index.php

    r2107416 r2134277  
    22class SH4_Schedule_Html_View_Index
    33{
     4    protected $linksInFooter = TRUE;
     5
    46    public function __construct(
    57        HC3_Hooks $hooks,
     
    6264        $this->viewNewOptions = $hooks->wrap( $viewNewOptions );
    6365
    64         $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js');
     66        $enqueuer->addScript('schedule', 'sh4/schedule/assets/js/calendar.js?hcver=' . SH4_VERSION);
    6567    }
    6668
     
    276278            ;
    277279
     280    // add links to footer
     281        if( $this->linksInFooter && $headerDate ){
     282            $out = $this->ui->makeList( array($out, $headerDate) )
     283                ->gutter(3)
     284                ;
     285        }
     286
    278287        $this->layout
    279288            ->setContent( $out )
     
    574583        }
    575584
     585    // add links to footer
     586        if( $this->linksInFooter && $headerDate ){
     587            $out = $this->ui->makeList( array($out, $headerDate) )
     588                ->gutter(3)
     589                ;
     590        }
     591
    576592        $this->layout
    577593            ->setContent( $out )
  • shiftcontroller/trunk/sh4/schedule/html/view/list.php

    r2120574 r2134277  
    5050        foreach( $shifts as $shift ){
    5151            $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 );
    6353
    6454            $menu = array();
     
    154144            foreach( $shiftsBy[$calendarId] as $shift ){
    155145                $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 );
    167147
    168148                $menu = array();
     
    301281            foreach( $shiftsBy[$employeeId] as $shift ){
    302282                $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 );
    314284
    315285                $menu = array();
  • shiftcontroller/trunk/sh4/schedule/html/view/month.php

    r2120574 r2134277  
    2323    {
    2424        $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);
    2626
    2727        $this->ui = $ui;
     
    687687        foreach( $shifts as $shift ){
    688688            $id = $shift->getId();
    689 
    690689            $thisView = $this->widget->renderCompact( $shift );
    691690
     
    696695                    ->tag('block')
    697696                    ->tag('print')
     697                    ->addAttr('class', 'sh4-widget-loader')
    698698                    ;
    699699            }
  • shiftcontroller/trunk/sh4/schedule/html/view/week.php

    r2120574 r2134277  
    2222    {
    2323        $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);
    2525
    2626        $this->ui = $ui;
     
    735735        $return = array();
    736736        foreach( $shifts as $shift ){
    737             $thisView = $this->widget->render( $shift, $iknow, $hori );
    738 
    739737            $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 );
    749739
    750740            $menu = array();
  • shiftcontroller/trunk/sh4/shifts/view/widget.php

    r1909721 r2134277  
    157157    }
    158158
    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 )
    160160    {
    161161        $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 );
    163163        return $return;
    164164    }
     
    244244    }
    245245
    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 )
    247247    {
    248248        $id = $model->getId();
     
    294294        $keys = array_keys($out);
    295295        $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        }
    296307
    297308        if( $hori ){
     
    317328            ;
    318329
     330// return $out;
     331
    319332        if( $conflicts ){
    320333            $out
  • shiftcontroller/trunk/sh4/shifts/view/zoom.php

    r2072586 r2134277  
    7373    }
    7474
    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
    7782        $menu = $this->common->menu( $model );
    7883        $icons = $this->common->icons( $model );
    79 
    80         $rows = array();
    8184
    8285    // datetime
  • shiftcontroller/trunk/shiftcontroller4.php

    r2120574 r2134277  
    44 * Plugin URI: http://www.shiftcontroller.com/
    55 * Description: Staff scheduling plugin
    6  * Version: 4.4.4
     6 * Version: 4.4.5
    77 * Author: hitcode.com
    88 * Author URI: http://www.shiftcontroller.com/
     
    1111*/
    1212
    13 define( 'SH4_VERSION', 444 );
     13define( 'SH4_VERSION', 445 );
    1414
    1515if (! defined('ABSPATH')) exit; // Exit if accessed directly
Note: See TracChangeset for help on using the changeset viewer.