From 212cfa7758395db6ce0457eff9f95e18ffe42289 Mon Sep 17 00:00:00 2001 From: evilhero Date: Sat, 20 Dec 2014 12:12:46 -0500 Subject: [PATCH] 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 --- data/interfaces/default/base.html | 11 ++++++++--- data/interfaces/default/config.html | 12 +++++++----- mylar/__init__.py | 8 ++++++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/data/interfaces/default/base.html b/data/interfaces/default/base.html index 2a22fae6..24cf2c7a 100755 --- a/data/interfaces/default/base.html +++ b/data/interfaces/default/base.html @@ -29,7 +29,10 @@ -
+ <% + mylar.DONATEBUTTON = True + %> +
% if not mylar.CURRENT_VERSION:
@@ -38,7 +41,7 @@
% elif mylar.CURRENT_VERSION != mylar.LATEST_VERSION and mylar.INSTALL_TYPE != 'win' and mylar.COMMITS_BEHIND > 0:
- A newer version is available. You're ${mylar.COMMITS_BEHIND} commits behind. Update or Close + A newer version is available. You're ${mylar.COMMITS_BEHIND} commits behind. Update or Close
% endif @@ -88,7 +91,9 @@
diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index f04d0795..c15cf096 100755 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -13,7 +13,9 @@ <%def name="body()"> - + <% + mylar.DONATEBUTTON = False + %>

settingsSettings

@@ -80,19 +82,19 @@
-
http://forum.mylarcomics.com
+
http://forum.mylarcomics.com
-
https://github.com/evilhero/mylar/
+
https://github.com/evilhero/mylar/
-
https://github.com/evilhero/mylar/issues/
+
https://github.com/evilhero/mylar/issues/
-
#mylar on irc.freenode.net
+
#mylar on irc.freenode.net
diff --git a/mylar/__init__.py b/mylar/__init__.py index 9781a49b..addceca4 100755 --- a/mylar/__init__.py +++ b/mylar/__init__.py @@ -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: