From ecfac4183ab31c2637c18e2967f2a8531b12004e Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Sun, 23 Sep 2018 10:15:08 -0400 Subject: [PATCH 1/4] Fixed robots.txt --- public/robots.txt | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/public/robots.txt b/public/robots.txt index c943d4e..2c5663e 100644 --- a/public/robots.txt +++ b/public/robots.txt @@ -1,14 +1,5 @@ User-agent: * Allow: / -Disallow: /*/*/_sources/*.txt -Disallow: /*/*/_sources/api/*.txt -Disallow: /*/*/_sources/reference/*.txt -Disallow: /report.html - User-agent: Yandex -Disallow: /*/*/_sources/*.txt -Disallow: /*/*/_sources/api/*.txt -Disallow: /*/*/_sources/reference/*.txt -Disallow: /report.html -Host: docs.phalconphp.com +Host: docs.zephir-lang.com From 201bc1ad31d381996eb5366c50593c059838d3d4 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 27 Nov 2018 13:07:08 -0500 Subject: [PATCH 2/4] Refactored config; Added safeguards for languages/versions; Allow all languages --- VERSIONS | 3 +- app/config/app.php | 61 ---------- app/config/config.php | 114 +++++++++++++++++++ app/config/error.php | 21 ---- app/config/highlight.php | 30 ----- app/config/providers.php | 36 ------ app/config/routes.php | 43 ------- app/controllers/BaseController.php | 12 +- app/controllers/DocsController.php | 12 +- app/library/Bootstrap.php | 4 +- app/library/Config/Factory.php | 132 ---------------------- app/providers/Config/ServiceProvider.php | 5 +- app/tasks/GetLanguagesTask.php | 37 +++--- boxfile.yml | 6 +- storage/{languages => crowdin}/.gitignore | 0 15 files changed, 162 insertions(+), 354 deletions(-) delete mode 100644 app/config/app.php create mode 100644 app/config/config.php delete mode 100644 app/config/error.php delete mode 100644 app/config/highlight.php delete mode 100644 app/config/providers.php delete mode 100644 app/config/routes.php delete mode 100644 app/library/Config/Factory.php rename storage/{languages => crowdin}/.gitignore (100%) diff --git a/VERSIONS b/VERSIONS index 688abaa..384fdb0 100644 --- a/VERSIONS +++ b/VERSIONS @@ -1 +1,2 @@ -0.10 \ No newline at end of file +0.10 +0.11 \ No newline at end of file diff --git a/app/config/app.php b/app/config/app.php deleted file mode 100644 index dd7dc09..0000000 --- a/app/config/app.php +++ /dev/null @@ -1,61 +0,0 @@ - $version, - 'versions' => $versions, - 'languages' => $languages, - 'timezone' => env('APP_TIMEZONE', 'UTC'), - 'debug' => env('APP_DEBUG'), - 'env' => env('APP_ENV'), - 'url' => env('APP_URL'), - 'name' => env('APP_NAME'), - 'project' => env('APP_PROJECT'), - 'description' => env('APP_DESCRIPTION'), - 'descriptionLong' => env('APP_DESCRIPTION_LONG', 'Official Zephir Documentation'), - 'keywords' => env('APP_KEYWORDS'), - 'repo' => env('APP_REPO'), - 'docs' => env('APP_DOCS'), - 'baseUri' => env('APP_BASE_URI'), - 'staticUrl' => env('APP_STATIC_URL'), - 'lang' => env('APP_LANG'), - 'supportEmail' => env('APP_SUPPORT_EMAIL'), - 'googleAnalytics' => env('GOOGLE_ANALYTICS'), - 'algoliaSearchKey' => env('ALGOLIA_SEARCH_KEY'), -]; diff --git a/app/config/config.php b/app/config/config.php new file mode 100644 index 0000000..a43322b --- /dev/null +++ b/app/config/config.php @@ -0,0 +1,114 @@ + [ + 'version' => $version, + 'versions' => $versions, + 'languages' => $languages, + 'timezone' => env('APP_TIMEZONE', 'UTC'), + 'debug' => env('APP_DEBUG'), + 'env' => env('APP_ENV'), + 'url' => env('APP_URL'), + 'name' => env('APP_NAME'), + 'project' => env('APP_PROJECT'), + 'description' => env('APP_DESCRIPTION'), + 'descriptionLong' => env('APP_DESCRIPTION_LONG', 'Official Zephir Documentation'), + 'keywords' => env('APP_KEYWORDS'), + 'repo' => env('APP_REPO'), + 'docs' => env('APP_DOCS'), + 'baseUri' => env('APP_BASE_URI'), + 'staticUrl' => env('APP_STATIC_URL'), + 'lang' => env('APP_LANG'), + 'supportEmail' => env('APP_SUPPORT_EMAIL'), + 'googleAnalytics' => env('GOOGLE_ANALYTICS'), + 'algoliaSearchKey' => env('ALGOLIA_SEARCH_KEY'), + ], + 'error' => [ + 'controller' => 'error', + 'action' => 'show500', + ], + 'highlight' => [ + 'version' => '9.11.0', + 'js' => [ + 'cpp', + 'css', + 'json', + 'php', + 'shell', + 'twig', + 'yaml', + 'zephir', + ], + ], + 'providers' => [ + // Application Service Providers + Docs\Providers\Config\ServiceProvider::class, + Docs\Providers\FileSystem\ServiceProvider::class, + Docs\Providers\UrlResolver\ServiceProvider::class, + Docs\Providers\Routing\ServiceProvider::class, + Docs\Providers\Logger\ServiceProvider::class, + Docs\Providers\ViewCache\ServiceProvider::class, + Docs\Providers\VoltTemplate\ServiceProvider::class, + Docs\Providers\View\ServiceProvider::class, + Docs\Providers\CacheData\ServiceProvider::class, + Docs\Providers\Markdown\ServiceProvider::class, + Docs\Providers\Assets\ServiceProvider::class, + Docs\Providers\Dispatcher\ServiceProvider::class, + Docs\Providers\Tags\ServiceProvider::class, + ], + 'routes' => [ + DocsController::class => [ + 'methods' => [ + 'get' => [ + '/' => 'redirectAction', + '/{l}' => 'mainAction', + '/{l}/{v}' => 'mainAction', + '/{l}/{v}/{p}' => 'mainAction', + ], + + // This is exactly the same execution as GET, but the Response has no body + 'head' => [ + '/' => 'redirectAction', + '/{l}' => 'mainAction', + '/{l}/{v}' => 'mainAction', + '/{l}/{v}/{p}' => 'mainAction', + ], + ], + ], + ], +]; diff --git a/app/config/error.php b/app/config/error.php deleted file mode 100644 index 57129ee..0000000 --- a/app/config/error.php +++ /dev/null @@ -1,21 +0,0 @@ - 'error', - 'action' => 'show500', -]; diff --git a/app/config/highlight.php b/app/config/highlight.php deleted file mode 100644 index b243f51..0000000 --- a/app/config/highlight.php +++ /dev/null @@ -1,30 +0,0 @@ - '9.11.0', - 'js' => [ - 'cpp', - 'css', - 'json', - 'php', - 'shell', - 'twig', - 'yaml', - 'zephir', - ], -]; diff --git a/app/config/providers.php b/app/config/providers.php deleted file mode 100644 index 1683bcb..0000000 --- a/app/config/providers.php +++ /dev/null @@ -1,36 +0,0 @@ - [ - 'methods' => [ - 'get' => [ - '/' => 'redirectAction', - '/{l:[a-z]{2}}' => 'mainAction', - '/{l:[a-z]{2}}/{v}' => 'mainAction', - '/{l:[a-z]{2}}/{v}/{p}' => 'mainAction', - '/{l:[a-z]{2}}/{v}/api/{p}' => 'mainAction', - '/sitemap.xml' => 'sitemapAction', - '/search' => 'searchAction', - ], - - // This is exactly the same execution as GET, but the Response has no body - 'head' => [ - '/' => 'redirectAction', - '/{l:[a-z]{2}}' => 'mainAction', - '/{l:[a-z]{2}}/{v}' => 'mainAction', - '/{l:[a-z]{2}}/{v}/{p}' => 'mainAction', - '/{l:[a-z]{2}}/{v}/api/{p}' => 'mainAction', - ], - ], - ], -]; diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php index ce55ba2..bf5c19b 100644 --- a/app/controllers/BaseController.php +++ b/app/controllers/BaseController.php @@ -17,6 +17,7 @@ namespace Docs\Controllers; +use function array_search; use Phalcon\Cache\BackendInterface; use Phalcon\Config; use Phalcon\Mvc\Controller as PhController; @@ -25,6 +26,7 @@ use function Docs\Functions\config; use function Docs\Functions\environment; use function file_exists; +use function var_dump; /** * Docs\Controllers\BaseController @@ -256,11 +258,12 @@ protected function getMenu($language, $version, $fileName): string */ protected function getVersion(string $stub = '', string $version = ''): string { - if (empty($version) || strtolower($version) === 'latest') { + $versions = config('app.versions')->toArray(); + if (empty($version) || + strtolower($version) === 'latest' || + false === array_search($version, $versions) + ) { $version = config('app.version', '9999'); - } else { - $version = filter_var($version, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION); - $version = $version ?? config('app.version', '9999'); } return "{$stub}{$version}"; @@ -276,7 +279,6 @@ protected function getVersion(string $stub = '', string $version = ''): string protected function getLanguage(string $language): string { $languages = $this->config->path('app.languages', []); - if (!isset($languages[$language])) { return 'en'; } diff --git a/app/controllers/DocsController.php b/app/controllers/DocsController.php index da9c4fa..ac40f5a 100644 --- a/app/controllers/DocsController.php +++ b/app/controllers/DocsController.php @@ -2,6 +2,7 @@ namespace Docs\Controllers; +use Docs\Cli\Tasks\GetLanguagesTask; use Docs\Exception\HttpException; use Phalcon\Http\ResponseInterface; use Phalcon\Text; @@ -25,17 +26,18 @@ class DocsController extends BaseController */ public function mainAction(string $language = null, string $version = null, string $page = ''): ResponseInterface { - if (empty($language)) { + $checkedLanguage = $this->getLanguage($language); + if ($checkedLanguage !== $language) { return $this->response->redirect(base_url($this->getVersion('/en/'))); } - $language = $this->getLanguage($language); - - if (true === empty($version) || 'latest' === $version) { + $checkVersion = $this->getVersion('', $version); + if ($checkVersion !== $version) { $suffix = ''; if (true !== empty($page)) { $suffix = '/' . $page; } + return $this->response->redirect( base_url( $this->getVersion('/' . $language . '/') . $suffix @@ -43,8 +45,6 @@ public function mainAction(string $language = null, string $version = null, stri ); } - $version = $this->getVersion('', $version); - $renderFile = 'index/article'; if (empty($page)) { $page = 'welcome'; diff --git a/app/library/Bootstrap.php b/app/library/Bootstrap.php index 01a16ca..60d4713 100644 --- a/app/library/Bootstrap.php +++ b/app/library/Bootstrap.php @@ -85,8 +85,8 @@ public function __construct($mode = 'normal') $this->createInternalApplication(); $this->container->setShared('app', $this->app); - /** @noinspection PhpIncludeInspection */ - $providers = require config_path('providers.php'); + $config = require config_path('config.php'); + $providers = $config['providers']; if (is_array($providers)) { $this->initializeServiceProviders($providers); } diff --git a/app/library/Config/Factory.php b/app/library/Config/Factory.php deleted file mode 100644 index 9ae450d..0000000 --- a/app/library/Config/Factory.php +++ /dev/null @@ -1,132 +0,0 @@ -get('filesystem', [$path]); - - $files = array_filter($filesystem->listContents(), function ($metadata) { - return isset($metadata['type']) && - $metadata['type'] == 'file' && - isset($metadata['extension']) && - $metadata['extension'] == 'php'; - }); - - return self::load($files); - } - - /** - * Load all configuration. - * - * @param array $files - * - * @return Config - */ - protected static function load(array $files) - { - $config = new Config(); - $merge = self::merge(); - - /** @var Filesystem $filesystem */ - $filesystem = Di::getDefault()->get('filesystem', [cache_path('config')]); - - if ($filesystem->has('cached.php') && !environment('development')) { - $merge($config, cache_path('config/cached.php')); - - return $config; - } - - foreach ($files as $file) { - $merge($config, config_path($file['path']), $file['filename']); - } - - if (environment('production') && !$filesystem->has('cached.php')) { - self::dump($filesystem, 'cached.php', $config->toArray()); - } - - return $config; - } - - protected static function merge() - { - return function (Config &$config, $path, $node = null) { - /** @noinspection PhpIncludeInspection */ - $toMerge = include($path); - - if (is_array($toMerge)) { - $toMerge = new Config($toMerge); - } - - if ($toMerge instanceof Config) { - if (!$node) { - return $config->merge($toMerge); - } - - if (!$config->offsetExists($node) || !$config->{$node} instanceof Config) { - $config->offsetSet($node, new Config()); - } - - return $config->get($node)->merge($toMerge); - } - - return null; - }; - } - - protected static function dump(Filesystem $filesystem, $path, array $data) - { - $header = <<put($path, $contents, $data); - } -} diff --git a/app/providers/Config/ServiceProvider.php b/app/providers/Config/ServiceProvider.php index 43bec9b..0ee8680 100644 --- a/app/providers/Config/ServiceProvider.php +++ b/app/providers/Config/ServiceProvider.php @@ -17,7 +17,7 @@ namespace Docs\Providers\Config; -use Docs\Config\Factory; +use Phalcon\Config; use Phalcon\Di\ServiceProviderInterface; use Phalcon\DiInterface; use function Docs\Functions\config_path; @@ -39,7 +39,8 @@ public function register(DiInterface $container) $container->setShared( 'config', function () { - return Factory::create(config_path()); + $config = require config_path('config.php'); + return new Config($config); } ); } diff --git a/app/tasks/GetLanguagesTask.php b/app/tasks/GetLanguagesTask.php index ace60a3..b807289 100644 --- a/app/tasks/GetLanguagesTask.php +++ b/app/tasks/GetLanguagesTask.php @@ -17,13 +17,14 @@ namespace Docs\Cli\Tasks; +use Phalcon\CLI\Task; +use function asort; use function Docs\Functions\app_path; use function Docs\Functions\env; use function file_put_contents; use function json_decode; -use Phalcon\CLI\Task; -use const PHP_EOL; use function sprintf; +use const PHP_EOL; /** * GetLanguagesTask @@ -36,7 +37,7 @@ class GetLanguagesTask extends Task public function mainAction() { echo 'Getting Languages from Crowdin...' . PHP_EOL; - $template = 'https://api.crowdin.com/api/project/zephir-documentation/status?key=%s&json'; + $template = 'https://api.crowdin.com/api/project/zephir-documentation/info?key=%s&json'; $url = sprintf($template, env('CROWDIN_API_KEY'), ''); $handle = curl_init(); @@ -45,7 +46,7 @@ public function mainAction() curl_setopt($handle, CURLOPT_POST, true); curl_setopt($handle, CURLOPT_POSTFIELDS, ['json' => 1]); - $fileName = app_path('/storage/languages/languages.json'); + $fileName = app_path('/storage/crowdin/crowdin.json'); $results = curl_exec($handle); $errorNumber = curl_errno($handle); $errorDescription = curl_error($handle); @@ -56,18 +57,28 @@ public function mainAction() echo $errorDescription . PHP_EOL; } - $languages = [ - 'en' => 'English', - ]; - $data = json_decode($results, true); - foreach ($data as $item) { - $code = $item['code']; - $text = $item['name']; - $languages[$code] = $text; + $crowdin = json_decode($results, true); + $languages = []; + foreach ($crowdin['languages'] as $language) { + $languages[$language['code']] = $language['name']; + } + + $versions = []; + foreach ($crowdin['files'] as $file) { + if ('branch' === $file['node_type']) { + $versions[] = $file['name']; + } } asort($languages); - file_put_contents($fileName, json_encode($languages)); + arsort($versions); + + $data = [ + 'languages' => $languages, + 'versions' => $versions, + ]; + + file_put_contents($fileName, json_encode($data)); echo 'Updated languages.' . PHP_EOL; } diff --git a/boxfile.yml b/boxfile.yml index 75c0c5a..19adfb6 100644 --- a/boxfile.yml +++ b/boxfile.yml @@ -31,7 +31,6 @@ run.config: - dom - json - mbstring - - phalcon - simplexml - tokenizer - xml @@ -43,6 +42,9 @@ run.config: - xdebug rm: - opcache + extra_packages: + - php71-phalcon-3.3.2 extra_steps: - - echo "alias phalcon=\'phalcon.php\'" >> /data/var/home/gonano/.bashrc + - echo 'extension=phalcon.so' >> "/data/etc/php/dev_php.ini" + - echo 'extension=phalcon.so' >> "/data/etc/php/prod_php.ini" - cp /app/storage/setup/xdebug.ini /data/etc/php.dev.d/xdebug.ini diff --git a/storage/languages/.gitignore b/storage/crowdin/.gitignore similarity index 100% rename from storage/languages/.gitignore rename to storage/crowdin/.gitignore From 9d8c85dc9d1d14b8bf95a42ee98204bae8b68fb3 Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 27 Nov 2018 17:43:32 -0500 Subject: [PATCH 3/4] Work on the languages --- app/tasks/GetLanguagesTask.php | 81 ++++++++++++++++++++++------- app/views/inc/header-languages.volt | 16 +++--- 2 files changed, 71 insertions(+), 26 deletions(-) diff --git a/app/tasks/GetLanguagesTask.php b/app/tasks/GetLanguagesTask.php index b807289..80ad56e 100644 --- a/app/tasks/GetLanguagesTask.php +++ b/app/tasks/GetLanguagesTask.php @@ -17,12 +17,15 @@ namespace Docs\Cli\Tasks; +use function array_multisort; use Phalcon\CLI\Task; use function asort; use function Docs\Functions\app_path; use function Docs\Functions\env; use function file_put_contents; use function json_decode; +use const SORT_ASC; +use const SORT_STRING; use function sprintf; use const PHP_EOL; @@ -36,32 +39,48 @@ class GetLanguagesTask extends Task */ public function mainAction() { + echo 'Getting Supported Languages from Crowdin...' . PHP_EOL; + $url = 'https://api.crowdin.com/api/supported-languages?json'; + $data = $this->makeCurl($url); + + $languageMap = []; + $supported = json_decode($data['results'], true); + foreach ($supported as $language) { + $languageMap[$language['crowdin_code']] = $language['locale']; + } + echo 'Getting Languages from Crowdin...' . PHP_EOL; $template = 'https://api.crowdin.com/api/project/zephir-documentation/info?key=%s&json'; $url = sprintf($template, env('CROWDIN_API_KEY'), ''); + $data = $this->makeCurl($url); + $fileName = app_path('/storage/crowdin/crowdin.json'); + $results = $data['results']; - $handle = curl_init(); - curl_setopt($handle, CURLOPT_URL, $url); - curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); - curl_setopt($handle, CURLOPT_POST, true); - curl_setopt($handle, CURLOPT_POSTFIELDS, ['json' => 1]); - - $fileName = app_path('/storage/crowdin/crowdin.json'); - $results = curl_exec($handle); - $errorNumber = curl_errno($handle); - $errorDescription = curl_error($handle); - curl_close($handle); - - if ($errorNumber > 0) { + if ($data['errorNumber'] > 0) { $results = '[]'; - echo $errorDescription . PHP_EOL; + echo $data['errorDescription'] . PHP_EOL; } $crowdin = json_decode($results, true); - $languages = []; + $languages = [ + 'en' => [ + 'name' => 'English', + 'code' => 'en', + ] + ]; foreach ($crowdin['languages'] as $language) { - $languages[$language['code']] = $language['name']; + $code = $languageMap[$language['code']] ?? 'en'; + + $languages[$code] = [ + 'name' => $language['name'], + 'code' => $language['code'], + ]; } + array_multisort(array_column($languages, 'name'), SORT_ASC, $languages); + + /** + * Now create the final array + */ $versions = []; foreach ($crowdin['files'] as $file) { @@ -69,17 +88,43 @@ public function mainAction() $versions[] = $file['name']; } } - - asort($languages); arsort($versions); $data = [ 'languages' => $languages, 'versions' => $versions, + 'map' => $languageMap, ]; file_put_contents($fileName, json_encode($data)); echo 'Updated languages.' . PHP_EOL; } + + /** + * Sends a CURL request + * + * @param string $url + * + * @return array + */ + private function makeCurl(string $url): array + { + $handle = curl_init(); + curl_setopt($handle, CURLOPT_URL, $url); + curl_setopt($handle, CURLOPT_RETURNTRANSFER, true); + curl_setopt($handle, CURLOPT_POST, true); + curl_setopt($handle, CURLOPT_POSTFIELDS, ['json' => 1]); + + $results = curl_exec($handle); + $errorNumber = curl_errno($handle); + $errorDescription = curl_error($handle); + curl_close($handle); + + return [ + 'results' => $results, + 'errorNumber' => $errorNumber, + 'errorDescription' => $errorDescription, + ]; + } } diff --git a/app/views/inc/header-languages.volt b/app/views/inc/header-languages.volt index 7c23733..159dee5 100644 --- a/app/views/inc/header-languages.volt +++ b/app/views/inc/header-languages.volt @@ -3,6 +3,7 @@ {% else %} {% set suffix = '' %} {% endif %} + {% set languages = config.path('app.languages', []) %}
  • - {% set languages = config.path('app.languages', []) %}
    {#{% for item in config.path('app.versions', []) %}#} - {% for item, label in languages %} - + {% for key, data in languages %} + - {{ label }} + src="https://d2srrzh48sp2nh.cloudfront.net/31cd209e/images/flags/{{ data['code'] }}.png"> + {{ data['name'] }} {% endfor %}
    From 90e35feca469246ece78c138a93cb791c12d993c Mon Sep 17 00:00:00 2001 From: Nikolaos Dimopoulos Date: Tue, 27 Nov 2018 18:10:01 -0500 Subject: [PATCH 4/4] Asset tag introduction and reformatting files --- app/config/config.php | 31 ++--- app/controllers/BaseController.php | 45 ++++--- app/controllers/DocsController.php | 16 ++- app/library/Bootstrap.php | 9 +- .../Exception/Handler/ErrorPageHandler.php | 1 - .../Exception/Handler/LoggerHandler.php | 4 +- app/providers/Assets/ServiceProvider.php | 6 +- app/providers/CacheData/ServiceProvider.php | 3 +- app/providers/Logger/ServiceProvider.php | 3 +- app/providers/ViewCache/ServiceProvider.php | 3 +- .../VoltTemplate/ServiceProvider.php | 3 +- app/tasks/ClearCacheTask.php | 3 +- app/tasks/GenerateSitemapTask.php | 1 - app/tasks/GetLanguagesTask.php | 9 +- app/tasks/UpdateSearchTask.php | 23 ++-- app/views/error/show404.volt | 6 +- app/views/error/show500.volt | 3 +- app/views/inc/google.volt | 5 +- app/views/inc/header-languages.volt | 47 ++++---- app/views/inc/header-versions.volt | 33 +++--- app/views/inc/header.volt | 3 +- app/views/inc/search.volt | 58 ++++----- app/views/templates/base.volt | 110 ++++++++++-------- app/views/toCheck/inc/advantages.volt | 9 +- app/views/toCheck/inc/footer.volt | 21 ++-- app/views/toCheck/inc/head-menu.volt | 24 ++-- app/views/toCheck/inc/header-inner.volt | 3 +- app/views/toCheck/inc/header.volt | 6 +- app/views/toCheck/inc/language_selector.volt | 3 +- .../toCheck/inc/language_selector_mobile.volt | 3 +- app/views/toCheck/inc/support-forum-form.volt | 3 +- app/views/toCheck/inc/support.volt | 13 ++- app/views/toCheck/inc/topics-sidebar.volt | 11 +- app/views/toCheck/inc/topics.volt | 3 +- app/views/toCheck/inc/version_selector.volt | 5 +- .../toCheck/inc/version_selector_mobile.volt | 3 +- app/views/toCheck/include/footer.volt | 54 ++++++--- app/views/toCheck/include/icons.volt | 45 ++++--- app/views/toCheck/include/ie-support.volt | 3 +- .../toCheck/include/language_selector.volt | 3 +- app/views/toCheck/include/meta.volt | 3 +- app/views/toCheck/include/nav.volt | 11 +- app/views/toCheck/include/noindex-meta.volt | 3 +- deploy | 7 ++ 44 files changed, 381 insertions(+), 280 deletions(-) diff --git a/app/config/config.php b/app/config/config.php index a43322b..58c1d5e 100644 --- a/app/config/config.php +++ b/app/config/config.php @@ -15,16 +15,16 @@ +------------------------------------------------------------------------+ */ +use Docs\Controllers\DocsController; use function Docs\Functions\app_path; use function Docs\Functions\env; -use Docs\Controllers\DocsController; /** * Get the versions and languages */ -$version = '0.1'; -$languages = []; -$versions = []; +$version = '0.1'; +$languages = []; +$versions = []; $crowdinFile = app_path('/storage/crowdin/crowdin.json'); if (true === file_exists($crowdinFile)) { $crowdin = file_get_contents($crowdinFile); @@ -55,6 +55,7 @@ 'staticUrl' => env('APP_STATIC_URL'), 'lang' => env('APP_LANG'), 'supportEmail' => env('APP_SUPPORT_EMAIL'), + 'assetTag' => 'development' !== env('APP_ENV') ? env('ASSET_TAG') : time(), 'googleAnalytics' => env('GOOGLE_ANALYTICS'), 'algoliaSearchKey' => env('ALGOLIA_SEARCH_KEY'), ], @@ -64,16 +65,16 @@ ], 'highlight' => [ 'version' => '9.11.0', - 'js' => [ - 'cpp', - 'css', - 'json', - 'php', - 'shell', - 'twig', - 'yaml', - 'zephir', - ], + 'js' => [ + 'cpp', + 'css', + 'json', + 'php', + 'shell', + 'twig', + 'yaml', + 'zephir', + ], ], 'providers' => [ // Application Service Providers @@ -91,7 +92,7 @@ Docs\Providers\Dispatcher\ServiceProvider::class, Docs\Providers\Tags\ServiceProvider::class, ], - 'routes' => [ + 'routes' => [ DocsController::class => [ 'methods' => [ 'get' => [ diff --git a/app/controllers/BaseController.php b/app/controllers/BaseController.php index bf5c19b..67bcd7d 100644 --- a/app/controllers/BaseController.php +++ b/app/controllers/BaseController.php @@ -17,16 +17,15 @@ namespace Docs\Controllers; -use function array_search; use Phalcon\Cache\BackendInterface; use Phalcon\Config; use Phalcon\Mvc\Controller as PhController; use Phalcon\Mvc\View\Simple; +use function array_search; use function Docs\Functions\app_path; use function Docs\Functions\config; use function Docs\Functions\environment; use function file_exists; -use function var_dump; /** * Docs\Controllers\BaseController @@ -70,7 +69,7 @@ public function getSidebar($language, $version): array if (true === file_exists($pageName)) { $data = file_get_contents($pageName); - } elseif (true === file_exists($apiFileName)) { + } else if (true === file_exists($apiFileName)) { $data = file_get_contents($apiFileName); } else { // The article does not exist @@ -179,6 +178,25 @@ protected function getSeoTitle(string $language, string $version, string $page): return $title; } + /** + * @param string $language + * @param string $version + * @param string $fileName + * + * @return string + */ + protected function getMenu($language, $version, $fileName): string + { + $document = $this->getDocument($language, $version, $fileName); + $document = str_replace( + '
  • ', + '
  • ', + $document + ); + + return ltrim(rtrim($document, ''), '
      '); + } + /** * @param string $language * @param string $version @@ -194,7 +212,7 @@ protected function getDocument($language, $version, $fileName): string return $this->cacheData->get($key); } - $pageName = app_path( + $pageName = app_path( sprintf( 'docs/%s/%s/%s.md', $version, @@ -229,25 +247,6 @@ protected function getDocument($language, $version, $fileName): string return $data; } - /** - * @param string $language - * @param string $version - * @param string $fileName - * - * @return string - */ - protected function getMenu($language, $version, $fileName): string - { - $document = $this->getDocument($language, $version, $fileName); - $document = str_replace( - '
    • ', - '
    • ', - $document - ); - - return ltrim(rtrim($document, '
    '), '
      '); - } - /** * Returns the current version string with its prefix if applicable * diff --git a/app/controllers/DocsController.php b/app/controllers/DocsController.php index ac40f5a..081ab8b 100644 --- a/app/controllers/DocsController.php +++ b/app/controllers/DocsController.php @@ -2,12 +2,10 @@ namespace Docs\Controllers; -use Docs\Cli\Tasks\GetLanguagesTask; use Docs\Exception\HttpException; use Phalcon\Http\ResponseInterface; use Phalcon\Text; use function Docs\Functions\base_url; -use function str_replace; /** * Docs\Controllers\DocsController @@ -63,13 +61,13 @@ public function mainAction(string $language = null, string $version = null, stri $contents = $this->viewSimple->render( $renderFile, [ - 'page' => $page, - 'language' => $language, - 'version' => $version, - 'sidebar' => $this->getMenu($language, $version, 'sidebar'), - 'article' => $article, - 'menu' => $this->getMenu($language, $version, $page . '-menu'), - 'canonical' => $canonical, + 'page' => $page, + 'language' => $language, + 'version' => $version, + 'sidebar' => $this->getMenu($language, $version, 'sidebar'), + 'article' => $article, + 'menu' => $this->getMenu($language, $version, $page . '-menu'), + 'canonical' => $canonical, ] ); $this->response->setContent($contents); diff --git a/app/library/Bootstrap.php b/app/library/Bootstrap.php index 60d4713..ee3d6ad 100644 --- a/app/library/Bootstrap.php +++ b/app/library/Bootstrap.php @@ -97,7 +97,8 @@ public function __construct($mode = 'normal') /** * Initialize the Service Provider. * - * Usually the Service Provider register a service in the Dependency Injector Container. + * Usually the Service Provider register a service in the Dependency + * Injector Container. * * @param ServiceProviderInterface $serviceProvider * @@ -117,7 +118,8 @@ protected function initializeServiceProvider(ServiceProviderInterface $servicePr * If failed the `development` will be used. * * After getting `APP_ENV` variable we set the Bootstrap::$environment - * and the `APPLICATION_ENV` constant which used in other Phalcon related projects eg Incubator. + * and the `APPLICATION_ENV` constant which used in other Phalcon related + * projects eg Incubator. */ protected function setupEnvironment() { @@ -228,7 +230,8 @@ public function getApplication() } /** - * Gets current application environment: production, staging, development, testing, etc. + * Gets current application environment: production, staging, development, + * testing, etc. * * @return string */ diff --git a/app/library/Exception/Handler/ErrorPageHandler.php b/app/library/Exception/Handler/ErrorPageHandler.php index 8469da4..d26abb8 100644 --- a/app/library/Exception/Handler/ErrorPageHandler.php +++ b/app/library/Exception/Handler/ErrorPageHandler.php @@ -18,7 +18,6 @@ namespace Docs\Exception\Handler; use Whoops\Handler\Handler; -use function Docs\Functions\config; use function Docs\Functions\container; /** diff --git a/app/library/Exception/Handler/LoggerHandler.php b/app/library/Exception/Handler/LoggerHandler.php index 214e4e4..47c07cc 100644 --- a/app/library/Exception/Handler/LoggerHandler.php +++ b/app/library/Exception/Handler/LoggerHandler.php @@ -136,7 +136,7 @@ public function addTraceToOutput($addTraceToOutput = null) return $this->addTraceToOutput; } - $this->addTraceToOutput = (bool)$addTraceToOutput; + $this->addTraceToOutput = (bool) $addTraceToOutput; return $this; } @@ -193,7 +193,7 @@ public function addTraceFunctionArgsToOutput($args = null) } if (!is_integer($args)) { - $this->addTraceFunctionArgsToOutput = (bool)$args; + $this->addTraceFunctionArgsToOutput = (bool) $args; } else { $this->addTraceFunctionArgsToOutput = $args; } diff --git a/app/providers/Assets/ServiceProvider.php b/app/providers/Assets/ServiceProvider.php index d1a3337..299f6b9 100644 --- a/app/providers/Assets/ServiceProvider.php +++ b/app/providers/Assets/ServiceProvider.php @@ -83,13 +83,15 @@ function ($lang) { // TODO(o2) // ->addCss($cssCdn, false) ->addCss(assets_uri('js/highlight/styles/googlecode.css', $version)) - ->addCss(assets_uri('css/style.css', $version)); + ->addCss(assets_uri('css/style.css', $version)) + ; $assets ->collection('footer_js') // // TODO(o2) // ->addJs($jsCdn, false); ->addJs(assets_uri('js/main.min.js', $version)) - ->addJs(assets_uri('js/highlight/highlight.pack.js', $version)); + ->addJs(assets_uri('js/highlight/highlight.pack.js', $version)) + ; } } diff --git a/app/providers/CacheData/ServiceProvider.php b/app/providers/CacheData/ServiceProvider.php index d1eac2e..b5afb48 100644 --- a/app/providers/CacheData/ServiceProvider.php +++ b/app/providers/CacheData/ServiceProvider.php @@ -17,12 +17,11 @@ namespace Docs\Providers\CacheData; -use function Docs\Functions\env; use Phalcon\Cache\Frontend\Data; use Phalcon\Di\ServiceProviderInterface; use Phalcon\DiInterface; use function Docs\Functions\app_path; -use function Docs\Functions\config; +use function Docs\Functions\env; /** * Docs\Providers\CacheData\ServiceProvider diff --git a/app/providers/Logger/ServiceProvider.php b/app/providers/Logger/ServiceProvider.php index 78db5a6..362392a 100644 --- a/app/providers/Logger/ServiceProvider.php +++ b/app/providers/Logger/ServiceProvider.php @@ -17,14 +17,13 @@ namespace Docs\Providers\Logger; -use function Docs\Functions\env; use Phalcon\Di\ServiceProviderInterface; use Phalcon\DiInterface; use Phalcon\Logger; use Phalcon\Logger\Adapter\File; use Phalcon\Logger\Formatter\Line; use function Docs\Functions\app_path; -use function Docs\Functions\config; +use function Docs\Functions\env; /** * Docs\Providers\Logger\ServiceProvider diff --git a/app/providers/ViewCache/ServiceProvider.php b/app/providers/ViewCache/ServiceProvider.php index a8f8175..378d47c 100644 --- a/app/providers/ViewCache/ServiceProvider.php +++ b/app/providers/ViewCache/ServiceProvider.php @@ -21,7 +21,6 @@ use Phalcon\Di\ServiceProviderInterface; use Phalcon\DiInterface; use function Docs\Functions\app_path; -use function Docs\Functions\config; /** * Docs\Providers\ViewCache\ServiceProvider @@ -46,7 +45,7 @@ public function register(DiInterface $container) function () { $lifetime = env('CACHE_LIFETIME', 3600); $driver = env('VIEW_CACHE_DRIVER', 'file'); - $adapter = '\Phalcon\Cache\Backend\\' . ucfirst($driver); + $adapter = '\Phalcon\Cache\Backend\\' . ucfirst($driver); return new $adapter( new Output(['lifetime' => $lifetime]), diff --git a/app/providers/VoltTemplate/ServiceProvider.php b/app/providers/VoltTemplate/ServiceProvider.php index 030c57a..1f02c6c 100644 --- a/app/providers/VoltTemplate/ServiceProvider.php +++ b/app/providers/VoltTemplate/ServiceProvider.php @@ -66,7 +66,8 @@ public function register(DiInterface $container) $volt->getCompiler() - ->addExtension(new VoltFunctions()); + ->addExtension(new VoltFunctions()) + ; return $volt; }; diff --git a/app/tasks/ClearCacheTask.php b/app/tasks/ClearCacheTask.php index 7dea05c..fce3ac1 100644 --- a/app/tasks/ClearCacheTask.php +++ b/app/tasks/ClearCacheTask.php @@ -61,7 +61,8 @@ private function clearFolder(string $message, string $folder) $bar = new CliProgressBar($steps); $bar ->setColorToGreen() - ->display(); + ->display() + ; foreach ($iterator as $file) { if (true !== $file->isDir() && ('php' === $file->getExtension() || 'cache' === $file->getExtension()) diff --git a/app/tasks/GenerateSitemapTask.php b/app/tasks/GenerateSitemapTask.php index 23ff4a8..ad2395c 100644 --- a/app/tasks/GenerateSitemapTask.php +++ b/app/tasks/GenerateSitemapTask.php @@ -9,7 +9,6 @@ use SplFileInfo; use function Docs\Functions\app_path; use function file_put_contents; -use function implode; use function substr; /** diff --git a/app/tasks/GetLanguagesTask.php b/app/tasks/GetLanguagesTask.php index 35b8199..2b1ce5b 100644 --- a/app/tasks/GetLanguagesTask.php +++ b/app/tasks/GetLanguagesTask.php @@ -17,18 +17,15 @@ namespace Docs\Cli\Tasks; -use function array_multisort; use Phalcon\CLI\Task; -use function asort; +use function array_multisort; use function Docs\Functions\app_path; use function Docs\Functions\env; use function file_put_contents; use function json_decode; -use const SORT_ASC; -use const SORT_STRING; use function sprintf; use const PHP_EOL; -use function sprintf; +use const SORT_ASC; /** * GetLanguagesTask @@ -67,7 +64,7 @@ public function mainAction() 'en' => [ 'name' => 'English', 'code' => 'en', - ] + ], ]; foreach ($crowdin['languages'] as $language) { $code = $languageMap[$language['code']] ?? 'en'; diff --git a/app/tasks/UpdateSearchTask.php b/app/tasks/UpdateSearchTask.php index 525fb41..9926221 100644 --- a/app/tasks/UpdateSearchTask.php +++ b/app/tasks/UpdateSearchTask.php @@ -17,16 +17,15 @@ namespace Docs\Cli\Tasks; -use \AlgoliaSearch\Client; -use function Docs\Functions\app_path; -use function Docs\Functions\env; +use AlgoliaSearch\Client; +use FilesystemIterator; use Phalcon\CLI\Task; use RecursiveDirectoryIterator; -use FilesystemIterator; use RecursiveIteratorIterator; use SplFileInfo; +use function Docs\Functions\app_path; +use function Docs\Functions\env; use function sprintf; -use function var_dump; /** @@ -45,8 +44,8 @@ public function mainAction() $applicationId = env('ALGOLIA_APPLICATION_ID', ''); $applicationKey = env('ALGOLIA_APPLICATION_KEY', ''); - $client = new Client($applicationId, $applicationKey); - $index = $client->initIndex('docs-index'); + $client = new Client($applicationId, $applicationKey); + $index = $client->initIndex('docs-index'); $elements = []; $path = app_path('docs/'); $dirIterator = new RecursiveDirectoryIterator($path, FilesystemIterator::SKIP_DOTS); @@ -64,7 +63,7 @@ public function mainAction() $language = $parts[1]; $version = $parts[0]; if ('old' !== $language) { - $pageName = $docsPath . '/' . $file->getFilename(); + $pageName = $docsPath . '/' . $file->getFilename(); if (true === file_exists($pageName)) { $data = file_get_contents($pageName); @@ -86,10 +85,10 @@ public function mainAction() $data = $this->parsedown->text($data); $elements[] = [ - 'version' => $version, - 'language' => $language, - 'filename' => str_replace('.md', '', $file->getFilename()), - 'contents' => $data, + 'version' => $version, + 'language' => $language, + 'filename' => str_replace('.md', '', $file->getFilename()), + 'contents' => $data, ]; } } diff --git a/app/views/error/show404.volt b/app/views/error/show404.volt index e7d9e2c..c0bb351 100644 --- a/app/views/error/show404.volt +++ b/app/views/error/show404.volt @@ -2,12 +2,14 @@ {%- block content -%}

      - Oops! It seems you made a mistake by typing the wrong address or something like that. + Oops! It seems you made a mistake by typing the wrong address or + something like that. In any case, please let us know: {{ support }}

      - Back to main page + Back to main + page

      {{- article -}} diff --git a/app/views/error/show500.volt b/app/views/error/show500.volt index 1117090..742f68d 100644 --- a/app/views/error/show500.volt +++ b/app/views/error/show500.volt @@ -2,7 +2,8 @@ {%- block content -%}

      - Sorry for the inconvenience but something is not quite right at the moment. + Sorry for the inconvenience but something is not quite right at the + moment. We hope to solve it shortly. If you need to you can always contact us at {{ support }}, otherwise please check back in a few minutes! diff --git a/app/views/inc/google.volt b/app/views/inc/google.volt index 9872966..2d86cdf 100644 --- a/app/views/inc/google.volt +++ b/app/views/inc/google.volt @@ -1,11 +1,14 @@ {%- if (not config.path('app.googleAnalytics', '') is empty) -%} - + diff --git a/app/views/inc/header-languages.volt b/app/views/inc/header-languages.volt index 159dee5..c89f85a 100644 --- a/app/views/inc/header-languages.volt +++ b/app/views/inc/header-languages.volt @@ -1,29 +1,30 @@ {% if page is defined %} -{% set suffix = '/' ~ page %} + {% set suffix = '/' ~ page %} {% else %} -{% set suffix = '' %} + {% set suffix = '' %} {% endif %} {% set languages = config.path('app.languages', []) %} -

    • -
    • +
      + {#{% for item in config.path('app.versions', []) %}#} + {% for key, data in languages %} + - {{ languages[language]['name'] }} + src="https://d2srrzh48sp2nh.cloudfront.net/31cd209e/images/flags/{{ data['code'] }}.png"> + {{ data['name'] }} -
      - {#{% for item in config.path('app.versions', []) %}#} - {% for key, data in languages %} - - - {{ data['name'] }} - - {% endfor %} -
      -
      • + {% endfor %} + + diff --git a/app/views/inc/header-versions.volt b/app/views/inc/header-versions.volt index 605f01d..a5b0d5c 100644 --- a/app/views/inc/header-versions.volt +++ b/app/views/inc/header-versions.volt @@ -1,16 +1,17 @@ -
    • - -
      - {% for item in config.path('app.versions', []) %} - {{ item }} - {% endfor %} -
      -
      • +
    • + +
      + {% for item in config.path('app.versions', []) %} + {{ item }} + {% endfor %} +
      +
      • diff --git a/app/views/inc/header.volt b/app/views/inc/header.volt index d562516..22c0e7a 100644 --- a/app/views/inc/header.volt +++ b/app/views/inc/header.volt @@ -1,4 +1,5 @@ -
      +
      diff --git a/app/views/inc/search.volt b/app/views/inc/search.volt index e25ccdb..e2663ef 100644 --- a/app/views/inc/search.volt +++ b/app/views/inc/search.volt @@ -1,29 +1,29 @@ -
      - - -
      +
      + + +
      diff --git a/app/views/templates/base.volt b/app/views/templates/base.volt index 143933c..3cd91b0 100644 --- a/app/views/templates/base.volt +++ b/app/views/templates/base.volt @@ -9,27 +9,34 @@ - - + + - - + - - + + - + - Zephir Language — Zephir {{ config.path('app.version') }} documentation + Zephir Language — Zephir {{ config.path('app.version') }} + documentation @@ -43,54 +50,57 @@ {%- include 'inc/google.volt' -%} - {%- include 'inc/header.volt' -%} +{%- include 'inc/header.volt' -%} -
      -
      -
      - {% include 'inc/search.volt' %} +
      +
      +
      + {% include 'inc/search.volt' %} - -
      - -
      -
        - {{ menu }} -
      -
      + +
      -
      - {% block content %} - {% endblock %} -
      +
      +
        + {{ menu }} +
      + +
      + {% block content %} + {% endblock %} +
      +
      -       +
      +
      + Zephir Language is an open source project licensed under + MIT license. + © Copyright 2013-present, Zephir Team. +
      +
      - - - - {%- include 'inc/algolia.volt' -%} - - + + + +{%- include 'inc/algolia.volt' -%} + + diff --git a/app/views/toCheck/inc/advantages.volt b/app/views/toCheck/inc/advantages.volt index 0eeeea5..5367d38 100644 --- a/app/views/toCheck/inc/advantages.volt +++ b/app/views/toCheck/inc/advantages.volt @@ -6,7 +6,8 @@

      What is Phalcon

      - Unlike traditional frameworks, Phalcon written as a C-extension and optimized for high performance. + Unlike traditional frameworks, Phalcon written as a C-extension + and optimized for high performance.

      @@ -17,7 +18,8 @@

      API Documentation

      - An incredibly API has been created for you to use as reference when developing Phalcon based solutions + An incredibly API has been created for you to use as reference + when developing Phalcon based solutions

      @@ -28,7 +30,8 @@

      Meet the Incubator

      - Our community is developing amazing extra features for Phalcon every day via Incubator. + Our community is developing amazing extra features for Phalcon + every day via Incubator.

      diff --git a/app/views/toCheck/inc/footer.volt b/app/views/toCheck/inc/footer.volt index 8cdc67a..d6c4b48 100644 --- a/app/views/toCheck/inc/footer.volt +++ b/app/views/toCheck/inc/footer.volt @@ -4,28 +4,35 @@
      - logo + logo - + About - + Blog - + Support Us - + Download - + License New BSD
      - Development by logo o2 + Development by logo o2
      diff --git a/app/views/toCheck/inc/head-menu.volt b/app/views/toCheck/inc/head-menu.volt index 7eec92b..1c472d1 100644 --- a/app/views/toCheck/inc/head-menu.volt +++ b/app/views/toCheck/inc/head-menu.volt @@ -23,26 +23,33 @@
      - + Forum - + Blog - + Resources
      - + Facebook - + Twitter - + Google+ - + Gab.ai
      @@ -79,7 +86,8 @@ {%- include "inc/version_selector_mobile.volt" -%}
      -
      +
      Community
      diff --git a/app/views/toCheck/inc/header-inner.volt b/app/views/toCheck/inc/header-inner.volt index 27106f0..9f829d9 100644 --- a/app/views/toCheck/inc/header-inner.volt +++ b/app/views/toCheck/inc/header-inner.volt @@ -8,7 +8,8 @@
      {% include 'inc/gse-inner.volt' %}
      - + GitHub Project
      diff --git a/app/views/toCheck/inc/header.volt b/app/views/toCheck/inc/header.volt index 581fd96..972fc59 100644 --- a/app/views/toCheck/inc/header.volt +++ b/app/views/toCheck/inc/header.volt @@ -4,7 +4,8 @@
      {% include 'inc/head-menu.volt' %}
      -
      +

      Phalcon is feature rich, loosely coupled, optimized for high @@ -17,7 +18,8 @@
      {% include 'inc/gse-inner.volt' %}
      -       + GitHub Project
      diff --git a/app/views/toCheck/inc/language_selector.volt b/app/views/toCheck/inc/language_selector.volt index 3748226..aa5f504 100644 --- a/app/views/toCheck/inc/language_selector.volt +++ b/app/views/toCheck/inc/language_selector.volt @@ -5,7 +5,8 @@
      {% for code, name in config.path('languages') %} - + {{ name }} diff --git a/app/views/toCheck/inc/language_selector_mobile.volt b/app/views/toCheck/inc/language_selector_mobile.volt index 0597bb9..92e1ef1 100644 --- a/app/views/toCheck/inc/language_selector_mobile.volt +++ b/app/views/toCheck/inc/language_selector_mobile.volt @@ -1,4 +1,5 @@ -
      +
      diff --git a/app/views/toCheck/inc/support-forum-form.volt b/app/views/toCheck/inc/support-forum-form.volt index a8c845a..b784c1d 100644 --- a/app/views/toCheck/inc/support-forum-form.volt +++ b/app/views/toCheck/inc/support-forum-form.volt @@ -9,7 +9,8 @@ Couldn't find what your are looking for? Why not join out support forums and let us help you.

      - + Support Forums
      diff --git a/app/views/toCheck/inc/support.volt b/app/views/toCheck/inc/support.volt index c386832..2e29601 100644 --- a/app/views/toCheck/inc/support.volt +++ b/app/views/toCheck/inc/support.volt @@ -3,17 +3,22 @@
      - +

      Get Support From Real People

      -

      When you are stuck in something don’t waste your time just let us know we are here to help you

      +

      When you are stuck in something don’t waste your time just + let us know we are here to help you

      {%- for title, social in config.path('social', []) -%}
      - - {{ title }} + + {{ title }}
      {%- endfor -%} diff --git a/app/views/toCheck/inc/topics-sidebar.volt b/app/views/toCheck/inc/topics-sidebar.volt index 70f8f53..56f3d76 100644 --- a/app/views/toCheck/inc/topics-sidebar.volt +++ b/app/views/toCheck/inc/topics-sidebar.volt @@ -1,8 +1,10 @@
      {% for topic in topicsArray %} -
      4 %}style="display:none;"{% endif %}> -
      +
      4 %}style="display:none;"{% endif %}> +
      {{ topic["name"] }}
        @@ -16,7 +18,8 @@
      {% endfor %} - + Explore All Topics
      diff --git a/app/views/toCheck/inc/topics.volt b/app/views/toCheck/inc/topics.volt index 47e1d8c..6a0eef7 100644 --- a/app/views/toCheck/inc/topics.volt +++ b/app/views/toCheck/inc/topics.volt @@ -34,7 +34,8 @@ {% endfor %}
      - + Explore All Topics
      diff --git a/app/views/toCheck/inc/version_selector.volt b/app/views/toCheck/inc/version_selector.volt index e444af8..013cc95 100644 --- a/app/views/toCheck/inc/version_selector.volt +++ b/app/views/toCheck/inc/version_selector.volt @@ -5,9 +5,10 @@
      {% for versionItem in config.path('versions') %} - + {{ versionItem }} {% endfor %}
      - \ No newline at end of file + diff --git a/app/views/toCheck/inc/version_selector_mobile.volt b/app/views/toCheck/inc/version_selector_mobile.volt index 8661c99..70a5294 100644 --- a/app/views/toCheck/inc/version_selector_mobile.volt +++ b/app/views/toCheck/inc/version_selector_mobile.volt @@ -1,4 +1,5 @@ -
      +
      Version {{ version }}
      diff --git a/app/views/toCheck/include/footer.volt b/app/views/toCheck/include/footer.volt index 235f1d0..e6c3764 100644 --- a/app/views/toCheck/include/footer.volt +++ b/app/views/toCheck/include/footer.volt @@ -4,39 +4,61 @@

      Download

      Community

      About

      diff --git a/app/views/toCheck/include/icons.volt b/app/views/toCheck/include/icons.volt index 1a5b9af..a7f3e3e 100644 --- a/app/views/toCheck/include/icons.volt +++ b/app/views/toCheck/include/icons.volt @@ -1,16 +1,26 @@ - - - - - + + + + + - + - - - - + + + + - - - - - + + + + + diff --git a/app/views/toCheck/include/ie-support.volt b/app/views/toCheck/include/ie-support.volt index 2b33225..b14e41e 100644 --- a/app/views/toCheck/include/ie-support.volt +++ b/app/views/toCheck/include/ie-support.volt @@ -1,5 +1,6 @@ diff --git a/app/views/toCheck/include/language_selector.volt b/app/views/toCheck/include/language_selector.volt index 47e4c31..8ea5636 100644 --- a/app/views/toCheck/include/language_selector.volt +++ b/app/views/toCheck/include/language_selector.volt @@ -1,7 +1,8 @@