Merge branch 'design' of dev.litvinovg.pro:litvinovg/vivo into texts

This commit is contained in:
Georgy Litvinov 2021-02-25 15:05:47 +01:00
commit db103e6293
69 changed files with 1488 additions and 286 deletions

View file

@ -171,11 +171,11 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
<div class="htmlExcerpt" style="list-style:none; display:none;"> <div class="htmlExcerpt" style="list-style:none; display:none;">
${excerptText} ${excerptText}
<#if works?? && works?has_content && worksCounter?number &gt; 0 > <#if works?? && works?has_content && worksCounter?number &gt; 0 >
<button type="button" class="collapsible" style="background-color:white;border:none;padding: 18px;width: 100%;text-align:left;">Работы</button> <button type="button" class="collapsible" style="background-color:white;border:none;padding: 18px;width: 100%;text-align:left; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Работы</button>
<div class="works" style="display:none;"> <div class="works" style="display:none;">
<#list works as work> <#list works as work>
<#if work.elenphExcerpt == order.elenphExcerpt > <#if work.elenphExcerpt == order.elenphExcerpt >
<div class="work" style="list-style:none;"> <div class="work" style="display:list-item;list-style-image:url(${urls.base}/themes/iph/images/bullet_icon.png); font-style: italic; font-family: PT Serif;">
<p> ${work.works} </p> <p> ${work.works} </p>
</div> </div>
</#if> </#if>
@ -184,11 +184,11 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
</#if> </#if>
<#if bibliography?? && bibliography?has_content && bibliographyCounter?number &gt; 0> <#if bibliography?? && bibliography?has_content && bibliographyCounter?number &gt; 0>
<button type="button" class="collapsible" style="background-color:white;border:none;padding: 18px;width: 100%; text-align: left;">Литература</button> <button type="button" class="collapsible" style="background-color:white;border:none;padding: 18px;width: 100%; text-align: left; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Литература</button>
<div class="bibliography" style="display:none;"> <div class="bibliography" style="display:none;">
<#list bibliography as one_bibliography> <#list bibliography as one_bibliography>
<#if one_bibliography.elenphExcerpt == order.elenphExcerpt > <#if one_bibliography.elenphExcerpt == order.elenphExcerpt >
<div class="bibliography_entry" style="list-style:none;"> <div class="bibliography_entry" style="display:list-item;list-style-image:url(${urls.base}/themes/iph/images/bullet_icon.png); font-style: italic; font-family: PT Serif;">
<p> ${one_bibliography.bibliography} </p> <p> ${one_bibliography.bibliography} </p>
</div> </div>
</#if> </#if>
@ -204,10 +204,10 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
</div> </div>
<#if works?? && works?has_content> <#if works?? && works?has_content>
<button type="button" class="collapsible" style="border:none;padding: 18px;width: 100%;text-align:left;">Работы</button> <button type="button" class="collapsible" style="border: none; color: #8B4513; padding: 18px;width: 100%;text-align:left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Работы</button>
<div class="works" style="display:none;"> <div class="works" style="display:block;">
<#list works as work> <#list works as work>
<div class="work" style="list-style:none;"> <div class="work" style="display:list-item;list-style-image:url(${urls.base}/themes/iph/images/bullet_icon.png); font-style: italic; font-family: PT Serif;">
<p> ${work.works} </p> <p> ${work.works} </p>
</div> </div>
</#list> </#list>
@ -215,10 +215,10 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
</#if> </#if>
<#if bibliography?? && bibliography?has_content> <#if bibliography?? && bibliography?has_content>
<button type="button" class="collapsible" style="border:none;padding: 18px;width: 100%; text-align: left;">Литература</button> <button type="button" class="collapsible" style="border:none; color: #8B4513; padding: 18px;width: 100%; text-align: left; background-color: #ffffff; background-image: url(${urls.base}/themes/iph/images/book_icon.png); background-repeat: no-repeat; background-position: left center;">Литература</button>
<div class="bibliography" style="display:none;"> <div class="bibliography" style="display:block;">
<#list bibliography as one_bibliography> <#list bibliography as one_bibliography>
<div class="bibliography_entry" style="list-style:none;"> <div class="bibliography_entry" style="display:list-item;list-style-image:url(${urls.base}/themes/iph/images/bullet_icon.png); font-style: italic; font-family: PT Serif;">
<p> ${one_bibliography.bibliography} </p> <p> ${one_bibliography.bibliography} </p>
</div> </div>
</#list> </#list>
@ -227,7 +227,7 @@ ${scripts.add('<script async type="text/javascript" src="${urls.base}/themes/iph
<#if authors??> <#if authors??>
<#list authors as author> <#list authors as author>
<div class="authors" style="display:block;float:right; margin:15px;"> <div class="authors" style="display:block;">
<#if author.authorFamily??>${author.authorFamily}</#if>&nbsp;<#if author.authorInitials??>${author.authorInitials}</#if> <#if author.authorFamily??>${author.authorFamily}</#if>&nbsp;<#if author.authorInitials??>${author.authorInitials}</#if>
</div> </div>
</#list> </#list>

File diff suppressed because it is too large Load diff

View file

@ -5,7 +5,7 @@ icons: {
} }
.rule-value-container > select{ .rule-value-container > select{
max-width: 800px; max-width: 380px;
} }
.query-builder, .query-builder * { .query-builder, .query-builder * {
@ -16,6 +16,7 @@ icons: {
.query-builder { .query-builder {
font-family: sans-serif; font-family: sans-serif;
width: 100%;
} }
.query-builder .hide { .query-builder .hide {
@ -24,6 +25,7 @@ icons: {
.query-builder .pull-right { .query-builder .pull-right {
float: right !important; float: right !important;
/*box-shadow: 0px 4px 2px #aeaeae;*/
} }
.query-builder .btn { .query-builder .btn {
@ -31,7 +33,7 @@ icons: {
display: inline-block; display: inline-block;
padding: 6px 12px; padding: 6px 12px;
margin-bottom: 0px; margin-bottom: 0px;
font-size: 14px; font-size: 16px;
font-weight: 400; font-weight: 400;
line-height: 1.42857; line-height: 1.42857;
text-align: center; text-align: center;
@ -41,12 +43,11 @@ icons: {
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
background-image: none; background-image: none;
border: 1px solid transparent; /*border: 1px solid transparent;*/
border-radius: 4px; /*border-radius: 4px;*/
} }
.query-builder .btn.focus, .query-builder .btn:focus, .query-builder .btn:hover .query-builder .btn.focus, .query-builder .btn:focus, .query-builder .btn:hover {
{
color: #333; color: #333;
text-decoration: none; text-decoration: none;
} }
@ -54,48 +55,63 @@ icons: {
.query-builder .btn.active, .query-builder .btn:active { .query-builder .btn.active, .query-builder .btn:active {
background-image: none; background-image: none;
outline: 0px none; outline: 0px none;
box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.125) inset; /* box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.125) inset; */
} }
.query-builder .btn-success { .query-builder .btn-success {
color: #FFF; color: #000000;
background-color: #5CB85C; background-color: #ffffff;
border-color: #4CAE4C; border: 0px;
font-family: Roboto;
/*box-shadow: 0px 4px 2px #aeaeae;*/
}
.btn-group.pull-right.group-actions {
box-shadow: 0px 4px 2px #aeaeae;
/*margin-right: 10px;*/
} }
.query-builder .btn-primary { .query-builder .btn-primary {
color: #FFF; color: #000000;
background-color: #337AB7; background-color: #ffffff;
border-color: #2E6DA4; border: 1px dashed #000000 !important;
} }
.query-builder .btn-danger { .query-builder .btn-danger {
color: #FFF; color: #000000;
background-color: #D9534F; background-color: #ffffff;
border-color: #D43F3A; border: 0px;
box-shadow: 0px;
}
button.btn.btn-xs.btn-danger {
/*box-shadow: 0px 0px 0px #000000;*/
border-left: 1px solid #ead6a2 !important;
font-family: Roboto;
} }
.query-builder .btn-success.active, .query-builder .btn-success.focus, .query-builder .btn-success.active, .query-builder .btn-success.focus,
.query-builder .btn-success:active, .query-builder .btn-success:focus, .query-builder .btn-success:active, .query-builder .btn-success:focus,
.query-builder .btn-success:hover { .query-builder .btn-success:hover {
color: #FFF; color: #000000;
background-color: #449D44; background-color: #EAD6A2;
border-color: #398439; border: 0px;
/*border-color: #398439;*/
} }
.query-builder .btn-primary.active, .query-builder .btn-primary.focus, .query-builder .btn-primary.active, .query-builder .btn-primary.focus,
.query-builder .btn-primary:active, .query-builder .btn-primary:focus, .query-builder .btn-primary:active, .query-builder .btn-primary:focus,
.query-builder .btn-primary:hover { .query-builder .btn-primary:hover {
color: #FFF; color: #000000;
background-color: #286090; background-color: #EAD6A2;
border-color: #204D74; border-color: #000000;
} }
.query-builder .btn-danger.active, .query-builder .btn-danger.focus, .query-builder .btn-danger.active, .query-builder .btn-danger.focus,
.query-builder .btn-danger:active, .query-builder .btn-danger:focus, .query-builder .btn-danger:active, .query-builder .btn-danger:focus,
.query-builder .btn-danger:hover { .query-builder .btn-danger:hover {
color: #FFF; color: #000000;
background-color: #C9302C; background-color: #ffffff;
border-color: #AC2925; border-color: #AC2925;
} }
@ -108,10 +124,12 @@ icons: {
.query-builder .btn-group>.btn { .query-builder .btn-group>.btn {
position: relative; position: relative;
float: left; float: left;
border-left: 1px solid #ead6a2;
} }
.query-builder .btn-group>.btn:first-child { .query-builder .btn-group>.btn:first-child {
margin-left: 0px; margin-left: 0px;
border-left: none;
} }
.query-builder .btn-group>.btn:first-child:not(:last-child) { .query-builder .btn-group>.btn:first-child:not(:last-child) {
@ -131,8 +149,8 @@ icons: {
} }
.query-builder .btn-xs, .query-builder .btn-group-xs>.btn { .query-builder .btn-xs, .query-builder .btn-group-xs>.btn {
padding: 1px 5px; padding: 5px 8px;
font-size: 12px; font-size: 1rem;
line-height: 1.5; line-height: 1.5;
border-radius: 3px; /*border-radius: 3px;*/
} }

View file

@ -6,26 +6,61 @@
.query-builder .rules-group-container, .query-builder .rule-container, .query-builder .rules-group-container, .query-builder .rule-container,
.query-builder .rule-placeholder { .query-builder .rule-placeholder {
position: relative; position: relative;
margin: 4px 0; /*margin: 10px 10px 0 10px;*/
border-radius: 5px; /*border-radius: 5px;*/
padding: 5px; padding: 5px;
border: 1px solid #EEE; /*border-top: 1px dashed #000000;
border-left: 1px dashed #000000;
border-right: 1px dashed #000000;*/
background: rgba(255, 255, 255, 0.9); background: rgba(255, 255, 255, 0.9);
} }
.rule-container {
box-shadow: 0px 4px 4px #aeaeae;
margin-bottom: 10px;
margin-top: 10px;
}
.query-builder .rule-container .rule-filter-container, .query-builder .rule-container .rule-operator-container, .query-builder .rule-container .rule-filter-container, .query-builder .rule-container .rule-operator-container,
.query-builder .rule-container .rule-value-container, .query-builder .error-container, .query-builder .rule-container .rule-value-container, .query-builder .error-container,
.query-builder .drag-handle { .query-builder .drag-handle {
display: inline-block; display: inline-block;
margin: 0 5px 0 0; margin: 0 5px 0 0;
vertical-align: middle; /*vertical-align: middle;*/
} }
.query-builder .rules-group-container { .query-builder .rules-group-container {
padding: 10px; padding: 12px 20px 10px 20px;
padding-bottom: 6px; /*border-right: 1px solid #8B4513;
border: 1px solid #DCC896; border-left: 1px solid #8B4513;
background: rgba(250, 240, 210, 0.5); border-top: 1px solid #8B4513;
border-bottom: 1px solid #8B4513;*/
background-color: #efe9d9;
outline: 1px dashed #000000;
outline-offset: 0px;
margin-bottom: 10px;
font-family: Roboto;
}
#builder_group_0 {
background-color: #F1F1F1;
margin-bottom: 0;
outline: 1px solid #F1F1F1;
outline-offset: -1px;
border-left: 1px solid #8B4513;
border-right: 1px solid #8B4513;
}
#builder_rule_1 {
margin-bottom: 10px;
}
#builder_group_1 {
margin-top: 10px;
/*border: 1px dashed #000000;*/
} }
.query-builder .rules-group-header { .query-builder .rules-group-header {
@ -52,12 +87,13 @@
.query-builder .rules-list { .query-builder .rules-list {
list-style: none; list-style: none;
padding: 0 0 0 15px; padding: 0 0 0 10px;
margin: 0; margin: 0;
box-shadow: 0px 0px #aeaeae;
} }
.query-builder .rule-value-container { .query-builder .rule-value-container {
border-left: 1px solid #DDD; /*border-left: 1px solid #DDD;*/
padding-left: 5px; padding-left: 5px;
} }
@ -72,7 +108,7 @@
.query-builder .rule-value-container select, .query-builder .rule-value-container input[type='text'], .query-builder .rule-value-container select, .query-builder .rule-value-container input[type='text'],
.query-builder .rule-value-container input[type='number'] { .query-builder .rule-value-container input[type='number'] {
padding: 1px; padding: 5px;
} }
.query-builder .error-container { .query-builder .error-container {
@ -97,18 +133,18 @@
left: -10px; left: -10px;
width: 10px; width: 10px;
height: calc(50% + 4px); height: calc(50% + 4px);
border-color: #CCC; border-color: #000000;
border-style: solid; border-style: dashed;
} }
.query-builder .rules-list>*::before { .query-builder .rules-list>*::before {
top: -4px; top: -4px;
border-width: 0 0 2px 2px; border-width: 0 0 1px 1px;
} }
.query-builder .rules-list>*::after { .query-builder .rules-list>*::after {
top: 50%; top: 50%;
border-width: 0 0 0 2px; border-width: 0 0 0 1px;
} }
.query-builder .rules-list>*:first-child::before { .query-builder .rules-list>*:first-child::before {
@ -117,7 +153,7 @@
} }
.query-builder .rules-list>*:last-child::before { .query-builder .rules-list>*:last-child::before {
border-radius: 0 0 0 4px; /*border-radius: 0 0 0 4px;*/
} }
.query-builder .rules-list>*:last-child::after { .query-builder .rules-list>*:last-child::after {

View file

@ -56,7 +56,7 @@ td {
font-size: 100%; font-size: 100%;
font-family: inherit; font-family: inherit;
vertical-align: baseline; vertical-align: baseline;
color: #595b5b; color: #000000;
font-weight: normal; font-weight: normal;
} }
body { body {

View file

@ -0,0 +1,109 @@
menu_contactus = Contact Us
menu_welcomestart = Welcome
menu_copyright = copyright
menu_support = Support
menu_logout = Log out
menu_loginfull = Log in to manage this site
menu_login = Log in
menu_version = Version
menu_about = About
menu_termuse = Terms of Use
menu_powered = Powered by
intro_title = Welcome to VIVO
intro_para1 = VIVO is a research-focused discovery tool that enables collaboration among scholars of all disciplines.
intro_para2 = Browse or search information on people, departments, courses, grants, and publications.
intro_searchvivo = Search VIVO
intro_filtersearch = Filter search
identity_title = Электронная Философская Энциклопедия
identity_index = Index
identity_edit = Edit Page
identity_admin = Site Admin
identity_myprofile = My profile
identity_myaccount = My account
identity_user = user
collection_capitalized = Collection
place_of_grant = Place of grant
email_address = Email Address
#
# menupage templates ( /templates/freemarker/body/menupage )
#
grants_text_one = This body is from the the template file \
vivo/productMods/templates/freemarker/body/menupage/grants.ftl. \
In the display model, the grants page has a display:requiresBodyTemplate \
property that defines that the grants page overrides the default template. \
The default template for these pages is at /vitro/webapp/web/templates/freemarker/body/menupage/menupage.ftl
grants_two = This technique could be used to define pages without menu items, that get \
their content from a freemarker template. An example would be the about page.
grants_text_three = This would create a page that would use about.ftl as the body. The page would be \
accessed via /about and would override all servlet mappings in web.xml.
address_street_one = address street one
address_street_two = address street two
address_street_three = address street three
address_label = address label
loading_website_image = Loading website image
researchers_in = researchers in
view = view
grant_type = grant Type
grant_entry_for = grant entry for
regions = regions
grant_date = grant Date
map_states_string = states.
map_state_string = state.
unable_to_handle_grant_editing = This form is unable to handle the editing of this grant because it is associated with multiple grant individuals.
unable_to_handle_position_editing = This form is unable to handle the editing of this position because it is associated with multiple Position individuals.
currently_no_papers_for = Currently there are no {0} papers for
change_selection = change selection
view_all_departments = view all academic departments
first_name = First name
last_name = Last name
first_grant = First Grant
last_grant = Last Grant
currently_no_researchers = There are currently no researchers with a defined geographic focus.
reviewer_role = Reviewer Role
vivo_profile = VIVO profile
loading_data = loading data
select_award = Selected Award
grants_in_vivo = grants in VIVO
service_provider_role = Service Provider Role
view_all_faculty = view all faculty
no_grants_for = Currently there are no grants for
statewide_locations = state-wide locations.
faculty_who_are_members_of_org = Here are the faculty in the {0} department who are members of this organization.
indiv_foafperson_for = for
indiv_foafperson_return = return to
no_departments_found = No academic departments found.
leadership_role = Leadership Role
countries = countries
first_publication = First publication
last_publication = Last publication
research_area = individuals in the department with this research area
password = password
limit_search = limit search
placeholder_image = placeholder image
view_all_members_of_org = View all the members of this organization.
display_more = more
create_entry = Create Entry
attendee_capitalized = Attendee
no_faculty_found = No faculty members found.
create_capitalized = Create
to = to
enter_new_role_value = Please enter a new value in the Role field.
countries_and_regions = countries and regions.
province_or_region = Province or Region
full_name = Full name
researchers = researchers
years_participation_in = Years of Participation in
return_to_grant = Return to grant
profile_capitalized = Profile
organizer_role = Organizer Role
faculty_memberships = Faculty Memberships
edit_mailing_address = Edit Mailing Address
add_capitalized = Add

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B

After

Width:  |  Height:  |  Size: 75 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 422 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 291 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 484 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 440 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 454 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 444 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 664 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 905 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 272 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 369 B

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View file

@ -0,0 +1,18 @@
<div id="wrapper-content" role="main">
<#if flash?has_content>
<#if flash?starts_with(i18n().menu_welcomestart) >
<section id="welcome-msg-container" role="container">
<section id="welcome-message" role="alert">${flash}</section>
</section>
<#else>
<section id="flash-msg-container" role="container">
<section id="flash-message" role="alert">${flash}</section>
</section>
</#if>
</#if>
<!--[if lte IE 8]>
<noscript>
<p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com" title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
</noscript>
<![endif]-->

View file

@ -1,12 +1,12 @@
<div class="search-form-container"> <div class="search-form-container">
<form id="custom-search" action="${urls.customsearch}" name="custom-search" role="search" method="post" > <form id="custom-search" action="${urls.customsearch}" name="custom-search" role="search" method="post" >
<input type="text" name="querytext" class="custom-search-input" value="${querytext!?html}" autocapitalize="off" /> <input type="text" name="querytext" class="custom-search-input" value="${querytext!?html}" autocapitalize="off" />
<#if vClassGroups??> <!-- <#if vClassGroups??>
<select form="custom-search" name="classgroup" class="custom-search-select"> <select form="custom-search" name="classgroup" class="custom-search-select">
<option value="">${i18n().all_capitalized}</option> <option value="">${i18n().all_capitalized}</option>
<@classGroupOptions vClassGroups! /> <@classGroupOptions vClassGroups! />
</select> </select>
</#if> </#if> -->
<input type="submit" value="${i18n().search_button}" class="search-submit-button" /> <input type="submit" value="${i18n().search_button}" class="search-submit-button" />
<!-- <!--
<a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}"> <a class="filter-search filter-default" href="#" title="${i18n().intro_filtersearch}">

View file

@ -1,8 +1,10 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- $This file is distributed under the terms of the license in LICENSE$ -->
<#import "lib-home-page.ftl" as lh>
</div> <!-- #wrapper-content --> </div> <!-- #wrapper-content -->
<footer role="contentinfo"> <footer role="contentinfo">
<div id="footerWrapper">
<p class="copyright"> <p class="copyright">
<#if copyright??> <#if copyright??>
<small>&copy;${copyright.year?c} <small>&copy;${copyright.year?c}
@ -19,6 +21,9 @@
</#if> </#if>
</p> </p>
<nav role="navigation"> <nav role="navigation">
<ul id="footer-nav" role="list"> <ul id="footer-nav" role="list">
<li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li> <li role="listitem"><a href="${urls.about}" title="${i18n().menu_about}">${i18n().menu_about}</a></li>
@ -28,6 +33,7 @@
<li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li> <li role="listitem"><a href="http://www.vivoweb.org/support" target="blank" title="${i18n().menu_support}">${i18n().menu_support}</a></li>
</ul> </ul>
</nav> </nav>
</div>
</footer> </footer>
<#include "scripts.ftl"> <#include "scripts.ftl">

View file

@ -11,7 +11,7 @@
<nav role="navigation"> <nav role="navigation">
<ul id="header-nav" role="list"> <ul id="header-nav" role="list">
<#include "languageSelector.ftl"> <#include "languageSelector.ftl">
<li role="listitem"><a href="${urls.index}" title="${i18n().identity_index}">${i18n().identity_index}</a></li> <li role="listitem"><a href="${urls.index}" title="${i18n().identity_index}">${i18n().identity_index}</a></li>
<#if user.loggedIn> <#if user.loggedIn>
<#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE <#-- COMMENTING OUT THE EDIT PAGE LINK FOR RELEASE 1.5. WE NEED TO IMPLEMENT THIS IN A MORE
USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE USER FRIENDLY WAY. PERHAPS INCLUDE A LINK ON THE PAGES THEMSELVES AND DISPLAY IF THE
@ -50,3 +50,4 @@
</ul> </ul>
</nav> </nav>
</header>

View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- $This file is distributed under the terms of the license in LICENSE$ -->
</header>
<#include "developer.ftl"> <#include "developer.ftl">
@ -11,22 +11,3 @@
</#list> </#list>
</ul> </ul>
</nav> </nav>
<div id="wrapper-content" role="main">
<#if flash?has_content>
<#if flash?starts_with(i18n().menu_welcomestart) >
<section id="welcome-msg-container" role="container">
<section id="welcome-message" role="alert">${flash}</section>
</section>
<#else>
<section id="flash-msg-container" role="container">
<section id="flash-message" role="alert">${flash}</section>
</section>
</#if>
</#if>
<!--[if lte IE 8]>
<noscript>
<p class="ie-alert">This site uses HTML elements that are not recognized by Internet Explorer 8 and below in the absence of JavaScript. As a result, the site will not be rendered appropriately. To correct this, please either enable JavaScript, upgrade to Internet Explorer 9, or use another browser. Here are the <a href="http://www.enable-javascript.com" title="java script instructions">instructions for enabling JavaScript in your web browser</a>.</p>
</noscript>
<![endif]-->

View file

@ -30,7 +30,7 @@
<#include "identity.ftl"> <#include "identity.ftl">
<#include "menu.ftl"> <#include "menu.ftl">
<#include "contentWrapper.ftl">
<section id="intro" role="region"> <section id="intro" role="region">
<#-- <h2>${i18n().intro_title}</h2> <#-- <h2>${i18n().intro_title}</h2>
@ -39,65 +39,65 @@
<section id="search-home" role="region"> <section id="search-home" role="region">
<h3>Поиск<span class="search-filter-selected">filteredSearch</span></h3> <h3><span class="search-filter-selected">filteredSearch</span></h3>
<fieldset> <fieldset>
<legend>${i18n().search_form}</legend> <legend>${i18n().search_form}</legend>
</fieldset> </fieldset>
<#include "searchSelector.ftl"> <#include "searchSelector.ftl">
</section> <!-- #search-home --> </section>
<div id="collectionDescription"> <p class="Standard" dir="ltr" style="border:none; font-size:1.145833rem; margin-bottom:1.0425rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:justify" align="justify"><span class="PTSerif" style="font-family:&quot;PT Serif&quot;, serif"><span style="font-family:'PT Serif',serif;font-weight:bold;font-size:1.3541667rem">Электронная Философская Энциклопедия</span><span style="font-family:'PT Serif',serif;font-size:1.3541667rem"> (ЭФЭ) — открытый научно-исследовательский проект Института философии РАН, ставящий своей целью анализ и систематизацию достижений философских наук за последние десятилетия, создание на этой основе обобщающей картины развития философской мысли в мире во всем ее тематическом и содержательном многообразии. В отличие от прежних энциклопедических изданий, ЭФЭ призвана рассмотреть достижения философии прошлого сквозь призму современных дискуссий, отразить новейшие результаты исследований российских учёных и актуальные тенденции гуманитарного знания. Она нацелена на обобщающий взгляд, который не только фиксирует многообразие имен, понятий, терминов, школ и произведений мировой философии, но, прежде всего, выявляет ее сложную, противоречивую и плюралистичную целостность. Одной из ее доминант является преодоление европоцентризма в понимании философии, всечеловеческое расширение духовного горизонта. Создаваемая ведущими специалистами, ЭФЭ должна способствовать повышению философской культуры общества, стать надежным и авторитетным источником информации, составив конкуренцию всевозможным "пиратским" сайтам, бездумно копирующим сведения из неизвестных и непроверенных источников. Как полноценное электронное издание с выходными данными и закрепленными за отдельными статьями DOI, ЭФЭ позволит специалистам представлять результаты своих исследований в виде энциклопедических статей.</span></span></p>
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif; font-style:italic; font-weight:bold" align="center">Редакционно-издательский совет</p> <div id="wrapperDescription">
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif" align="center">А.А. Гусейнов, В.А. Лекторский, А.В. Смирнов, С.В. Месяц</p> <div id="titleProject">О проекте</div>
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif; font-style:italic; font-weight:bold" align="center">Редколлегия</p> <div id="projectDescription">
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif" align="center">Н.С. Автономова, Р.Г. Апресян, В.В. Бычков, В.Г. Буданов, В.В. Васильев,<br>П.А. Гаджикурбанова, А.Л. Доброхотов, А.А. Кара-Мурза, И.Т. Касавин,<br>В.Г. Лысенко, М.А. Маслин, В.В. Миронов, Н.В. Мотрошилова,<br>В.А. Подорога, Ю.В. Синеокая, М.Т. Степанянц, В.Г. Федотова,<br>В.К. Шохин, А.В. Черняев</p> <p class="aboutProject" dir="ltr"><span class="IPH Astra Serif" style="font-family:IPH Astra Serif"><span style="font-family: IPH Astra Serif; font-weight: bold; font-size:1.4rem">Электронная Философская Энциклопедия</span><span style="font-family: IPH Astra Serif; font-size: 1.4rem"> (ЭФЭ) — открытый научно-исследовательский проект Института философии РАН, ставящий своей целью анализ и систематизацию достижений философских наук за последние десятилетия, создание на этой основе обобщающей картины развития философской мысли в мире во всем ее тематическом и содержательном многообразии. В отличие от прежних энциклопедических изданий, ЭФЭ призвана рассмотреть достижения философии прошлого сквозь призму современных дискуссий, отразить новейшие результаты исследований российских учёных и актуальные тенденции гуманитарного знания. Она нацелена на обобщающий взгляд, который не только фиксирует многообразие имен, понятий, терминов, школ и произведений мировой философии, но, прежде всего, выявляет ее сложную, противоречивую и плюралистичную целостность. Одной из ее доминант является преодоление европоцентризма в понимании философии, всечеловеческое расширение духовного горизонта. Создаваемая ведущими специалистами, ЭФЭ должна способствовать повышению философской культуры общества, стать надежным и авторитетным источником информации, составив конкуренцию всевозможным "пиратским" сайтам, бездумно копирующим сведения из неизвестных и непроверенных источников. Как полноценное электронное издание с выходными данными и закрепленными за отдельными статьями DOI, ЭФЭ позволит специалистам представлять результаты своих исследований в виде энциклопедических статей.</span></span></p>
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif; font-style:italic; font-weight:bold" align="center">Экспертный совет</p> </div>
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif" align="center">Р.Г. Апресян, В.Г. Буданов, Г.В. Вдовина, И.Д. Джохадзе, Л.Б. Карелова,<br>В.Г. Лысенко, Н.Б. Маньковская, А.В. Павлов, В.В. Петров,<br>С.Ю. Рыков, Ю.В. Синеокая, М.А. Солопова, Ю.Е. Федорова,<br>В.И. Шалак, В.К. Шохин, А.В. Черняев</p> <div id="membersDescription">
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif; font-style:italic; font-weight:bold" align="center">Научный редактор</p> <p class="MembersTitle" dir="ltr" style="border: none; font-size: 1.4rem; background-color: #F3F3F3; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 25px; padding: 5px 0 5px 0; text-align: center; font-family: IPH Astra Serif; font-style: normal; font-weight: bold;">Редакционно-издательский совет</p>
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif" align="center">Ю.Н. Попов</p> <p class="Textbody" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 0; text-align: center; font-family: IPH Astra Serif;" align="center">А.А. Гусейнов, В.А. Лекторский, А.В. Смирнов, С.В. Месяц</p>
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif; font-style:italic; font-weight:bold" align="center">Научно-техническая редакция</p> <p class="MembersTitle" dir="ltr" style="border: none; font-size: 1.4rem; background-color: #F3F3F3; margin-bottom:0.8rem; margin-left:0; margin-right:0; margin-top:0; padding: 5px 0 5px 0; text-align:center; font-family: IPH Astra Serif; font-style: normal; font-weight: bold;" align="center">Редколлегия</p>
<p class="Textbody" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:0.729rem; margin-left:0; margin-right:0; margin-top:0; padding:0; text-align:center; font-family:&quot;PT Serif&quot;, serif" align="center">М.В. Егорочкин, Г.В. Литвинов, С.Л. Гурко, С.В. Лаврентьева</p> <p class="Textbody" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 0; text-align: center; font-family: IPH Astra Serif;" align="center">Н.С. Автономова, Р.Г. Апресян, В.В. Бычков, В.Г. Буданов,<br> В.В. Васильев, П.А. Гаджикурбанова, А.Л. Доброхотов, А.А. Кара-Мурза,<br> И.Т. Касавин, В.Г. Лысенко, М.А. Маслин, В.В. Миронов,<br> Н.В. Мотрошилова, В.А. Подорога, Ю.В. Синеокая, М.Т. Степанянц,<br> В.Г. Федотова, В.К. Шохин, А.В. Черняев</p>
<table dir="ltr" id="1table" style="margin-top:0;margin-bottom:0;margin-left:auto;margin-right:auto;width:100%;border-collapse:separate;border-spacing:0;table-layout:fixed"> <p class="MembersTitle" dir="ltr" style="border: none; font-size: 1.4rem; background-color: #F3F3F3; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 5px 0 5px 0; text-align: center; font-family: IPH Astra Serif; font-style: normal; font-weight: bold;" align="center">Экспертный совет</p>
<colgroup> <p class="Textbody" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 0; text-align: center; font-family: IPH Astra Serif;" align="center">Р.Г. Апресян, В.Г. Буданов, Г.В. Вдовина, И.Д. Джохадзе, Л.Б. Карелова,<br>В.Г. Лысенко, Н.Б. Маньковская, А.В. Павлов, В.В. Петров,<br>С.Ю. Рыков, Ю.В. Синеокая, М.А. Солопова, Ю.Е. Федорова,<br>В.И. Шалак, В.К. Шохин, А.В. Черняев</p>
<col style="width:49.87872%"> <p class="MembersTitle" dir="ltr" style="border: none; font-size: 1.4rem; background-color: #F3F3F3; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 5px 0 5px 0; text-align: center; font-family: IPH Astra Serif; font-style: normal; font-weight: bold;" align="center">Научный редактор</p>
<col style="width:50.12128%"> <p class="Textbody" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 0; text-align: center; font-family: IPH Astra Serif;" align="center">Ю.Н. Попов</p>
</colgroup> <p class="MembersTitle" dir="ltr" style="border: none; font-size: 1.4rem; background-color: #F3F3F3; margin-bottom: 0.8rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 5px 0 5px 0; text-align: center; font-family: IPH Astra Serif; font-style: normal; font-weight: bold;" align="center">Научно-техническая редакция</p>
<tbody> <p class="Textbody" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0.9rem; margin-left: 0; margin-right: 0; margin-top: 0; padding: 0; text-align: center; font-family: IPH Astra Serif;" align="center">М.В. Егорочкин, Г.В. Литвинов, С.Л. Гурко, С.В. Лаврентьева</p>
<tr> </div>
<td style="border:none;padding:0;vertical-align:top">
<p class="TableContents" dir="ltr" style="border:none; font-size:1.25rem; margin-bottom:1.0425rem; margin-left:1.47375rem; margin-right:1.47375rem; margin-top:0; padding:0; text-align:justify; background-color:transparent; font-family:&quot;PT Serif&quot;, serif; text-indent:0" align="justify"><span style="font-weight:bold" xml:lang="en-US" lang="en-US">ISSN</span><span style="font-weight:bold"> (</span><span style="font-weight:bold" xml:lang="en-US" lang="en-US">Online</span><span style="font-weight:bold">): </span><span style="font-weight:normal">2658-7092</span></p> <div id="contactDescription">
<p class="TableContents" dir="ltr" style="border:none; font-size:1.25rem; margin-bottom:1.0425rem; margin-left:1.47375rem; margin-right:1.47375rem; margin-top:0; padding:0; text-align:justify; background-color:transparent; font-family:&quot;PT Serif&quot;, serif; text-indent:0" align="justify"><span style="font-weight:bold">Учредитель и издатель:</span> Федеральное государственное бюджетное учреждение науки Институт философии Российской Академии наук.</p> <p class="TableContents" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0; margin-left: 0; margin-right: 0; margin-top: 0; padding: 20px 15px 0px 10px; text-align: justify; background-color:transparent; font-family: IPH Astra Serif; text-indent:0" align="justify"><span style="font-weight:bold" xml:lang="en-US" lang="en-US">ISSN</span><span style="font-weight:bold"> (</span><span style="font-weight:bold" xml:lang="en-US" lang="en-US">Online</span><span style="font-weight:bold">): </span><span style="font-weight:normal">2658-7092</span></p>
<p class="TableContents" dir="ltr" style="border:none; font-size:1.25rem; margin-bottom:1.0425rem; margin-left:1.47375rem; margin-right:1.47375rem; margin-top:0; padding:0; text-align:justify; background-color:transparent; font-family:&quot;PT Serif&quot;, serif; text-indent:0" align="justify"><span style="font-weight:bold">Периодичность: </span>4 раза в год. Выходит с 2018 г.</p> <p class="TableContents" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0; margin-left: 0; margin-right: 0; margin-top: 0; padding: 5px 15px 5px 10px; text-align: justify; background-color:transparent; font-family: IPH Astra Serif; text-indent:0" align="justify"><span style="font-weight:bold">Учредитель и издатель:</span> Федеральное государственное бюджетное учреждение науки Институт философии Российской Академии наук.</p>
<p class="TableContents" dir="ltr" style="border:none; font-size:1.25rem; margin-bottom:1.0425rem; margin-left:1.47375rem; margin-right:1.47375rem; margin-top:0; padding:0; text-align:justify; background-color:transparent; font-family:&quot;PT Serif&quot;, serif; text-indent:0" align="justify"><span style="font-weight:bold">Адрес учредителя и издателя</span>: Российская Федерация, 109240, г. Москва, ул. Гончарная, д. 12, стр. 1.</p> <p class="TableContents" dir="ltr" style="border:none; font-size: 1.4rem; margin-bottom: 0; margin-left: 0; margin-right: 0; margin-top: 0; padding: 5px 15px 0px 10px; text-align: justify; background-color:transparent; font-family: IPH Astra Serif; text-indent:0" align="justify"><span style="font-weight:bold">Периодичность: </span>4 раза в год. Выходит с 2018 г.</p>
<p class="TableContents" dir="ltr" style="border:none; font-size:1.354167rem; margin-bottom:1.0425rem; margin-left:1.47375rem; margin-right:1.47375rem; margin-top:0; padding:0; text-align:justify; background-color:transparent; font-family:&quot;PT Serif&quot;, serif; text-indent:0" align="justify"><span style="font-weight:bold;font-size:1.25rem">Сайт: </span><a class="Internet20link" href="http://www.elenph.org/" style=":link{color:#000080; text-decoration:underline}"><span style="font-size:1.25rem" xml:lang="en-US" lang="en-US">www</span></a><a class="Internet20link" href="http://www.elenph.org/" style=":link{color:#000080; text-decoration:underline}"><span style="font-size:1.25rem">.</span></a><a class="Internet20link" href="http://www.elenph.org/" style=":link{color:#000080; text-decoration:underline}"><span style="font-size:1.25rem" xml:lang="en-US" lang="en-US">elenph</span></a><a class="Internet20link" href="http://www.elenph.org/" style=":link{color:#000080; text-decoration:underline}"><span style="font-size:1.25rem">.</span></a><a class="Internet20link" href="http://www.elenph.org/" style=":link{color:#000080; text-decoration:underline}"><span style="font-size:1.25rem" xml:lang="en-US" lang="en-US">org</span></a></p> <p class="TableContents" dir="ltr" style="border:none; font-size: 1.4rem; margin-bottom: 0; margin-left: 0; margin-right: 0; margin-top: 0; padding: 5px 10px 5px 10px; text-align: justify; background-color:transparent; font-family: IPH Astra Serif; text-indent:0" align="justify"><span style="font-weight:bold">Адрес учредителя и издателя</span>: Российская Федерация, 109240, г. Москва, ул. Гончарная, д. 12, стр. 1.</p>
</td> <p class="TableContents" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 10px; margin-left: 0; margin-right: 0; margin-top: 0; padding: 5px 15px 0px 10px; text-align: justify; background-color: transparent; font-family: IPH Astra Serif; text-indent:0" align="justify"><span style="font-weight: bold; color: #8B4513; font-size: 1.4rem">Сайт: </span><a class="Internet20link" href="http://www.elenph.org/" style="color:#000000; text-decoration: none"><span style="font-size:1.4rem; color: #8B4513;" xml:lang="en-US" lang="en-US">www</span></a><a class="Internet20link" href="http://www.elenph.org/" style="color:#000000; text-decoration: none"><span style="font-size:1.4rem; color: #8B4513;">.</span></a><a class="Internet20link" href="http://www.elenph.org/" style="color:#000000; text-decoration: none"><span style="font-size:1.4rem; color: #8B4513;" xml:lang="en-US" lang="en-US">elenph</span></a><a class="Internet20link" href="http://www.elenph.org/" style="color:#000000; text-decoration:none"><span style="font-size:1.4rem; color: #8B4513;">.</span></a><a class="Internet20link" href="http://www.elenph.org/" style="color:#000000; text-decoration:none"><span style="font-size:1.4rem; color: #8B4513;" xml:lang="en-US" lang="en-US">org</span></a></p>
<td style="border:none;padding:0;vertical-align:top">
<p class="TableContents" dir="ltr" style="border:none; font-size:1.25rem; margin-bottom:1.0425rem; margin-left:1.47375rem; margin-right:1.47375rem; margin-top:0; padding:0; text-align:justify; background-color:transparent; font-family:&quot;PT Serif&quot;, serif; text-indent:0" align="justify"><span style="font-weight:bold">Энциклопедия зарегистрирована</span> Федеральной службой по надзору в сфере связи, информационных технологий и массовых коммуникаций (Роскомнадзор). Свидетельство о регистрации СМИ: <span style="font-style:italic">серия ЭЛ № ФС77 -74569 </span>от 14.12.2018. </p> </div>
<p class="TableContents" dir="ltr" style="border:none; font-size:1.25rem; margin-bottom:1.0425rem; margin-left:1.47375rem; margin-right:1.47375rem; margin-top:0; padding:0; text-align:justify; background-color:transparent; font-family:&quot;PT Serif&quot;, serif; text-indent:0" align="justify"><span style="font-weight:bold">Энциклопедия включена в: </span>базу <span xml:lang="en-US" lang="en-US">ROAD</span> (справочник электронных научных ресурсов с полностью открытым доступом к статьям).</p>
</td> <div id="registrationDescription">
</tr> <p class="TableContents" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0; margin-left: 0; margin-right: 0; margin-top: 0; padding: 20px 10px 5px 20px; text-align: justify; background-color: transparent; font-family: IPH Astra Serif; text-indent:0" align="justify"><span style="font-weight:bold">Энциклопедия зарегистрирована</span> Федеральной службой по надзору в сфере связи, информационных технологий и массовых коммуникаций (Роскомнадзор). Свидетельство о регистрации СМИ: <span style="font-style:italic">серия ЭЛ № ФС77 -74569 </span>от 14.12.2018. </p>
</tbody> <p class="TableContents" dir="ltr" style="border: none; font-size: 1.4rem; margin-bottom: 0; margin-left: 0; margin-right: 0; margin-top: 0; padding: 10px 10px 5px 20px; text-align: justify; background-color: transparent; font-family: IPH Astra Serif; text-indent: 0" align="justify"><span style="font-weight:bold">Энциклопедия включена в: </span>базу <span xml:lang="en-US" lang="en-US">ROAD</span> (справочник электронных научных ресурсов с полностью открытым доступом к статьям).</p>
</table></div>
</div>
</div>
</section> <!-- #intro --> </section> <!-- #intro -->
<!-- List of research classes: e.g., articles, books, collections, conference papers -->
<!-- List of research classes: e.g., articles, books, collections, conference papers -->
<#-- <@lh.researchClasses /> --> <#-- <@lh.researchClasses /> -->
<!-- List of four randomly selected faculty members --> <!-- List of four randomly selected faculty members -->
<#-- <@lh.facultyMbrHtml /> --> <#-- <@lh.facultyMbrHtml /> -->
<!-- List of randomly selected academic departments --> <!-- List of randomly selected academic departments -->
<#-- <@lh.academicDeptsHtml /> --> <#-- <@lh.academicDeptsHtml /> -->
<#if geoFocusMapsEnabled > <#if geoFocusMapsEnabled >
<!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties --> <!-- Map display of researchers' areas of geographic focus. Must be enabled in runtime.properties -->
<@lh.geographicFocusHtml /> <@lh.geographicFocusHtml />
</#if> </#if>
<!-- Statistical information relating to property groups and their classes; displayed horizontally, not vertically-->
<@lh.allClassGroups vClassGroups! />
<#include "footer.ftl"> <#include "footer.ftl">
<#-- builds a json object that is used by js to render the academic departments section --> <#-- builds a json object that is used by js to render the academic departments section -->

View file

@ -10,11 +10,28 @@
<body class="${bodyClasses!}" onload="${bodyOnload!}"> <body class="${bodyClasses!}" onload="${bodyOnload!}">
<#include "identity.ftl"> <#include "identity.ftl">
<#if !querytext?? >
<#include "customsearchpanel.ftl" >
</#if>
<#include "menu.ftl"> <#include "menu.ftl">
<div id="articleWrapper">
<#if currentServlet = "individual" && currentServlet != "display">
<div id="searchRightpanel">
<#include "customsearchpanel.ftl" >
</div>
</#if>
<#include "contentWrapper.ftl">
<#if currentServlet != "individual" && currentServlet != "login" && currentServlet != "display">
<section id="search-home" role="region">
<h3><span class="search-filter-selected">filteredSearch</span></h3>
<fieldset>
<legend>${i18n().search_form}</legend>
</fieldset>
<#include "searchSelector.ftl">
</section>
</#if>
<#-- VIVO OpenSocial Extension by UCSF --> <#-- VIVO OpenSocial Extension by UCSF -->
<#if openSocial??> <#if openSocial??>
<#if openSocial.visible> <#if openSocial.visible>
@ -23,7 +40,7 @@
</#if> </#if>
${body} ${body}
</div>
<#include "footer.ftl"> <#include "footer.ftl">
</body> </body>
</html> </html>

View file

@ -1,23 +1,36 @@
<div id="querybuilder-container" style="display:none;"> <div id="querybuilder-container" style="display:none;">
<div id="builder"></div> <div id="CounterSearchWrapper">
<div class="btn-group"> <div id="builder">
<button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button> <div id="SearchTitle">Параметры поиска</div>
<button id="btn-reset" class="btn btn-warning reset" data-target="basic">Очистить</button>
<button id="btn-set" class="btn btn-success set-json" data-target="basic">Пример</button>
<button id="btn-search" class="btn btn-warning reset" data-target="basic">Поиск</button>
<!-- <button id="btn-get" class="btn btn-primary parse-json" data-target="basic">Get rules</button> -->
<div>
<label style="display:inline;" for="hitsPerPage">Результатов на страницу</label>
<select name="hitsPerPage" id="hitsPerPageSelect">
<option value="20" selected="selected">20</option>
<option value="40">40</option>
<option value="60">60</option>
<option value="80">80</option>
<option value="100">100</option>
</select>
</div>
</div>
</div> </div>
<div class="btn-group-bottom">
<div id="settingsButtons">
<div id="OuterWrapperButtons">
<div id="wrapperButtons">
<button id="btn-set" class="btn btn-success set-json" data-target="basic">Пример заполнения</button>
<button id="btn-reset-button" class="btn btn-warning reset" data-target="basic">Очистить</button>
<!-- <button id="btn-get" class="btn btn-primary parse-json" data-target="basic">Get rules</button> -->
<div id="SelectResults">
<label style="display:inline;" for="hitsPerPage">Результатов на страницу</label>
<select name="hitsPerPage" id="hitsPerPageSelect">
<option value="20" selected="selected">20</option>
<option value="40">40</option>
<option value="60">60</option>
<option value="80">80</option>
<option value="100">100</option>
</select>
</div>
</div>
</div>
<button id="btn-search-expand" class="btn btn-warning reset" data-target="basic">Поиск</button>
</div>
</div>
</div>
<div id="backgroundForm">
<button id="btn-get-standard-searchform" class="btn btn-warning reset" data-target="basic">Стандартная форма поиска</button>
</div>
</div>
<script src="themes/iph/js/query-builder.standalone.min.js"></script> <script src="themes/iph/js/query-builder.standalone.min.js"></script>
<script src="themes/iph/js/query-builder.ru.js"></script> <script src="themes/iph/js/query-builder.ru.js"></script>
<script> <script>