diff --git a/app/assets/stylesheets/_worktimes.scss b/app/assets/stylesheets/_worktimes.scss index 2f798766b..6daa45f11 100644 --- a/app/assets/stylesheets/_worktimes.scss +++ b/app/assets/stylesheets/_worktimes.scss @@ -83,7 +83,7 @@ $worktimes-weekcontent-hover-bg: $gray-lighter; .weeknav-calendar-row, .weeknav-add-row { padding: 0 $grid-gutter-width / 2; - line-height: 30px; + line-height: 40px; vertical-align: middle; border-width: 0 0 1px 0; border-style: solid; @@ -95,8 +95,28 @@ $worktimes-weekcontent-hover-bg: $gray-lighter; flex-wrap: wrap; border-left-width: 1px; border-right-width: 1px; + padding-left: 0; + margin: auto; + + .today-link-blue { + border-radius: 18px; + width: 100px; + font-size: medium; + margin: 6px; + } + + .today-link-white { + border-radius: 18px; + width: 100px; + font-size: medium; + margin: 6px; + background-color: white; + color: $gray-dark; + border-color: $gray-dark; + } > form { + align-items: center; .input-group-addon { display: inline-block; padding: 0; @@ -114,9 +134,9 @@ $worktimes-weekcontent-hover-bg: $gray-lighter; vertical-align: middle; } input { - width: 100px; - height: 30px; - padding: 0; + width: 130px; + height: 40px; + padding: 25px; border: 0; line-height: 30px; box-shadow: none; diff --git a/app/controllers/worktimes_controller.rb b/app/controllers/worktimes_controller.rb index fe4265e9e..535d9f45a 100644 --- a/app/controllers/worktimes_controller.rb +++ b/app/controllers/worktimes_controller.rb @@ -133,6 +133,8 @@ def set_week_days @week_days = (@selected_date.at_beginning_of_week..@selected_date.at_end_of_week).to_a @next_week_date = @week_days.last + 1.day @previous_week_date = @week_days.first - 7.days + + @today_week_date = Time.zone.today.at_beginning_of_week end def set_selected_date diff --git a/app/views/worktimes/index.html.haml b/app/views/worktimes/index.html.haml index 94d6f8652..69489935b 100644 --- a/app/views/worktimes/index.html.haml +++ b/app/views/worktimes/index.html.haml @@ -24,6 +24,10 @@ .weeknav-content .weeknav-calendar-row + - if @selected_date == @today_week_date + = link_to 'Heute', worktimes_url, class: 'btn btn-primary today-link-white' + - else + = link_to 'Heute', worktimes_url, class: 'btn btn-primary today-link-blue' = plain_form(Worktime.new, method: :get) do |f| :javascript