application.html.slim conflict

application.html.slim

doctype html
html
  head
    title PdpIndonesia
    = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
    = javascript_include_tag 'application', 'data-turbolinks-track' => true
    = javascript_include_tag "//www.google.com/jsapi", "chartkick"
    = csrf_meta_tags
  body
    #wrapper
      #sidebar-wrapper

        nav#spy.navbar-inverse role="navigation"
          ul.sidebar-nav.nav
            li.sidebar-brand
              a.logo[href="#home"]
                | YOUR COMPANY LOGO
            .user-action
              button.btn-user.btn.btn-default.btn-lg data-toggle="tooltip" data-placement="top" title="Hi, #{current_user.username}!"
                / = link_to if current_user.present?
                i.fa.fa-user
              button.btn-user.btn.btn-default.btn-lg
                i.fa.fa-home
                / = user_signed_in? ? link_to('Logout', destroy_user_session_path, :method => :delete) : link_to('Login', new_user_session_path)
            li
              = link_to current_user.present? ? companypage_path(current_user.company.slug) : nil do
                i.fa.fa-circle-thin.fa-stack-2x
                i.fa.fa-dashboard.fa-1x.solo
                b Dashboard

              end
            li
              a.collapsed aria-controls="collapseOne" aria-expanded="true" data-parent="#accordion" data-toggle="collapse" href="#collapseOne"
                i.fa.fa-circle-thin.fa-stack-2x
                i.fa.fa-pencil.fa-1x.solo
                b Data Transaction
              ul#collapseOne.panel-collapse.collapse aria-labelledby="headingOne" role="tabpanel"
                li.accordion-item
                  = link_to 'Employee Payrol', current_user.present? ? company_payrolls_path(current_user.company.slug) : nil
                li.accordion-item
                  = link_to 'Non-Employee Payrol', current_user.present? ? company_non_employee_payrolls_path(current_user.company.slug) : nil
                li.accordion-item
                  = link_to "Attendance", current_user.present? ? attendance_page_path(current_user.company.slug) : nil
                li.accordion-item
                  = link_to "Timesheet", current_user.present? ? company_timesheets_path(current_user.company.slug) : nil

            li
              a.collapsed aria-controls="collapseTwo" aria-expanded="false" data-parent="#accordion" data-toggle="collapse" href="#collapseTwo"
                i.fa.fa-circle-thin.fa-stack-2x
                i.fa.fa-file-text-o.fa-1x.solo
                b Reports
              ul#collapseTwo.panel-collapse.collapse aria-labelledby="headingTwo" role="tabpanel"
                li.accordion-item
                  = link_to "Tax Report - 1721 - I", current_user.present? ? company_tax_report_1721_I_path(current_user.company.slug) : nil
                li.accordion-item
                 = link_to "Tax Report - 1721 - II", current_user.present? ? company_tax_report_1721_II_path(current_user.company.slug) : nil
                li.accordion-item
                  = link_to "Tax Report - 1721 - III", current_user.present? ? company_tax_report_1721_III_path(current_user.company.slug) : nil

                li.accordion-item
              a.collapsed aria-controls="collapseThree" aria-expanded="false" data-parent="#accordion" data-toggle="collapse" href="#collapseThree"

                i.fa.fa-circle-thin.fa-stack-2x
<<<<<<< HEAD
                i.fa.fa-key.fa-1x.solo  
=======
                i.fa.fa-file-text-o.fa-1x.solo
>>>>>>> 0a102ddf4033eec1531c4c5bd9b7780e0ba11d1b
                b Setting
              ul#collapseThree.panel-collapse.collapse aria-labelledby="headingThree" role="tabpanel"
                li.accordion-item
                  = link_to 'Company Master', current_user.present? ? company_company_path(company_id: current_user.company.slug, id: current_user.company.id) : nil
                li.accordion-item
                  = link_to 'Payroll Setup', {tabindex: "-1"}
                / li
                /   = link_to 'Payroll', current_user.present? ? variable_page_path(current_user.company.slug) : nil
                li.accordion-item
                  = link_to 'Holiday', current_user.present? ? holiday_page_path(current_user.company.slug) : nil
                li.accordion-item
                  = link_to 'Work Group', current_user.present? ? company_company_work_groups_path(current_user.company.slug) : nil
                li.accordion-item
                  = link_to 'Employee Master', current_user.present? ? company_users_path(current_user.company.slug) : nil

<<<<<<< HEAD
=======
        /     li.sidebar-brand
        /       a.logo[href="#home"]
        /         | YOUR COMPANY LOGO
        /     li
        /       = link_to 'Dashboard', current_user.present? ? companypage_path(current_user.company.slug) : nil
        /     li
        /       a.dropdown-toggle data-toggle="dropdown" href="#"
        /         | Data Transaction
        /         b.caret
        /       ul
        /         li
        /           = link_to 'Employee Payrol', current_user.present? ? company_payrolls_path(current_user.company.slug) : nil
        /         li
        /           = link_to 'Non-Employee Payrol', current_user.present? ? company_non_employee_payrolls_path(current_user.company.slug) : nil
        /         li
        /           = link_to "Employee's Debt", current_user.present? ? company_employee_debts_path(current_user.company.slug) : nil
        /         li
        /           = link_to "Attendance", current_user.present? ? attendance_page_path(current_user.company.slug) : nil
        /         li
        /           = link_to "Timesheet", current_user.present? ? company_timesheets_path(current_user.company.slug) : nil
        /     li
        /       a.dropdown-toggle data-toggle="dropdown" href="#"
        /         | Reports
        /         b.caret
        /       ul
        /         li
        /           = link_to "Tax Report - 1721 - I", current_user.present? ? company_tax_report_1721_I_path(current_user.company.slug) : nil
        /         li
        /           = link_to "Tax Report - 1721 - II", current_user.present? ? company_tax_report_1721_II_path(current_user.company.slug) : nil
        /         li
        /           = link_to "Tax Report - 1721 - III", current_user.present? ? company_tax_report_1721_III_path(current_user.company.slug) : nil
        /         li
        /           = link_to "Payroll Report", {tabindex: "-1"}
        /           ul
        /             li
        /               = link_to 'Monthly Employee Salary Detail', current_user.present? ? company_payroll_reports_salary_detail_path(current_user.company.slug) : nil
        /             li
        /               = link_to 'Employee Salary Receipt', current_user.present? ? company_payroll_reports_salary_receipt_path(current_user.company.slug) : nil
        /             li
        /               = link_to 'Salary per Department Report', current_user.present? ? company_payroll_reports_salary_per_department_path(current_user.company.slug) : nil
        /             li
        /               = link_to 'Bank Transfer Report', current_user.present? ? company_payroll_reports_bank_transfer_form_path(current_user.company.slug) : nil
        /     li
        /       a.dropdown-toggle data-toggle="dropdown" href="#"
        /         | Setting
        /         b.caret
        /       ul
        /         li
        /           = link_to 'Company Master', current_user.present? ? company_company_path(company_id: current_user.company.slug, id: current_user.company.id) : nil
        /         li
        /           = link_to 'Payroll Setup', {tabindex: "-1"}
        /           ul.dropdown-menu
        /             li
        /               = link_to 'Payroll', current_user.present? ? variable_page_path(current_user.company.slug) : nil
        /             li
        /               = link_to 'Holiday', current_user.present? ? holiday_page_path(current_user.company.slug) : nil
        /             li
        /               = link_to 'Work Group', current_user.present? ? company_company_work_groups_path(current_user.company.slug) : nil
        /         li
        /           = link_to 'Employee Master', current_user.present? ? company_users_path(current_user.company.slug) : nil

        /       ul.nav.navbar-nav.navbar-right
        /         li
        /           = link_to "Hi, #{current_user.username}!" if current_user.present?
        /         li
        /           = user_signed_in? ? link_to('Logout', destroy_user_session_path, :method => :delete) : link_to('Login', new_user_session_path)
>>>>>>> 0a102ddf4033eec1531c4c5bd9b7780e0ba11d1b
      #page-content-wrapper
        nav.navbar.navbar-static-top role="navigation"
          a#menu-toggle.pull-left.glyphicon.toggle[href="#"]
            i.fa.fa-bars.fa-2x.pull-left
            a.admin href="/admin/companies/new"  Wellcome, PDP admin!
      .page-content.inset
        .row
          - if flash[:notice].present?
              .notice.alert.alert-success align="center" data-dismiss="alert"
                button.close data-dismiss="alert" type="button"
                  span aria-hidden="true"  &times;
                  span.sr-only Close
<<<<<<< HEAD
                = notice
          - if flash[:alert].present?
            .alert.alert-danger align="center" data-dismiss="alert"
              button.close data-dismiss="alert" type="button"
                span aria-hidden="true"  &times;
                span.sr-only Close
              = alert
          == breadcrumbs pretext: " ", display_single_fragment: true, style: :bootstrap
          = yield
=======
                = alert
            == breadcrumbs pretext: " ", display_single_fragment: true, style: :bootstrap
            = yield


    / nav.navbar.navbar-inverse.navbar-static-top role="navigation"
    /   .container-fluid
    /     /! Brand and toggle get grouped for better mobile display
    /     .navbar-header
    /       button.navbar-toggle data-target="#navbarCollapse" data-toggle="collapse" type="button"
    /         span.sr-only Toggle navigation
    /         span.icon-bar
    /         span.icon-bar
    /         span.icon-bar
    /       a.navbar-brand = user_signed_in? ? current_user.company.name : "Company"
    /     /! Collection of nav links and other content for toggling
    /     #navbarCollapse.collapse.navbar-collapse
    /       ul.nav.navbar-nav
    /         li
    /           = link_to 'Dashboard', current_user.present? ? companypage_path(current_user.company.slug) : nil
    /         li.dropdown
    /           a.dropdown-toggle data-toggle="dropdown" href="#"
    /             | Data Transaction
    /             b.caret
    /           ul.dropdown-menu
    /             li
    /               = link_to 'Employee Payrol', current_user.present? ? company_payrolls_path(current_user.company.slug) : nil
    /             li
    /               = link_to 'Non-Employee Payrol', current_user.present? ? company_non_employee_payrolls_path(current_user.company.slug) : nil
    /             li
    /               = link_to "Employee's Debt", current_user.present? ? company_employee_debts_path(current_user.company.slug) : nil
    /             li
    /               = link_to "Attendance", current_user.present? ? attendance_page_path(current_user.company.slug) : nil
    /             li
    /               = link_to "Timesheet", current_user.present? ? company_timesheets_path(current_user.company.slug) : nil
    /         li.dropdown
    /           a.dropdown-toggle data-toggle="dropdown" href="#"
    /             | Reports
    /             b.caret
    /           ul.dropdown-menu
    /             li
    /               = link_to "Tax Report - 1721 - I", current_user.present? ? company_tax_report_1721_I_path(current_user.company.slug) : nil
    /             li
    /               = link_to "Tax Report - 1721 - II", current_user.present? ? company_tax_report_1721_II_path(current_user.company.slug) : nil
    /             li
    /               = link_to "Tax Report - 1721 - III", current_user.present? ? company_tax_report_1721_III_path(current_user.company.slug) : nil
    /             li.dropdown-submenu
    /               = link_to "Payroll Report", {tabindex: "-1"}
    /               ul.dropdown-menu
    /                 li
    /                   = link_to 'Monthly Employee Salary Detail', current_user.present? ? company_payroll_reports_salary_detail_path(current_user.company.slug) : nil
    /                 li
    /                   = link_to 'Employee Salary Receipt', current_user.present? ? company_payroll_reports_salary_receipt_path(current_user.company.slug) : nil
    /                 li
    /                   = link_to 'Salary per Department Report', current_user.present? ? company_payroll_reports_salary_per_department_path(current_user.company.slug) : nil
    /                 li
    /                   = link_to 'Bank Transfer Report', current_user.present? ? company_payroll_reports_bank_transfer_form_path(current_user.company.slug) : nil
    /         li.dropdown
    /           a.dropdown-toggle data-toggle="dropdown" href="#"
    /             | Setting
    /             b.caret
    /           ul.dropdown-menu
    /             li
    /               = link_to 'Company Master', current_user.present? ? company_company_path(company_id: current_user.company.slug, id: current_user.company.id) : nil
    /             li.dropdown-submenu
    /               = link_to 'Payroll Setup', {tabindex: "-1"}
    /               ul.dropdown-menu
    /                 li
    /                   = link_to 'Payroll', current_user.present? ? variable_page_path(current_user.company.slug) : nil
    /                 li
    /                   = link_to 'Holiday', current_user.present? ? holiday_page_path(current_user.company.slug) : nil
    /                 li
    /                   = link_to 'Work Group', current_user.present? ? company_company_work_groups_path(current_user.company.slug) : nil
    /             li
    /               = link_to 'Employee Master', current_user.present? ? company_users_path(current_user.company.slug) : nil

    /       ul.nav.navbar-nav.navbar-right
    /         li
    /           = link_to "Hi, #{current_user.username}!" if current_user.present?
    /         li.active
    /           = user_signed_in? ? link_to('Logout', destroy_user_session_path, :method => :delete) : link_to('Login', new_user_session_path)

            / - if flash[:notice].present?
            /     .notice.alert.alert-success align="center" data-dismiss="alert"
            /       button.close data-dismiss="alert" type="button"
            /         span aria-hidden="true"  &times;
            /         span.sr-only Close
            /       = notice
            / - if flash[:alert].present?
            /   .alert.alert-danger align="center" data-dismiss="alert"
            /     button.close data-dismiss="alert" type="button"
            /       span aria-hidden="true"  &times;
            /       span.sr-only Close
            /     = alert
            / == breadcrumbs pretext: " ", display_single_fragment: true, style: :bootstrap

>>>>>>> 0a102ddf4033eec1531c4c5bd9b7780e0ba11d1b

javascript:
  /*Menu-toggle*/
  $("#menu-toggle").click(function(e) {
      e.preventDefault();
      $("#wrapper").toggleClass("active");
  });