mirror of https://github.com/evilhero/mylar
FIX:(#905) Removed Donation button from config screen to lessen confusion, FIX:(#906) External links will now open in new tab (again), as well as changelog link from within Update popup
This commit is contained in:
evilhero
parent
d9a303fe4b
commit
212cfa7758
|
|
@ -29,7 +29,10 @@
|
|||
<script src="js/libs/modernizr-1.7.min.js"></script>
|
||||
</head>
|
||||
<body>
|
||||
<div id="container">
|
||||
<%
|
||||
mylar.DONATEBUTTON = True
|
||||
%>
|
||||
<div id="container">
|
||||
<div id="ajaxMsg"></div>
|
||||
% if not mylar.CURRENT_VERSION:
|
||||
<div id="updatebar">
|
||||
|
|
@ -38,7 +41,7 @@
|
|||
</div>
|
||||
% elif mylar.CURRENT_VERSION != mylar.LATEST_VERSION and mylar.INSTALL_TYPE != 'win' and mylar.COMMITS_BEHIND > 0:
|
||||
<div id="updatebar">
|
||||
A <a href="http://github.com/evilhero/mylar/compare/${mylar.CURRENT_VERSION}...${mylar.LATEST_VERSION}"> newer version</a> is available. You're ${mylar.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
|
||||
A <a href="http://github.com/evilhero/mylar/compare/${mylar.CURRENT_VERSION}...${mylar.LATEST_VERSION}" target="_blank"> newer version</a> is available. You're ${mylar.COMMITS_BEHIND} commits behind. <a href="update">Update</a> or <a href="#" onclick="$('#updatebar').slideUp('slow');">Close</a>
|
||||
</div>
|
||||
% endif
|
||||
|
||||
|
|
@ -88,7 +91,9 @@
|
|||
</small>
|
||||
</div>
|
||||
<div id="donate">
|
||||
<a href="config#donate"><img src="interfaces/default/images/donate.png" height="25" width="120"></a>
|
||||
%if mylar.DONATEBUTTON:
|
||||
<a href="config#donate"><img src="interfaces/default/images/donate.png" height="25" width="120"></a>
|
||||
%endif
|
||||
<a href="https://twitter.com/mylarcomics" class="twitter-follow-button" data-show-count="false">@mylarcomics</a>
|
||||
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,9 @@
|
|||
</%def>
|
||||
<%def name="body()">
|
||||
|
||||
|
||||
<%
|
||||
mylar.DONATEBUTTON = False
|
||||
%>
|
||||
|
||||
<div id="paddingheader">
|
||||
<h1 class="clearfix"><img src="interfaces/default/images/icon_gear.png" alt="settings"/>Settings</h1>
|
||||
|
|
@ -80,19 +82,19 @@
|
|||
</div>
|
||||
<div class="row">
|
||||
<label><strong>Forums</strong></label>
|
||||
<div><a href="http://forum.mylarcomics.com/">http://forum.mylarcomics.com</a></div>
|
||||
<div><a href="http://forum.mylarcomics.com/" target="_blank">http://forum.mylarcomics.com</a></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label><strong>Source</strong></label>
|
||||
<div><a href="https://github.com/evilhero/mylar/">https://github.com/evilhero/mylar/</a></div>
|
||||
<div><a href="https://github.com/evilhero/mylar/" target="_blank">https://github.com/evilhero/mylar/</a></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label><strong>Issues</strong></label>
|
||||
<div><a href="https://github.com/evilhero/mylar/issues">https://github.com/evilhero/mylar/issues/</a></div>
|
||||
<div><a href="https://github.com/evilhero/mylar/issues" target="_blank">https://github.com/evilhero/mylar/issues/</a></div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<label><strong>Internet Relay Chat</strong></label>
|
||||
<div><a href="irc://irc.freenode.net/#mylar">#mylar on irc.freenode.net</a></div>
|
||||
<div><a href="irc://irc.freenode.net/#mylar" target="_blank">#mylar on irc.freenode.net</a></div>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ MAX_LOGSIZE = None
|
|||
CACHE_DIR = None
|
||||
SYNO_FIX = False
|
||||
IMPORTBUTTON = False
|
||||
DONATEBUTTON = True
|
||||
|
||||
PULLNEW = None
|
||||
ALT_PULL = False
|
||||
|
|
@ -1362,7 +1363,7 @@ def dbcheck():
|
|||
c.execute('CREATE TABLE IF NOT EXISTS nzblog (IssueID TEXT, NZBName TEXT, SARC TEXT, PROVIDER TEXT, ID TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS weekly (SHIPDATE text, PUBLISHER text, ISSUE text, COMIC VARCHAR(150), EXTRA text, STATUS text)')
|
||||
# c.execute('CREATE TABLE IF NOT EXISTS sablog (nzo_id TEXT, ComicName TEXT, ComicYEAR TEXT, ComicIssue TEXT, name TEXT, nzo_complete TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS importresults (impID TEXT, ComicName TEXT, ComicYear TEXT, Status TEXT, ImportDate TEXT, ComicFilename TEXT, ComicLocation TEXT, WatchMatch TEXT, DisplayName TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS importresults (impID TEXT, ComicName TEXT, ComicYear TEXT, Status TEXT, ImportDate TEXT, ComicFilename TEXT, ComicLocation TEXT, WatchMatch TEXT, DisplayName TEXT, SRID TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS readlist (IssueID TEXT, ComicName TEXT, Issue_Number TEXT, Status TEXT, DateAdded TEXT, Location TEXT, inCacheDir TEXT, SeriesYear TEXT, ComicID TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS readinglist(StoryArcID TEXT, ComicName TEXT, IssueNumber TEXT, SeriesYear TEXT, IssueYEAR TEXT, StoryArc TEXT, TotalIssues TEXT, Status TEXT, inCacheDir TEXT, Location TEXT, IssueArcID TEXT, ReadingOrder INT, IssueID TEXT, ComicID TEXT, StoreDate TEXT, IssueDate TEXT, Publisher TEXT, IssuePublisher TEXT, IssueName TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS annuals (IssueID TEXT, Issue_Number TEXT, IssueName TEXT, IssueDate TEXT, Status TEXT, ComicID TEXT, GCDComicID TEXT, Location TEXT, ComicSize TEXT, Int_IssueNumber INT, ComicName TEXT, ReleaseDate TEXT, ReleaseComicID TEXT, ReleaseComicName TEXT, IssueDate_Edit TEXT)')
|
||||
|
|
@ -1498,7 +1499,10 @@ def dbcheck():
|
|||
except:
|
||||
c.execute('ALTER TABLE importresults ADD COLUMN DisplayName TEXT')
|
||||
|
||||
|
||||
try:
|
||||
c.execute('SELECT SRID from importresults')
|
||||
except:
|
||||
c.execute('ALTER TABLE importresults ADD COLUMN SRID TEXT')
|
||||
## -- Readlist Table --
|
||||
|
||||
try:
|
||||
|
|
|
|||
Loading…
Reference in New Issue