-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #189 from alaashafaee/C1_Assuty_123_view_layout
View Layout #123 Strory 1.20
- Loading branch information
Showing
14 changed files
with
7,118 additions
and
20 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,13 @@ | ||
| <p>This line is from the footer file. </p> | ||
| <!-- | ||
| # [View Layout - Story 1.2] | ||
| # General layout for footer | ||
| # Author: Ahmed Elassuty | ||
| --> | ||
| <div style="margin-top:20px"> | ||
| <span style="margin:5px"> | ||
| <%= link_to "About us"%> | ||
| </span> | ||
| <span style="margin:5px"> | ||
| <%= link_to "Contact us"%> | ||
| </span> | ||
| </div> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <!-- | ||
| # [View Layout - Story 1.2] | ||
| # General layout for left side bar | ||
| # Author: Ahmed Elassuty | ||
| --> | ||
| <div id="left_side_bar" align="left" class="col-lg-4 well pull-left side-bar-left-fix-rat"> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| <!-- | ||
| # [View Layout - Story 1.2] | ||
| # logout button configurations | ||
| # Author: Ahmed Elassuty | ||
| --> | ||
| <ul class="nav navbar-nav navbar-right" id="navbar-main"> | ||
| <%- if lecturer_signed_in?%> | ||
| <li style="margin-top:10px"> | ||
| <%= button_to 'Log Out',destroy_lecturer_session_path,class: "btn btn-danger", method: :delete %> | ||
| </li> | ||
| <%- elsif student_signed_in?%> | ||
| <li style="margin-top:10px"> | ||
| <%= button_to 'Log Out',destroy_student_session_path,class: "btn btn-danger",method: :delete %> | ||
| </li> | ||
| <%- elsif teaching_assistant_signed_in?%> | ||
| <li style="margin-top:10px"> | ||
| <%= button_to 'Log Out', destroy_teaching_assistant_session_path, class: "btn btn-danger" ,method: :delete %> | ||
| </li> | ||
| <% end%> | ||
| </ul> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <!-- | ||
| # [View Layout - Story 1.2] | ||
| # General layout for right side bar | ||
| # Author: Ahmed Elassuty | ||
| --> | ||
| <div id="right_side_bar" align="right" class="col-lg-4 well pull-right side-bar-right-fix-rat"> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <!-- | ||
| # [View Layout - Story 1.2] | ||
| # Sign in header | ||
| # Author: Ahmed Elassuty | ||
| --> | ||
| <div class="navbar-header"> | ||
| <form class="navbar-form navbar-left"> | ||
| <input type="text" class="form-control col-lg-8" placeholder="Search"> | ||
| </form> | ||
| </div> | ||
| <div class="navbar-collapse collapse" id="navbar-main"> | ||
| <%= render "layouts/log_out_form" %> | ||
| </div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,37 @@ | ||
| <!-- | ||
| # [View Layout - Story 1.2] | ||
| # General layout | ||
| # Author: Ahmed Elassuty | ||
| --> | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <title>CoolSoft - Java Tutor</title> | ||
| <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> | ||
| <%= javascript_include_tag "application", "data-turbolinks-track" => true %> | ||
| <%= csrf_meta_tags %> | ||
| </head> | ||
| <body> | ||
|
|
||
| <p>This line is from the main application layout file. <a href='http://guides.rubyonrails.org/layouts_and_rendering.html'>Read more here.</a></p> | ||
|
|
||
| <%= render partial: "layouts/header" %> | ||
|
|
||
| <%= yield %> | ||
|
|
||
| <%= render partial: "layouts/footer" %> | ||
|
|
||
| </body> | ||
| </html> | ||
| <head> | ||
| <title>CoolSoft - Java Tutor</title> | ||
| <%= stylesheet_link_tag "application", "bootstrap", "bootstrap.min", :media => "all"%> | ||
| <%= javascript_include_tag "application","jquery"%> | ||
| <%= csrf_meta_tags%> | ||
| </head> | ||
| <body> | ||
| <div class="navbar navbar-default navbar-fixed-top"> | ||
| <div class="container"> | ||
| <div class="nav navbar-nav navbar-left" style="margin-right:12px"> | ||
| <%= link_to image_tag("logo.png" , { :title => "Tutor Java !" , size: "50x50"})%> | ||
| </div> | ||
| <a href="../" class="navbar-brand">CoolSoft - Java Tutor</a> | ||
| <%- if signed_in?%> | ||
| <%= render "layouts/signed_in_header"%> | ||
| <%end%> | ||
| </div> | ||
| </div> | ||
| <%- if signed_in?%> | ||
| <%= render "layouts/left_side_bar"%> | ||
| <%= render "layouts/right_side_bar"%> | ||
| <%end%> | ||
| <div class="container well main-content" align="center"> | ||
| <%= yield %> | ||
| </div> | ||
| <div id="footer" align="center" class="navbar navbar-default navbar-fixed-bottom"> | ||
| <%= render "layouts/footer"%> | ||
| </div> | ||
| </body> | ||
| </html> |
Empty file.
Oops, something went wrong.