-
Notifications
You must be signed in to change notification settings - Fork 253
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Pull layout information up from templates to layouts
- Loading branch information
Showing
7 changed files
with
91 additions
and
59 deletions.
There are no files selected for viewing
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
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,13 +1,11 @@ | ||
<section id="sidebar" class="<%= sidebar_classes %>"> | ||
<% content_for(:sidebar) do %> | ||
<%= render 'search_sidebar' %> | ||
</section> | ||
<% end %> | ||
<section id="content" class="<%= main_content_classes %>"> | ||
<% unless has_search_parameters? %> | ||
<%# if there are no input/search related params, display the "home" partial -%> | ||
<%= render 'home' %> | ||
<%= render 'shared/sitelinks_search_box' %> | ||
<% else %> | ||
<%= render 'search_results' %> | ||
<% end %> | ||
</section> | ||
<% unless has_search_parameters? %> | ||
<%# if there are no input/search related params, display the "home" partial -%> | ||
<%= render 'home' %> | ||
<%= render 'shared/sitelinks_search_box' %> | ||
<% else %> | ||
<%= render 'search_results' %> | ||
<% end %> |
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,7 +1,5 @@ | ||
<section id="content" class="<%= show_content_classes %>"> | ||
<%= render_document_main_content_partial %> | ||
</section> | ||
<% content_for(:sidebar) do %> | ||
<%= render_document_sidebar_partial %> | ||
<% end %> | ||
<section id="sidebar" class="<%= show_sidebar_classes %>"> | ||
<%= render_document_sidebar_partial %> | ||
</section> | ||
<%= render_document_main_content_partial %> |
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,44 +1,17 @@ | ||
<!DOCTYPE html> | ||
<html lang="en" class="no-js"> | ||
<head> | ||
<meta charset="utf-8"> | ||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | ||
|
||
<!-- Mobile viewport optimization h5bp.com/ad --> | ||
<meta name="HandheldFriendly" content="True"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1.0"> | ||
<% content_for(:content) do %> | ||
<% if content_for? :sidebar %> | ||
<section id="sidebar" class="<%= sidebar_classes %>"> | ||
<%= content_for(:sidebar) %> | ||
</section> | ||
|
||
<!-- Internet Explorer use the highest version available --> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
|
||
<!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading --> | ||
<!--[if IEMobile]> | ||
<meta http-equiv="cleartype" content="on"> | ||
<![endif]--> | ||
|
||
<title><%= render_page_title %></title> | ||
<%= opensearch_description_tag application_name, opensearch_catalog_url(:format => 'xml') %> | ||
<%= favicon_link_tag %> | ||
<%= stylesheet_link_tag "application", media: "all" %> | ||
<%= javascript_include_tag "application" %> | ||
<%= csrf_meta_tags %> | ||
<%= content_for(:head) %> | ||
</head> | ||
<body class="<%= render_body_class %>"> | ||
<%= render :partial => 'shared/header_navbar' %> | ||
<%= render partial: 'shared/ajax_modal' %> | ||
|
||
<div id="main-container" class="<%= container_classes %>"> | ||
<%= content_tag :h1, application_name, class: 'sr-only application-heading' %> | ||
<%= render :partial=>'/flash_msg', layout: 'shared/flash_messages' %> | ||
|
||
<div class="row"> | ||
<section id="content" class="<%= main_content_classes %>"> | ||
<%= yield %> | ||
</section> | ||
<% else %> | ||
<section class="col-md-12"> | ||
<%= yield %> | ||
</div> | ||
</div> | ||
</section> | ||
<% end %> | ||
<% end %> | ||
<%= render :partial => 'shared/footer' %> | ||
</body> | ||
</html> | ||
<%= render template: "layouts/blacklight/base" %> |
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,43 @@ | ||
<!DOCTYPE html> | ||
<html lang="en" class="no-js"> | ||
<head> | ||
<meta charset="utf-8"> | ||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"> | ||
|
||
<!-- Mobile viewport optimization h5bp.com/ad --> | ||
<meta name="HandheldFriendly" content="True"> | ||
<meta name="viewport" content="width=device-width,initial-scale=1.0"> | ||
|
||
<!-- Internet Explorer use the highest version available --> | ||
<meta http-equiv="X-UA-Compatible" content="IE=edge"> | ||
|
||
<!-- Mobile IE allows us to activate ClearType technology for smoothing fonts for easy reading --> | ||
<!--[if IEMobile]> | ||
<meta http-equiv="cleartype" content="on"> | ||
<![endif]--> | ||
|
||
<title><%= render_page_title %></title> | ||
<%= opensearch_description_tag application_name, opensearch_catalog_url(format: 'xml') %> | ||
<%= favicon_link_tag %> | ||
<%= stylesheet_link_tag "application", media: "all" %> | ||
<%= javascript_include_tag "application" %> | ||
<%= csrf_meta_tags %> | ||
<%= content_for(:head) %> | ||
</head> | ||
<body class="<%= render_body_class %>"> | ||
<%= render partial: 'shared/header_navbar' %> | ||
<%= render partial: 'shared/ajax_modal' %> | ||
|
||
<div id="main-container" class="<%= container_classes %>"> | ||
<%= content_tag :h1, application_name, class: 'sr-only application-heading' %> | ||
<%= render partial: '/flash_msg', layout: 'shared/flash_messages' %> | ||
<div class="row"> | ||
<%= content_for?(:content) ? yield(:content) : yield %> | ||
</div> | ||
</div> | ||
|
||
<%= render partial: 'shared/footer' %> | ||
</body> | ||
</html> |
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,11 @@ | ||
<% content_for(:content) do %> | ||
<section class="<%= show_content_classes %>"> | ||
<%= yield %> | ||
</section> | ||
|
||
<section class="<%= show_sidebar_classes %>"> | ||
<%= content_for(:sidebar) %> | ||
</section> | ||
<% end %> | ||
<%= render template: "layouts/blacklight/base" %> |