Skip to content

Commit

Permalink
Fix: Some errors
Browse files Browse the repository at this point in the history
  • Loading branch information
ollm committed Oct 8, 2023
1 parent 8114336 commit c3ee1e2
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 42 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
- Ignore single folders in browsing [`7507563`](https://github.com/ollm/OpenComic/commit/75075631fcad5fb269427c178e9bac86bc352971)
- Search and filter in library/browsing [`8393903`](https://github.com/ollm/OpenComic/commit/8393903117981bea2b8a79e2e50b77d02334aa05)
- Tracking at the end of the chapter/volume setting option [`39f1954`](https://github.com/ollm/OpenComic/commit/39f19546b2fd363d321f9c423e706c3dc773aa4f)
- View size and remove cache and temporary files from settings
- View size and remove cache and temporary files from settings [`8114336`](https://github.com/ollm/OpenComic/commit/8114336ef2c70748e3b1d87618903ef34cb58f0a)

##### 🐛 Bug Fixes

Expand Down
14 changes: 7 additions & 7 deletions languages/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -177,13 +177,13 @@
"noFolders": "Sense carpetes"
},
"storage": {
"main": "",
"cache": "",
"cacheDescription": "",
"clearCache": "",
"temporaryFiles": "",
"temporaryFilesDescription": "",
"removeTemporaryFiles": ""
"main": "Emmagatzematge",
"cache": "Memòria cau",
"cacheDescription": "Les miniatures i l'índex dels fitxers comprimits s'emmagatzemen aquí, no es recomana netejar-la tret que sigui molt gran o hi hagi algun error relacionat amb ella",
"clearCache": "Netejar memòria cau",
"temporaryFiles": "Arxius temporals",
"temporaryFilesDescription": "Aquí es descomprimeixen els fitxers comprimits a mesura que es van necessitant, això s'elimina automàticament en tancar OpenComic",
"removeTemporaryFiles": "Eliminar fitxers temporals"
}
},
"menu": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/reading.js
Original file line number Diff line number Diff line change
Expand Up @@ -2963,7 +2963,7 @@ function loadTrackigSites()
handlebarsContext.trackingSites = trackingSites.list(true);
handlebarsContext.favoriteTrackingSites = trackingSites.listFavorite(true);

$('#tracking-sites .menu-simple').html(template.load('reading.elements.menus.tracking.sites.html'));
$('#tracking-sites .menu-simple-content').html(template.load('reading.elements.menus.tracking.sites.html'));
}

function trackingSiteToFavorite(site = '')
Expand Down
5 changes: 4 additions & 1 deletion templates/reading.elements.menus.html
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,10 @@
<div class="menu-close" onclick="reading.magnifyingGlassControl(2); events.desactiveMenu('#collections-bookmark', '.bar-right-buttons .button-collections-bookmark');"></div>
</div>
<div class="menu" id="tracking-sites">
<div class="menu-simple menu-simple-header elevation-2" style="width: 256px;"></div>
<div class="menu-simple menu-simple-header elevation-2" style="width: 256px;">
<div class="menu-simple-content">
</div>
</div>
<div class="menu-close" onclick="reading.magnifyingGlassControl(2); events.desactiveMenu('#tracking-sites', '.bar-right-buttons .button-tracking-sites');"></div>
</div>
<div class="menu" id="reading-more-options">
Expand Down
60 changes: 29 additions & 31 deletions templates/reading.elements.menus.tracking.sites.html
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
<div class="menu-simple-content">
<div>
{{#if trackingProblem}}
<div class="menu-tracking-sites menu-tracking-sites-problem menu-simple-element" onclick="tracking.addChapterNumberDialog();">
<i class="material-icon">sync_problem</i>
{{language.reading.tracking.problemChapter}}
</div>
{{/if}}
<div>
{{#if trackingProblem}}
<div class="menu-tracking-sites menu-tracking-sites-problem menu-simple-element" onclick="tracking.addChapterNumberDialog();">
<i class="material-icon">sync_problem</i>
{{language.reading.tracking.problemChapter}}
</div>
{{/if}}

<div class="menu-tracking-sites menu-simple-text">
<span>{{language.reading.tracking.favoriteSites}}</span>
<div class="menu-tracking-sites menu-simple-text">
<span>{{language.reading.tracking.favoriteSites}}</span>
</div>
{{#each favoriteTrackingSites}}
<div class="menu-tracking-sites menu-simple-element menu-simple-element-medium gamepad-item{{#if config.favorite}} favorite{{/if}}" onclick="tracking.configTracking('{{key}}')">
<div class="menu-simple-element-image" style="background-image: url({{logo}})"></div>
<span>{{name}}</span>
<i class="material-icon menu-simple-icon-last" onclick="reading.trackingSiteToFavorite('{{key}}'); event.stopPropagation();">favorite</i>
{{#if tracking.id}}<i class="material-icon">{{#if tracking.active}}sync{{else}}sync_disabled{{/if}}</i>{{/if}}
</div>
{{#each favoriteTrackingSites}}
<div class="menu-tracking-sites menu-simple-element menu-simple-element-medium gamepad-item{{#if config.favorite}} favorite{{/if}}" onclick="tracking.configTracking('{{key}}')">
<div class="menu-simple-element-image" style="background-image: url({{logo}})"></div>
<span>{{name}}</span>
<i class="material-icon menu-simple-icon-last" onclick="reading.trackingSiteToFavorite('{{key}}'); event.stopPropagation();">favorite</i>
{{#if tracking.id}}<i class="material-icon">{{#if tracking.active}}sync{{else}}sync_disabled{{/if}}</i>{{/if}}
</div>
{{else}}
<div class="menu-simple-text menu-tracking-sites-empty">{{language.reading.tracking.emptyFavoriteSites}}</div>
{{/each}}
{{else}}
<div class="menu-simple-text menu-tracking-sites-empty">{{language.reading.tracking.emptyFavoriteSites}}</div>
{{/each}}

<div class="menu-tracking-sites menu-simple-text">
<span>{{language.reading.tracking.sites}}</span>
</div>
{{#each trackingSites}}
<div class="menu-tracking-sites menu-tracking-sites--{{key}} menu-simple-element menu-simple-element-medium gamepad-item{{#if config.favorite}} favorite{{/if}}" onclick="tracking.configTracking('{{key}}')">
<div class="menu-simple-element-image" style="background-image: url({{logo}})"></div>
<span>{{name}}</span>
<i class="material-icon menu-simple-icon-last" onclick="reading.trackingSiteToFavorite('{{key}}'); event.stopPropagation();">favorite</i>
{{#if tracking.id}}<i class="material-icon">{{#if tracking.active}}sync{{else}}sync_disabled{{/if}}</i>{{/if}}
</div>
{{/each}}
<div class="menu-tracking-sites menu-simple-text">
<span>{{language.reading.tracking.sites}}</span>
</div>
{{#each trackingSites}}
<div class="menu-tracking-sites menu-tracking-sites--{{key}} menu-simple-element menu-simple-element-medium gamepad-item{{#if config.favorite}} favorite{{/if}}" onclick="tracking.configTracking('{{key}}')">
<div class="menu-simple-element-image" style="background-image: url({{logo}})"></div>
<span>{{name}}</span>
<i class="material-icon menu-simple-icon-last" onclick="reading.trackingSiteToFavorite('{{key}}'); event.stopPropagation();">favorite</i>
{{#if tracking.id}}<i class="material-icon">{{#if tracking.active}}sync{{else}}sync_disabled{{/if}}</i>{{/if}}
</div>
{{/each}}
</div>
4 changes: 3 additions & 1 deletion themes/material-design/actions.css
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@

.menu-simple-text, .menu-simple-button
{
min-height: 52px;
height: 52px;
padding: 0px 24px;
line-height: 52px;
transition: background-color 0.2s, opacity 0.2s;
Expand All @@ -730,6 +730,8 @@

.menu-simple-supporting-text
{
height: initial;
min-height: 52px;
display: flex;
justify-content: space-between;
align-items: center;
Expand Down

0 comments on commit c3ee1e2

Please sign in to comment.