diff --git a/Blacklight/http/AdminPage.php b/Blacklight/http/AdminPage.php
index 305fb8b45..81bbc8ef6 100644
--- a/Blacklight/http/AdminPage.php
+++ b/Blacklight/http/AdminPage.php
@@ -22,9 +22,9 @@ class AdminPage extends BasePage
// Tell Smarty which directories to use for templates
$this->smarty->setTemplateDir(
[
- 'admin' => NN_THEMES.'admin',
- 'shared' => NN_THEMES.'shared',
- 'default' => NN_THEMES.'Gentele',
+ 'admin' => config('ytake-laravel-smarty.template_path').'/admin',
+ 'shared' => config('ytake-laravel-smarty.template_path').'/shared',
+ 'default' => config('ytake-laravel-smarty.template_path').'/admin',
]
);
diff --git a/Blacklight/http/Page.php b/Blacklight/http/Page.php
index 0243f1c2a..0b3ff02e5 100644
--- a/Blacklight/http/Page.php
+++ b/Blacklight/http/Page.php
@@ -26,9 +26,9 @@ class Page extends BasePage
// Tell Smarty which directories to use for templates
$this->smarty->setTemplateDir(
[
- 'user' => NN_THEMES.$this->theme,
- 'shared' => NN_THEMES.'shared',
- 'default' => NN_THEMES.'Gentele',
+ 'user' => config('ytake-laravel-smarty.template_path'). DIRECTORY_SEPARATOR . $this->theme,
+ 'shared' => config('ytake-laravel-smarty.template_path').'/shared',
+ 'default' => config('ytake-laravel-smarty.template_path').'/Gentele',
]
);
diff --git a/Changelog b/Changelog
index a2e7a35bb..1cbde18d9 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
2018-03-06 DariusIII
+ * Chg: Move themes to resources/views/themes folder
* Chg: Update Captcha class
* Chg: Update admin area pages
* Chg: Move BasePage, AdminPage and Page to Blacklight\http
diff --git a/app/Console/Commands/UpdateNNTmux.php b/app/Console/Commands/UpdateNNTmux.php
index 5a17cfdcf..c1aefc03b 100644
--- a/app/Console/Commands/UpdateNNTmux.php
+++ b/app/Console/Commands/UpdateNNTmux.php
@@ -3,6 +3,7 @@
namespace App\Console\Commands;
use Illuminate\Console\Command;
+use Ytake\LaravelSmarty\Smarty;
class UpdateNNTmux extends Command
{
@@ -66,15 +67,15 @@ class UpdateNNTmux extends Command
}
}
- $smarty = new \Smarty();
- $smarty->setCompileDir(NN_SMARTY_TEMPLATES);
+ $smarty = new Smarty();
+ $smarty->setCompileDir(config('ytake-laravel-smarty.compile_path'));
$cleared = $smarty->clearCompiledTemplate();
if ($cleared) {
$this->output->writeln('
Please enter the email address you used to register and we will send an email to reset your password. If you - cannot remember your email, or no longer have access to it, please contact - us.
- - - - - - - - -{elseif $sent != ''} -- A password reset request has been sent to your email. -
-{else} -- Your password has been reset and sent to you in an email. -
-{/if} - diff --git a/public/themes/Omicron/multi-operations.tpl b/public/themes/Omicron/multi-operations.tpl deleted file mode 100755 index ed0923d4b..000000000 --- a/public/themes/Omicron/multi-operations.tpl +++ /dev/null @@ -1,11 +0,0 @@ -Jump to: - [ {if $animeletter == '0-9'}{/if}0-9{if $animeletter == '0-9'}{/if} - {foreach $animerange as $range} - {if $range == $animeletter}{/if}{$range}{if $range == $animeletter}{/if} - {/foreach}] -
-{$site->adbrowse} -{if $animelist|@count > 0} -
- {$aletter}...- - |
- |||||||||
| Name | -Type | -Categories | -Rating | -View | -|||||
|---|---|---|---|---|---|---|---|---|---|
| {$a.title|escape:"htmlall"}{if {$a.startdate} != ''}
- ({$a.startdate|date_format} - - {/if}{if $a.enddate != ''}{$a.enddate|date_format}{/if}) |
- {if {$a.type} != ''}{$a.type|escape:"htmlall"}{/if} | -{if {$a.categories} != ''}{$a.categories|escape:"htmlall"|replace:'|':', '}{/if} | -{if {$a.rating} != ''}{$a.rating}{/if} | -AniDB - | -|||||
- {$console.review}
- {/if} -| # | -filename | -- | completion | -size | -
|---|---|---|---|---|
| {$smarty.foreach.iteration.index+1} | -{$file.title|escape:'htmlall'} | - {assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"} - {if $file.ext == "" || !is_file("$icon")} - {assign var="icon" value='file'} - {else} - {assign var="icon" value=$file.ext} - {/if} - {if $file.partstotal != 0} - {assign var="completion" value=($file.partsactual/$file.partstotal*100)|number_format:1} - {else} - {assign var="completion" value=0|number_format:1} - {/if} -{if $completion < 100}{$completion} - %{else}{$completion}%{/if} | -{if $file.size < 100000}{$file.size|fsize_format:"KB"}{else}{$file.size|fsize_format:"MB"}{/if} | -
- {else}
-
- {/if}
- {$result.title|escape:"htmlall"} ({$result.year})
- IMDB
- TRAKT
- "{$result.tagline|escape:"htmlall"}"
- {/if} -