Private GIT

Skip to content
Snippets Groups Projects
Commit f083dd02 authored by Fernando's avatar Fernando
Browse files

Merge pull request #2732 from OmgImAlexis/develop 

Added bootstrap-achor and made history goto displayShow SXEX
parents 0ad15179 2216dd5a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
gui/slick/js/lib/bootstrap-anchor.min.js 0 → 100644
NaN GiB (NaN%)
View file @ f083dd02
File suppressed by a .gitattributes entry, the file's encoding is unsupported, or the file size exceeds the limit.
gui/slick/js/script.js
+ 27
− 36
View file @ f083dd02
......@@ -30,7 +30,6 @@ function initHeader() {
inside = false;
}
});
}
......@@ -59,9 +58,7 @@ function showMsg(msg, loader, timeout, ms) {
}
function resetFilters(text) {
if ($(".dataTables_filter").length > 0) {
$(".dataTables_filter input").attr("placeholder", "filter " + text + "");
}
if ($(".dataTables_filter").length > 0) $(".dataTables_filter input").attr("placeholder", "filter " + text + "");
}
function initTabs() {
......@@ -106,15 +103,10 @@ function initTabs() {
});
}
function init() {
$(document).ready(function () {
initHeader();
initTabs();
}
$(document).ready(function () {
init();
$(document).ready(function() {
$(document).anchor();
$('.dropdown-toggle').dropdownHover();
if(metaToBool('sickbeard.FUZZY_DATING')){
$.timeago.settings.allowFuture = true;
......@@ -140,4 +132,3 @@ $(document).ready(function () {
$("[datetime]").timeago();
}
});
});
gui/slick/views/comingEpisodes.mako
+ 1
− 1
View file @ f083dd02
......@@ -113,7 +113,7 @@
<tr class="${show_div}">
<td align="center" nowrap="nowrap">
<% airDate = sbdatetime.sbdatetime.convert_to_setting(cur_result['localtime']) %>
<time datetime="${airDate.isoformat('T')}" class="date">${sbdatetime.sbdatetime.sbfdate(airDate)}</time>
<time datetime="${airDate.isoformat('T')}" class="date">${sbdatetime.sbdatetime.sbfdatetime(airDate)}</time>
</td>
<td class="tvShow" nowrap="nowrap"><a href="${srRoot}/home/displayShow?show=${cur_result['showid']}">${cur_result['show_name']}</a>
......
gui/slick/views/displayShow.mako
+ 1
− 1
View file @ f083dd02
......@@ -422,7 +422,7 @@
% endif
<% curSeason = int(epResult["season"]) %>
% endif
<tr class="${Overview.overviewStrings[epCats[epStr]]} season-${curSeason} seasonstyle">
<tr class="${Overview.overviewStrings[epCats[epStr]]} season-${curSeason} seasonstyle" id="${'S' + str(epResult["season"]) + 'E' + str(epResult["episode"])}">
<td class="col-checkbox">
% if int(epResult["status"]) != UNAIRED:
<input type="checkbox" class="epCheck" id="${str(epResult["season"])+'x'+str(epResult["episode"])}" name="${str(epResult["season"]) +"x"+str(epResult["episode"])}" />
......
gui/slick/views/history.mako
+ 1
− 1
View file @ f083dd02
......@@ -75,7 +75,7 @@
<% isoDate = datetime.datetime.strptime(str(hItem["date"]), History.date_format).isoformat('T') %>
<time datetime="${isoDate}" class="date">${airDate}</time>
</td>
<td class="tvShow" width="35%"><a href="${srRoot}/home/displayShow?show=${hItem["show_id"]}#season-${hItem["season"]}">${hItem["show_name"]} - ${"S%02i" % int(hItem["season"])}${"E%02i" % int(hItem["episode"])} ${('', '<span class="quality Proper">Proper</span>')["proper" in hItem["resource"].lower() or "repack" in hItem["resource"].lower()]}</a></td>
<td class="tvShow" width="35%"><a href="${srRoot}/home/displayShow?show=${hItem["show_id"]}#S${hItem["season"]}E${hItem["episode"]}">${hItem["show_name"]} - ${"S%02i" % int(hItem["season"])}${"E%02i" % int(hItem["episode"])} ${('', '<span class="quality Proper">Proper</span>')["proper" in hItem["resource"].lower() or "repack" in hItem["resource"].lower()]}</a></td>
<td align="center" ${('', 'class="subtitles_column"')[curStatus == SUBTITLED]}>
% if curStatus == SUBTITLED:
<img width="16" height="11" style="vertical-align:middle;" src="${srRoot}/images/subtitles/flags/${hItem['resource']}.png" onError="this.onerror=null;this.src='${srRoot}/images/flags/unknown.png';">
......
gui/slick/views/home.mako
+ 1
− 1
View file @ f083dd02
......@@ -43,7 +43,7 @@
<meta data-var="max_download_count" data-content="${max_download_count}">
</%block>
<%block name="scripts">
<script type="text/javascript" src="${srRoot}/js/new/home.js"></script>
<script type="text/javascript" src="${srRoot}/js/new/home.js?${sbPID}"></script>
</%block>
<%block name="content">
<%namespace file="/inc_defs.mako" import="renderQualityPill"/>
......
gui/slick/views/layouts/main.mako
+ 5
− 4
View file @ f083dd02
......@@ -342,6 +342,7 @@
<script type="text/javascript" src="${srRoot}/js/lib/jquery-2.1.4.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/bootstrap.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/bootstrap-hover-dropdown.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/bootstrap-anchor.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery-ui-1.10.4.custom.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.cookie.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.cookiejar.js?${sbPID}"></script>
......@@ -351,7 +352,7 @@
<script type="text/javascript" src="${srRoot}/js/lib/jquery.tablesorter.widgets-2.17.7.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.tablesorter.widget-columnSelector-2.17.7.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.qtip-2.2.1.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/pnotify.custom.min.js"></script>
<script type="text/javascript" src="${srRoot}/js/lib/pnotify.custom.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.form-3.35.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.ui.touch-punch-0.2.2.min.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/isotope.pkgd.min.js?${sbPID}"></script>
......@@ -361,9 +362,9 @@
<script type="text/javascript" src="${srRoot}/js/new/parsers.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/new/meta.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/script.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.scrolltopcontrol-1.1.js"></script>
<script type="text/javascript" src="${srRoot}/js/browser.js"></script>
<script type="text/javascript" src="${srRoot}/js/ajaxNotifications.js"></script>
<script type="text/javascript" src="${srRoot}/js/lib/jquery.scrolltopcontrol-1.1.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/browser.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/ajaxNotifications.js?${sbPID}"></script>
<script type="text/javascript" src="${srRoot}/js/confirmations.js?${sbPID}"></script>
% endif
<%block name="scripts" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment

Another place to be (or not)