app/views/layouts/application.html.erb in ezii-os-1.1.0 vs app/views/layouts/application.html.erb in ezii-os-2.0.1

- old
+ new

@@ -4,16 +4,29 @@ <title>Banal Data</title> <%= csrf_meta_tags %> <%= csp_meta_tag %> <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %> + <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> + <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script> + <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> + + <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> + <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous"> <link rel="stylesheet" href="https://unpkg.com/leaflet@1.5.1/dist/leaflet.css" /> + <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> </head> <body> - <header style="margin-bottom: 100px;"> + <div class="container"> + <div class="row"> + <div class="col"> + + + + <header style="margin-bottom: 100px;"> <%= render 'navbar' %> </header> <main class="container" role="main"> <br /> @@ -26,16 +39,85 @@ <br /> <br /> <br /> </main> + + + + + </div> + </div> + <div class="row"> + <div class="col" style="margin-top: 200px"> + + + <footer style="border: 1px solid blue"> + <div class="float-left fixed-bottom" style="margin: 5px"> + <button + type="button" + class="btn btn-lg btn-danger" + data-toggle="popover" + title="New features" + data-content + = + ' + <ol> + <li> + eZii press release: bAnal D$T4 launched IPO as the first BBLS (BENEVOLENT BLEEDING LEAN STARTUP) to ever succeed globally + </li> + <li> + BBLS system needs a new idea for its mixture next to benevolence: HART, a suffering system HBBLS maybe? + </li> + <li> + eZii OS will launch its Slack integration Soon (ETA 10.10.2019) + </li> + </ol> + + <div class="toast" role="alert" aria-live="assertive" aria-atomic="true"> + <div class="toast-header"> + <img src="..." class="rounded mr-2" alt="..."> + <strong class="mr-auto">Bootstrap</strong> + <small>11 mins ago</small> + <button type="button" class="ml-2 mb-1 close" data-dismiss="toast" aria-label="Close"> + <span aria-hidden="true">&times;</span> + </button> + </div> + <div class="toast-body"> + Hello, world! This is a toast message. + </div> + </div> + ' + data-html=true + > + NEWS: Click to toggle popover + </button> + </div> + </footer> + + + + + + </div> + <div class="col"> + 2 of 4 + </div> + <div class="col"> + 3 of 4 + </div> + <div class="col"> + 4 of 4 + </div> + </div> + </div> + + </body> <foot> - <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %> - <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script> - <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script> - <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script> <script src="https://unpkg.com/leaflet@1.5.1/dist/leaflet.js"></script> + + <%= yield :foot %> </foot> </html>