Skip to content

Commit

Permalink
Changes in Profiles
Browse files Browse the repository at this point in the history
  • Loading branch information
@henrikeh
henrikeh committed May 18, 2019
1 parent ca5e19f commit ea0c7a9
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
Binary file added assets/p48_m2_ima2-3.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ <h6 class="mdc-list-group__subheader"></h6>
<main class="maincard" id="card-intro">
<div class="mdc-card demo-card">
<div class="mdc-card__primary-action demo-card__primary-action" tabindex="0">
<div class="mdc-card__media mdc-card__media--16-9 demo-card__media" style="background-image: url(&quot;assets/p66_m1_ima11.jpg&quot;);"></div>
<div class="mdc-card__media mdc-card__media--16-9 demo-card__media" style="background-image: url(&quot;assets/p48_m2_ima2-3.png&quot;);"></div>

<div class="demo-card__primary">
<h2 class="demo-card__title mdc-typography mdc-typography--headline6"></h2>
Expand Down Expand Up @@ -251,7 +251,7 @@ <h2></h2>
<div class="mdc-card__actions">
<div class="mdc-card__action-buttons">
<button class="mdc-button mdc-card__action mdc-card__action--button" id="button-identity-confirm" disabled=true disabled> <i class="material-icons" aria-hidden="true">check_circle</i></button>
<button class="mdc-button mdc-card__action mdc-card__action--button" id="button-identity-camera">Visagenkombinator <i class="material-icons" aria-hidden="true">camera_enhance</i></button>
<button class="mdc-button mdc-card__action mdc-card__action--button" id="button-identity-camera">Ähnliche Person<i class="material-icons" aria-hidden="true">camera_enhance</i></button>
<button class="mdc-button mdc-card__action mdc-card__action--button" id="button-identity-random">Is mir wurscht! <i class="material-icons" aria-hidden="true">loop</i></button>
</div>
</div>
Expand Down Expand Up @@ -835,8 +835,8 @@ <h3 class="demo-card__subtitle mdc-typography mdc-typography--subtitle2">Name, V
<div class="mdc-card demo-card">
<div class="mdc-card__primary-action demo-card__primary-action" tabindex="0">
<div class="demo-card__primary">
<h2 class="demo-card__title mdc-typography mdc-typography--headline6">Alle Gerichte in allen Wirtshäusern</h2>
<h3 class="demo-card__subtitle mdc-typography mdc-typography--subtitle2">Entdecke neues!</h3>
<h2 class="demo-card__title mdc-typography mdc-typography--headline6">Schmankerlindex</h2>
<h3 class="demo-card__subtitle mdc-typography mdc-typography--subtitle2">Grantle Dich durch alle Speisen durch!</h3>
</div>
<div class="demo-card__secondary mdc-typography mdc-typography--body2">
<div class="filter-sort">
Expand Down
2 changes: 1 addition & 1 deletion js/data/data_sample.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions js/functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ $("#help-content").html(`Add to Home Screen <i class="material-icons">add_to_hom
Über das Menü deines Browsers kannst du diese Webseite direkt auf deinem Startbildschirm ablegen.<br>`);
}else if(topic === "NavPubsList"){
$("#help-title").html(`Alt-Münchner Beisl-Katalog`);
$("#help-content").html(`Nachweis aller Wirtshäuser. Nachweis aller Wirtshäuser. Deine ganz persönliche Bierhumpen-Bestenliste – gut Grant!
$("#help-content").html(`Nachweis aller Wirtshäuser. Deine ganz persönliche Bierhumpen-Bestenliste – gut Grant!
`);
}else if(topic === "Sync"){
$("#help-title").html(`<i class="material-icons">help</i> Restaurantführer`);
Expand Down Expand Up @@ -258,7 +258,7 @@ function newAdressListElement(data){
<span class="mdc-list-item__graphic">
<button class="mdc-icon-button material-icons" title="Geolocate" data-mdc-ripple-is-unbounded="true" >map</button>
</span>
<span class="mdc-list-item__text">${data.body.street} ${data.body.number}, ${data.body.zip} ${data.body.city}</span>
<span class="mdc-list-item__text">${data.body.street} ${data.body.number} ${data.body.zip} ${data.body.city}</span>
</li>`;
return card_html;
}
Expand Down Expand Up @@ -721,8 +721,8 @@ DBplayer.get(id).then(function(result){
return DBhist_persons.get(result.identity);
}).then(function(result2){
$("#card-about-other").find("[player-name]").html(`${result2.name}`);
$("#card-about-other").find("[player-job]").html(`${result2.job[0]}`);
$("#card-about-other").find(`[player-status]`).html(` (${result2.birthdate} - ${result2.deathdate}) <br> Biografie: ${result2.Bio}`);
$("#card-about-other").find("[player-job]").html(`${result2.job}`);
$("#card-about-other").find(`[player-status]`).html(` <br><br> Bio: ${result2.bio} <br><br> GND: ${result2.gnd}<br>XML: ${result2.xmlfile}`);
$("#card-about-other").find("[player-pic]").attr("src", "").attr("src", "assets/portraits/"+result2.file).attr("width", "100%");
console.log(result2.file);
//for(val in result.doc._attachments){
Expand Down Expand Up @@ -1057,7 +1057,7 @@ function redrawUserInfo(){
DBhist_persons.get(user_state.identity).then(function(doc){
$("[user-name]").html(`${doc.name}`);
$("[user-status]").html(`${doc.job}`);
$("#card-about-you").find(`[user-status]`).append(` <br> Bio: ${doc.bio}`);
$("#card-about-you").find(`[user-status]`).append(` <br><br> Bio: ${doc.bio} <br><br> GND: ${doc.gnd}<br>XML: ${doc.xmlfile}`);
user_state.name = doc.name; // set display name
});

Expand Down

0 comments on commit ea0c7a9

Please sign in to comment.