Skip to content

Commit

Permalink
thumbnail changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@nczirjak-acdh
nczirjak-acdh committed Apr 21, 2020
1 parent 7414308 commit e601248
Show file tree
Hide file tree
Showing 13 changed files with 129 additions and 52 deletions.
10 changes: 3 additions & 7 deletions js/acdh_repo_gui_pager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ jQuery(function($) {
if(urlOrder){
urlOrder = urlOrder.replace('#','');
}
if(urlLimit){
if(urlLimit && $.isNumeric(urlLimit) === false){
urlLimit = urlLimit.replace('#','');
}
if(urlPage){
if(urlPage && $.isNumeric(urlPage) === false){
urlPage = urlPage.replace('#','');
}

Expand All @@ -127,10 +127,6 @@ jQuery(function($) {
return obj;
}

function changePagerGui() {

}

$(document ).delegate( "#prev-btn", "click", function(e) {
let newPageNumber = $(this).data('pagination');
createNewUrl(newPageNumber, params.urlLimit, params.urlOrder, actionPage, params.searchStr);
Expand Down Expand Up @@ -162,7 +158,7 @@ jQuery(function($) {
var newurl = '';

//if (history.pushState) {
if(actionPage == 'root') {
if(actionPage == 'root' || actionPage == 'root_main') {
newurl = window.location.protocol + "//" + window.location.host + '/browser/discover/root/' + orderBy + '/' + limit + '/' + page;
} else if(actionPage == 'search') {
newurl = window.location.protocol + "//" + window.location.host + '/browser/discover/'+ searchStr +'/' + orderBy + '/' + limit + '/' + page;
Expand Down
35 changes: 34 additions & 1 deletion src/Controller/ArcheApiController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,10 @@ public function repo_recacheControlledVocabs(string $lng): Response {
return $response;
}


/**
* The gnd file generation API endpoint
* @return Response
*/
public function repo_gndPerson(): Response
{
/*
Expand Down Expand Up @@ -399,6 +402,36 @@ public function repo_gndPerson(): Response
return $response;
}

public function repo_metadataGUI(): Response
{
/*
* Usage:
* https://domain.com/browser/api/getMetadataGui/Language?_format=json
*/

$response = new Response();

$obj = new \stdClass();
//get the data
$this->modelData = $this->model->getViewData('gndPerson', $obj);
if(count($this->modelData) == 0 ){
return new JsonResponse(array("There is no data"), 404, ['Content-Type'=> 'application/json']);
}

$this->result = $this->helper->createView($this->modelData, 'gndPerson');

$response->setContent(json_encode(array("status" => "File created", "url" => $fileLocation)));
if(!isset($this->result["fileLocation"]) || empty($this->result["fileLocation"]) ){
return new JsonResponse(array("There is no data"), 404, ['Content-Type'=> 'application/json']);
}

$response->setContent(json_encode(array("status" => "File created", "url" => $this->result["fileLocation"])));
$response->headers->set('Content-Type', 'application/json');

return $response;
}




}
34 changes: 30 additions & 4 deletions src/Object/ResourceObject.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

namespace Drupal\acdh_repo_gui\Object;

use GuzzleHttp;

class ResourceObject {
private $config;
private $properties;
Expand Down Expand Up @@ -178,16 +180,40 @@ public function getTitleImage(): string {
if(isset($this->properties["acdh:hasTitleImage"]) && count($this->properties["acdh:hasTitleImage"]) > 0) {
if (isset($this->properties["acdh:hasTitleImage"][0]->value)) {
$img = '';
if($img = @file_get_contents($this->config->getBaseUrl().$this->properties["acdh:hasTitleImage"][0]->value)) {
if(!empty($img)) {
return $imageData = base64_encode($img);
$client = new \GuzzleHttp\Client();
$response = $client->get($this->config->getBaseUrl().$this->properties["acdh:hasTitleImage"][0]->value.'/metadata');
if($response->getStatusCode() == 200){
//thumbnail supported
if (strpos($response->getBody(), '"image/png"') !== false) {
echo 'thumbnail';
return '<img src="https://arche-thumbnails2.apollo.arz.oeaw.ac.at/'.$this->properties["acdh:hasTitleImage"][0]->value.'?width=200&height=150" />';
} else {
if($img = @file_get_contents($this->config->getBaseUrl().$this->properties["acdh:hasTitleImage"][0]->value)) {
if(!empty($img)) {
echo 'image';
return '<img src="data:image/png;base64,'.base64_encode($img).'" /> ';
}
}
}
}
}
}
}
return '';
}

/**
* Check if we have a titleimage id or not
* @return bool
*/
public function isTitleImage(): bool {
if(isset($this->properties["acdh:hasTitleImage"]) && count($this->properties["acdh:hasTitleImage"]) > 0) {
if (isset($this->properties["acdh:hasTitleImage"][0]->value)) {
return true;
}
}
return false;
}

/**
* Get the acdh type string
*
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-child.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<div class="res-el col-block col-lg-12">

{% if item.getTitleImage() %}<div class="res-inside-wrap col-lg-6 "> {% endif%}
{% if item.isTitleImage() %}<div class="res-inside-wrap col-lg-6 "> {% endif%}

{% if item.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -67,12 +67,14 @@

</div>

{% if item.getTitleImage() %}</div>{% endif%}
{% if item.isTitleImage() %}</div>{% endif%}

{% if item.getTitleImage() %}
{% if item.isTitleImage() %}
<div class="res-inside-wrap col-lg-6 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ item.getRepoID() }}"><img src="{{ item.getTitleImage() }}"></a>
<a href="/browser/oeaw_detail/{{ item.getRepoID() }}">
{{ item.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-detail-basic.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
<div class="arche-detail-view" >

<div class="arche-detail-main" id="arche-dv-main">
{% if basic.getTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}
{% if basic.isTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}

{% if basic.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -191,12 +191,14 @@
{% endfor %}


{% if basic.getTitleImage() %}</div>{% endif%}
{% if basic.isTitleImage() %}</div>{% endif%}

{% if basic.getTitleImage() %}
{% if basic.isTitleImage() %}
<div class="res-inside-wrap col-lg-4 ">
<div class="single-res-thumb">
<a id='archeHref' href="/browser/oeaw_detail/{{ basic.getRepoId() }}"><img src="data:image/png;base64,{{ basic.getTitleImage() }}" /></a>
<a id='archeHref' href="/browser/oeaw_detail/{{ basic.getRepoId() }}">
{{ basic.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-detail-organisation.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<div class="arche-detail-view" >

<div class="arche-detail-main" id="arche-dv-main">
{% if result.getTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}
{% if basic.isTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}

{% if basic.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -80,12 +80,14 @@
{% endfor %}


{% if result.getTitleImage() %}</div>{% endif%}
{% if basic.isTitleImage() %}</div>{% endif%}

{% if result.getTitleImage() %}
{% if basic.isTitleImage() %}
<div class="res-inside-wrap col-lg-4 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ result.getRepoId() }}"><img src="data:image/png;base64,{{ result.getTitleImage() }}" /></a>
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}">
{{ basic.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-detail-person.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<div class="arche-detail-view" >

<div class="arche-detail-main" id="arche-dv-main">
{% if basic.getTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}
{% if basic.isTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}

{% if basic.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -91,12 +91,14 @@
{% endfor %}
{% endif%}

{% if basic.getTitleImage() %}</div>{% endif%}
{% if basic.isTitleImage() %}</div>{% endif%}

{% if basic.getTitleImage() %}
{% if basic.isTitleImage() %}
<div class="res-inside-wrap col-lg-4 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}"><img src="data:image/png;base64,{{ basic.getTitleImage() }}" /></a>
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}">
{{ basic.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-detail-place.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
<div class="arche-detail-view" >

<div class="arche-detail-main" id="arche-dv-main">
{% if basic.getTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}
{% if basic.isTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}


{% if basic.getAcdhType() %}
Expand Down Expand Up @@ -122,12 +122,14 @@
</div>
{% endif%}

{% if basic.getTitleImage() %}</div>{% endif%}
{% if basic.isTitleImage() %}</div>{% endif%}

{% if basic.getTitleImage() %}
{% if basic.isTitleImage() %}
<div class="res-inside-wrap col-lg-4 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}"><img src="data:image/png;base64,{{ basic.getTitleImage() }}" /></a>
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}">
{{ basic.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-detail-project.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ set properties = {
<div class="arche-detail-view" >

<div class="arche-detail-main" id="arche-dv-main">
{% if basic.getTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}
{% if basic.isTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}

{% if basic.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -91,12 +91,14 @@ set properties = {
{% endfor %}


{% if basic.getTitleImage() %}</div>{% endif%}
{% if basic.isTitleImage() %}</div>{% endif%}

{% if basic.getTitleImage() %}
{% if basic.isTitleImage() %}
<div class="res-inside-wrap col-lg-4 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}"><img src="data:image/png;base64,{{ basic.getTitleImage() }}" /></a>
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}">
{{ basic.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-detail-publication.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<div class="arche-detail-view" >

<div class="arche-detail-main" id="arche-dv-main">
{% if basic.getTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}
{% if basic.isTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}

{% if basic.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -120,12 +120,14 @@
{% endfor %}


{% if basic.getTitleImage() %}</div>{% endif%}
{% if basic.isTitleImage() %}</div>{% endif%}

{% if basic.getTitleImage() %}
{% if basic.isTitleImage() %}
<div class="res-inside-wrap col-lg-4 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}"><img src="data:image/png;base64,{{ basic.getTitleImage() }}" /></a>
<a href="/browser/oeaw_detail/{{ basic.getRepoId() }}">
{{ basic.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
10 changes: 6 additions & 4 deletions templates/acdh-repo-gui-main-page-left-block.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<div class="res-el col-block col-lg-12">

{% if item.getTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}
{% if item.isTitleImage() %}<div class="res-inside-wrap col-lg-8 ">{% endif%}

{% if item.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -57,12 +57,14 @@

</div>

{% if item.getTitleImage() %}</div>{% endif%}
{% if item.isTitleImage() %}</div>{% endif%}

{% if item.getTitleImage() %}
{% if item.isTitleImage() %}
<div class="res-inside-wrap col-lg-4 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ item.getRepoId() }}"><img src="data:image/png;base64,{{ item.getTitleImage() }}" /></a>
<a href="/browser/oeaw_detail/{{ item.getRepoId() }}">
{{ item.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
12 changes: 8 additions & 4 deletions templates/acdh-repo-gui-main.html.twig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{% if item.getTitle() %}
<div class="res-el col-block col-lg-12">

{% if item.getTitleImage() %}<div class="res-inside-wrap col-lg-6 "> {% endif%}
{% if item.isTitleImage() %}<div class="res-inside-wrap col-lg-6 "> {% endif%}

{% if item.getTitle() %}
<div class="res-property">
Expand Down Expand Up @@ -59,12 +59,16 @@

</div>

{% if item.getTitleImage() %}</div>{% endif%}
{% if item.isTitleImage() %}</div>{% endif%}

{% if item.getTitleImage() %}
{% if item.isTitleImage() %}

<div class="res-inside-wrap col-lg-6 ">
<div class="single-res-thumb">
<a href="/browser/oeaw_detail/{{ item.getRepoId() }}"><img src="data:image/png;base64,{{ item.getTitleImage() }}" /></a>

<a href="/browser/oeaw_detail/{{ item.getRepoId() }}">
{{ item.getTitleImage()|raw }}
</a>
</div>
</div>
{% endif%}
Expand Down
Loading

0 comments on commit e601248

Please sign in to comment.