Fix displaying of flag images

This commit is contained in:
DariusIII
2018-03-08 09:05:03 +01:00
parent 2a66101031
commit d4d9d190c8
14 changed files with 26 additions and 24 deletions
+1 -1
View File
@@ -140,7 +140,7 @@ abstract class Capabilities
'email' => Settings::settingValue('site.main.email'),
'meta' => Settings::settingValue('site.main.metakeywords'),
'url' => $serverroot,
'image' => $serverroot.'themes/shared/images/tmux_logo.png',
'image' => $serverroot.'assets/images/tmux_logo.png',
],
'limits' => [
'max' => 100,
+1 -1
View File
@@ -333,7 +333,7 @@ class XML_Response
protected function includeImage(): void
{
$this->xml->startElement('image');
$this->xml->writeAttribute('url', $this->server['server']['url'].'themes/shared/images/logo.png');
$this->xml->writeAttribute('url', $this->server['server']['url'].'assets/images/logo.png');
$this->xml->writeAttribute('title', $this->server['server']['title']);
$this->xml->writeAttribute('link', $this->server['server']['url']);
$this->xml->writeAttribute(
+2 -2
View File
@@ -155,13 +155,13 @@ function release_flag($text, $page)
}
if ($code !== '' && $page === 'browse') {
$www = WWW_THEMES;
$www = WWW_TOP;
if (! in_array(substr($www, -1), ['\\', '/'], false)) {
$www .= DS;
}
return
'<img title="'.$language.'" alt="'.$language.'" src="'.$www.'shared/images/flags/'.$code.'.png"/>';
'<img title="'.$language.'" alt="'.$language.'" src="'.$www.'assets/images/flags/'.$code.'.png"/>';
}
if ($page === 'search') {
+2
View File
@@ -1,3 +1,5 @@
2018-03-08 DariusIII
* Fix: Fix displaying of flag images
2018-03-07 DariusIII
* Chg: Update laravel/framework to version 5.6.9 and laravel/tinker to version 1.0.4
* Chg: Update example .env file
+11 -11
View File
@@ -11,7 +11,7 @@ return [
|--------------------------------------------------------------------------
*/
'themes_path' => 'public/themes', // eg: base_path('resources/themes')
'themes_path' => 'resources/views/themes', // eg: base_path('resources/themes')
/*
|--------------------------------------------------------------------------
@@ -60,28 +60,28 @@ return [
'themes' => [
'Charisma' => [
'extends' => null,
'views-path' => 'Charisma',
'asset-path' => 'public/themes/shared/assets',
'views-path' => 'resources/views/themes/Charisma',
'asset-path' => 'public/assets/Charisma',
],
'Gamma' => [
'extends' => null,
'views-path' => 'Gamma',
'asset-path' => 'public/themes/shared/assets',
'views-path' => 'resources/views/themes/Gamma',
'asset-path' => 'public/assets/Gamma',
],
'Gentele' => [
'extends' => null,
'views-path' => 'Gentele',
'asset-path' => 'public/themes/shared/assets',
'views-path' => 'resources/views/themes/Gentele',
'asset-path' => 'public/assets',
],
'Omicron' => [
'extends' => null,
'views-path' => 'Omicron',
'asset-path' => 'public/themes/shared/assets',
'views-path' => 'resources/views/themes/Omicron',
'asset-path' => 'public/assets/Omicron',
],
'admin' => [
'extends' => null,
'views-path' => 'admin',
'asset-path' => 'public/themes/shared/assets',
'views-path' => 'resources/views/themes/admin',
'asset-path' => 'public/assets',
],
// Add your themes here. These settings will override theme.json settings defined for each theme
+1 -1
View File
@@ -2284,7 +2284,7 @@ table th[class*="span"],
*margin-right: .3em;
line-height: 14px;
vertical-align: text-top;
background-image: url("../../themes/shared/images/glyphicons-halflings.png");
background-image: url("../../assets/images/glyphicons-halflings.png");
background-position: 14px 14px;
background-repeat: no-repeat;
}
+1 -1
View File
@@ -75,7 +75,7 @@ input.btn, a.btn, button.btn {height:auto;width:auto}
.input-prepend input {margin-top:1px}
/* Icons */
.icon-sprite {background-image:url("../../themes/shared/images/glyphicons-halflings.png");background-repeat:no-repeat;display:inline-block;height:14px;line-height:14px;vertical-align:text-top;width:14px;padding-left:3px}
.icon-sprite {background-image:url("../../images/glyphicons-halflings.png");background-repeat:no-repeat;display:inline-block;height:14px;line-height:14px;vertical-align:text-top;width:14px;padding-left:3px}
/* Navbar */
.dropdown .caret {font-size:1px;height:2px;background:none;background-color:#292929;color:#292929}
+1 -1
View File
@@ -18,7 +18,7 @@ if (count($files) === 0) {
} else {
echo "<ul>\n";
foreach ($files as $f) {
echo '<li>'.htmlentities($f['name'], ENT_QUOTES).'&nbsp;'.($f['passworded'] === 1 ? '<img width="12" src="'.WWW_TOP.'/themes/shared/images/icons/lock.gif" />' : '')."</li>\n";
echo '<li>'.htmlentities($f['name'], ENT_QUOTES).'&nbsp;'.($f['passworded'] === 1 ? '<img width="12" src="'.WWW_TOP.'/assets/images/icons/lock.gif" />' : '')."</li>\n";
}
echo '</ul>';
}
@@ -14,7 +14,7 @@
<tr class="{cycle values=",alt"}">
<td width="20">{$smarty.foreach.iteration.index+1}</td>
<td>{$file.title|escape:'htmlall'}</td>
{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
{if $file.ext == "" || !is_file("$icon")}
{assign var="icon" value='file'}
{else}
@@ -18,7 +18,7 @@
<td width="30">{$smarty.foreach.iteration.index+1}</td>
<td>{$file.title|escape:'htmlall'}</td>
{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
{if $file.ext == "" || !is_file("$icon")}
{assign var="icon" value='file'}
{else}
@@ -15,7 +15,7 @@
<tr class="{cycle values=",alt"}">
<td width="20">{$smarty.foreach.iteration.index+1}</td>
<td>{$file.title|escape:'htmlall'}</td>
{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
{if $file.ext == "" || !is_file("$icon")}
{assign var="icon" value='file'}
{else}
@@ -14,7 +14,7 @@
<tr class="{cycle values=",alt"}">
<td width="20">{$smarty.foreach.iteration.index+1}</td>
<td>{$file.title|escape:'htmlall'}</td>
{assign var="icon" value='themes/shared/images/fileicons/'|cat:$file.ext|cat:".png"}
{assign var="icon" value='assets/images/fileicons/'|cat:$file.ext|cat:".png"}
{if $file.ext == "" || !is_file("$icon")}
{assign var="icon" value='file'}
{else}
@@ -10,7 +10,7 @@
<webMaster>{$site->email} ({$site->title|escape})</webMaster>
<category>{$site->meta_keywords}</category>
<image>
<url>{$serverroot}themes/shared/images/logo.png</url>
<url>{$serverroot}assets/images/logo.png</url>
<title>{$site->title|escape}</title>
<link>{$serverroot}</link>
<description>Visit {$site->title|escape} - {$site->strapline|escape}</description>
+1 -1
View File
@@ -10,7 +10,7 @@
<webMaster>{$site->email} ({$site->title|escape})</webMaster>
<category>{$site->meta_keywords}</category>
<image>
<url>{$serverroot}themes/shared/images/logo.png</url>
<url>{$serverroot}assets/images/logo.png</url>
<title>{$site->title|escape}</title>
<link>{$serverroot}</link>
<description>Visit {$site->title|escape} - {$site->strapline|escape}</description>