Skip to content

Commit

Permalink
Merge pull request #1021 from OpenDevelopmentMekong/master
Browse files Browse the repository at this point in the history 
merging to prod for releasing v2.2.56
  • Loading branch information
Alex Corbi authored Jun 14, 2017
2 parents 8cad84f + 4e64265 commit 30fc4d1
Show file tree
Hide file tree
Showing 24 changed files with 239 additions and 243 deletions.
10 changes: 6 additions & 4 deletions inc/templates/post-grid-single-1-cols.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@
?>

<div class="sixteen columns post-grid-item<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
<div class="grid-content-wrapper">
<div class="grid-content-wrapper">
<div class="meta">

<?php
$link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID);
$title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<h5>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
<?php echo $title; ?>
</a>
</a>
</h5>
<?php
if ($show_meta):
echo_post_meta($post,$meta_fields,$order,null,null);
Expand Down
24 changes: 13 additions & 11 deletions inc/templates/post-grid-single-2-cols.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,23 @@
?>

<div class="eight columns post-grid-item<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
<div class="grid-content-wrapper">
<div class="grid-content-wrapper">
<div class="meta">

<?php
$link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID);
$title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
<?php echo $title; ?>
</a>
<h5>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
<?php echo $title; ?>
</a>
</h5>
<?php
if ($show_meta):
echo_post_meta($post,$meta_fields,$order,null,null);
Expand Down
24 changes: 13 additions & 11 deletions inc/templates/post-grid-single-4-cols-caption-below.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,24 @@
$extra_classes = isset($params["extra_classes"]) ? $params["extra_classes"] : null;
?>

<div class="four columns post-grid-item post-grid-item-caption-bolow <?php echo odm_country_manager()->get_current_country(); ?>-bgdarkcolor<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
<div class="four columns post-grid-item post-grid-item-caption-below <?php echo odm_country_manager()->get_current_country(); ?>-bgdarkcolor<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
<div class="grid-content-wrapper">
<?php if ($show_meta): ?>
<div class="meta">
<div class="meta">
<?php
$link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID);
$title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
<?php echo $title; ?>
</a>
<h5>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
<?php echo $title; ?>
</a>
</h5>
<?php
if (isset($post->description) && $post->description != "") :?>
<div class="post-grid-item-list">
Expand Down
24 changes: 13 additions & 11 deletions inc/templates/post-grid-single-4-cols.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,22 @@
?>

<div class="four columns post-grid-item<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
<div class="grid-content-wrapper">
<div class="meta">
<div class="grid-content-wrapper">
<div class="meta">
<?php
$link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID);
$title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language()); ?>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
<?php echo $title; ?>
</a>
<h5>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $title; ?>">
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
<?php echo $title; ?>
</a>
</h5>
<?php
if ($show_meta):
echo_post_meta($post,$meta_fields,$order,null,null);
Expand Down
4 changes: 2 additions & 2 deletions inc/templates/post-link-single-1-cols.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="sixteen columns">
<div class="post-list-item single_result_container">
<p>
<h3>
<h5>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
Expand All @@ -19,7 +19,7 @@
endif; ?>
<?php echo $localized_title; ?>
</a>
</h3>
</h5>
</p>
</div>
</div>
42 changes: 20 additions & 22 deletions inc/templates/post-list-single-1-cols.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
$header_tag = isset($params["header_tag"]) ? $params["header_tag"] : false;
$order = isset($params["order"]) ? $params["order"] : "metadata_created";
$extra_classes = isset($params["extra_classes"]) ? $params["extra_classes"] : null;

?>

<div class="sixteen columns<?php if (isset($extra_classes)): echo " ". $extra_classes; endif; ?>">
Expand All @@ -24,7 +24,7 @@
<?php
$link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID);
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());?>
<h4>
<h5>
<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">
<?php
if ($show_post_type):
Expand All @@ -34,26 +34,24 @@
endif; ?>
<?php echo $localized_title; ?>
</a>
</h4>
</h5>
<?php else: ?>
<p>
<h4>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">
<h5>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">

<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
endif; ?>

<?php echo $localized_title; ?>
</a>
</h4>
</p>
<?php echo $localized_title; ?>
</a>
</h5>
<?php endif; ?>

<?php
Expand All @@ -72,13 +70,13 @@
endif;
endif;
?>
<?php if ($show_excerpt || $show_source_meta): ?>
<?php if ($show_excerpt || $show_source_meta): ?>
<?php if ($show_excerpt): ?>
<div class="post-excerpt">
<?php
$excerpt = odm_excerpt($post);
<?php
$excerpt = odm_excerpt($post);
if (isset($highlight_words_query) && function_exists('wp_odm_solr_highlight_search_words')):
$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
endif;
echo $excerpt; ?>
</div>
Expand Down
41 changes: 19 additions & 22 deletions inc/templates/post-list-single-2-cols.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<?php
$link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID);
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());?>
<h4>
<h5>
<a class="item-title" href="<?php echo $link; ?>" title="<?php echo $localized_title; ?>">
<?php
if ($show_post_type):
Expand All @@ -33,27 +33,24 @@
endif; ?>
<?php echo $localized_title; ?>
</a>
</h4>
</h5>
<?php else: ?>
<p>
<h4>
<h5>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">

<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">
endif; ?>

<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>

<?php echo $localized_title; ?>
</a>
</h4>
</p>
<?php echo $localized_title; ?>
</a>
</h5>
<?php endif; ?>

<?php
Expand All @@ -78,11 +75,11 @@
endif; ?>
<?php if ($show_excerpt): ?>
<div class="post-excerpt">
<?php
$excerpt = odm_excerpt($post);
<?php
$excerpt = odm_excerpt($post);
if (isset($highlight_words_query) && function_exists('wp_odm_solr_highlight_search_words')):
$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
endif;
$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
endif;
echo $excerpt;?>
</div>
<?php endif; ?>
Expand Down
40 changes: 19 additions & 21 deletions inc/templates/post-list-single-4-cols.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<?php
$link = isset($post->dataset_link) ? $post->dataset_link : get_permalink($post->ID);
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());?>
<h4>
<h5>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
Expand All @@ -36,26 +36,24 @@
endif; ?>
<?php echo $localized_title; ?>
</a>
</h4>
</h5>
<?php else: ?>
<p>
<h4>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">
<h5>
<?php
$localized_title = apply_filters('translate_text', $post->post_title, odm_language_manager()->get_current_language());
?>
<a class="item-title" href="<?php echo get_permalink($post->ID); ?>" title="<?php echo $localized_title; ?>">

<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
if ($show_post_type):
$post_type_name = get_post_type($post->ID); ?>
<i class="<?php echo get_post_type_icon_class($post_type_name); ?>"></i>
<?php
endif; ?>
endif; ?>

<?php echo $localized_title; ?>
</a>
</h4>
</p>
<?php echo $localized_title; ?>
</a>
</h5>
<?php endif; ?>

<?php
Expand All @@ -77,11 +75,11 @@
<?php if ($show_excerpt || $show_source_meta): ?>
<?php if ($show_excerpt): ?>
<div class="post-excerpt">
<?php
$excerpt = odm_excerpt($post);
<?php
$excerpt = odm_excerpt($post);
if (isset($highlight_words_query) && function_exists('wp_odm_solr_highlight_search_words')):
$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
endif;
$excerpt = wp_odm_solr_highlight_search_words($highlight_words_query,$excerpt);
endif;
echo $excerpt; ?>
</div>
<?php if( echo_downloaded_documents()):
Expand Down
Loading

0 comments on commit 30fc4d1

Please sign in to comment.