diff --git a/gui/slick/views/displayShow.mako b/gui/slick/views/displayShow.mako index 1f2af7939aab76c5fae37b753e8a810118574629..0e57871c52d29a8fb2968a29608c259e27430425 100644 --- a/gui/slick/views/displayShow.mako +++ b/gui/slick/views/displayShow.mako @@ -214,7 +214,7 @@ % if sickbeard.USE_SUBTITLES: <tr><td class="showLegend">Subtitles: </td><td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.subtitles)]}" alt="${("N", "Y")[bool(show.subtitles)]}" width="16" height="16" /></td></tr> % endif - <tr><td class="showLegend">Flat Folders: </td><td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.flatten_folders or sickbeard.NAMING_FORCE_FOLDERS)]}" alt=="${("N", "Y")[bool(show.flatten_folders or sickbeard.NAMING_FORCE_FOLDERS)]}" width="16" height="16" /></td></tr> + <tr><td class="showLegend">Season Folders: </td><td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(not show.flatten_folders or sickbeard.NAMING_FORCE_FOLDERS)]}" alt=="${("N", "Y")[bool(not show.flatten_folders or sickbeard.NAMING_FORCE_FOLDERS)]}" width="16" height="16" /></td></tr> <tr><td class="showLegend">Paused: </td><td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.paused)]}" alt="${("N", "Y")[bool(show.paused)]}" width="16" height="16" /></td></tr> <tr><td class="showLegend">Air-by-Date: </td><td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.air_by_date)]}" alt="${("N", "Y")[bool(show.air_by_date)]}" width="16" height="16" /></td></tr> <tr><td class="showLegend">Sports: </td><td><img src="${srRoot}/images/${("no16.png", "yes16.png")[bool(show.is_sports)]}" alt="${("N", "Y")[bool(show.is_sports)]}" width="16" height="16" /></td></tr> diff --git a/gui/slick/views/manage.mako b/gui/slick/views/manage.mako index 9f001a3d6bed6859328daf996482a4f8caab6bcf..e7f0ba82301e6a6eec793c5d8513645be6465fb8 100644 --- a/gui/slick/views/manage.mako +++ b/gui/slick/views/manage.mako @@ -27,7 +27,7 @@ <th class="col-legend">Sports</th> <th class="col-legend">Scene</th> <th class="col-legend">Anime</th> - <th class="col-legend">Flat Folders</th> + <th class="col-legend">Season folders</th> <th class="col-legend">Archive first match</th> <th class="col-legend">Paused</th> <th class="col-legend">Subtitle</th> @@ -107,7 +107,7 @@ <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_sports) == 1]} width="16" height="16" /></td> <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_scene) == 1]} width="16" height="16" /></td> <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.is_anime) == 1]} width="16" height="16" /></td> - <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.flatten_folders) == 1]} width="16" height="16" /></td> + <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[not int(curShow.flatten_folders) == 1]} width="16" height="16" /></td> <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.archive_firstmatch) == 1]} width="16" height="16" /></td> <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.paused) == 1]} width="16" height="16" /></td> <td align="center"><img src="${srRoot}/images/${('no16.png" alt="N"', 'yes16.png" alt="Y"')[int(curShow.subtitles) == 1]} width="16" height="16" /></td> diff --git a/gui/slick/views/manage_massEdit.mako b/gui/slick/views/manage_massEdit.mako index 8daf0f0f52fb3dfc2cd60c4321bc5edf91058187..cb18db9b4dfdd10bf5631823bfc37bff633cb528 100644 --- a/gui/slick/views/manage_massEdit.mako +++ b/gui/slick/views/manage_massEdit.mako @@ -107,12 +107,12 @@ </div> <div class="optionWrapper clearfix"> -<span class="selectTitle">Flatten Folders <span class="separator">*</span></span> +<span class="selectTitle">Season folders<span class="separator">*</span></span> <div class="selectChoices"> <select id="edit_flatten_folders" name="flatten_folders" class="form-control form-control-inline input-sm"> <option value="keep" ${('', 'selected="selected"')[flatten_folders_value == None]}>< keep ></option> - <option value="enable" ${('', 'selected="selected"')[flatten_folders_value == 1]}>enable</option> - <option value="disable" ${('', 'selected="selected"')[flatten_folders_value == 0]}>disable</option> + <option value="disable" ${('', 'selected="selected"')[flatten_folders_value == 1]}>disable</option> + <option value="enable" ${('', 'selected="selected"')[flatten_folders_value == 0]}>enable</option> </select> </div> </div>