Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Restructured themes

  • Loading branch information...
commit 5b7cbf43d86ce11b6c564ccf9ad37281b239117d 1 parent b1fd22c
Drak drak authored
Showing with 97 additions and 76 deletions.
  1. +38 −0 UPGRADING-1.4.md
  2. +1 −16 src/legacy/Zikula/View.php
  3. +7 −9 src/legacy/Zikula/View/Theme.php
  4. +8 −8 src/util/BlockUtil.php
  5. +3 −5 src/util/ThemeUtil.php
  6. 0  web/config/templates/index.html
  7. +24 −22 web/system/Theme/Api/AdminApi.php
  8. +5 −5 web/system/Theme/Api/UserApi.php
  9. +3 −3 web/system/Theme/Controller/AdminController.php
  10. +4 −4 web/system/Theme/Controller/UserController.php
  11. 0  web/themes/Andreas08/{templates → Resources}/config/admin.ini
  12. 0  web/themes/Andreas08/{templates → Resources}/config/home.ini
  13. 0  web/themes/Andreas08/{templates → Resources}/config/master.ini
  14. +2 −2 web/themes/Andreas08/{templates → Resources/config}/overrides.yml
  15. 0  web/themes/Andreas08/{templates → Resources}/config/pageconfigurations.ini
  16. 0  web/themes/Andreas08/{templates → Resources}/config/themepalettes.ini
  17. 0  web/themes/Andreas08/{templates → Resources}/config/themevariables.ini
  18. 0  web/themes/Andreas08/{style → Resources/public/css}/Blocks/menutree/horizontal.css
  19. 0  web/themes/Andreas08/{style → Resources/public/css}/fluid960gs/960.css
  20. 0  web/themes/Andreas08/{style → Resources/public/css}/fluid960gs/grid.css
  21. 0  web/themes/Andreas08/{style → Resources/public/css}/fluid960gs/ie.css
  22. 0  web/themes/Andreas08/{style → Resources/public/css}/fluid960gs/ie6.css
  23. 0  web/themes/Andreas08/{style → Resources/public/css}/fluid960gs/reset.css
  24. 0  web/themes/Andreas08/{style → Resources/public/css}/style.css
  25. 0  web/themes/Andreas08/{ → Resources/public}/images/preview_large.png
  26. 0  web/themes/Andreas08/{ → Resources/public}/images/preview_medium.png
  27. 0  web/themes/Andreas08/{ → Resources/public}/images/preview_small.png
  28. 0  web/themes/Andreas08/{templates → Resources/view}/admin.tpl
  29. 0  web/themes/Andreas08/{templates → Resources/view}/blocks/block.tpl
  30. 0  web/themes/Andreas08/{templates → Resources/view}/blocks/searchblock.tpl
  31. 0  web/themes/Andreas08/{templates → Resources/view}/blocks/topnavblock.tpl
  32. 0  web/themes/Andreas08/{templates → Resources/view}/body/1col.tpl
  33. 0  web/themes/Andreas08/{templates → Resources/view}/body/2col.tpl
  34. 0  web/themes/Andreas08/{templates → Resources/view}/body/2col_w_centerblock.tpl
  35. 0  web/themes/Andreas08/{templates → Resources/view}/body/3col.tpl
  36. 0  web/themes/Andreas08/{templates → Resources/view}/body/3col_w_centerblock.tpl
  37. 0  web/themes/Andreas08/{templates → Resources/view}/home.tpl
  38. 0  web/themes/Andreas08/{templates → Resources/view}/includes/footer.tpl
  39. 0  web/themes/Andreas08/{templates → Resources/view}/includes/header.tpl
  40. 0  web/themes/Andreas08/{templates → Resources/view}/master.tpl
  41. 0  web/themes/Andreas08/{templates → Resources/view}/modules/Blocks/blocks_block_extmenu_topnav.tpl
  42. 0  web/themes/Andreas08/{templates → Resources/view}/modules/Search/search_block_search.tpl
  43. 0  web/themes/{RSS/templates → Atom/Resources}/config/master.ini
  44. 0  web/themes/{Printer/templates → Atom/Resources}/config/pageconfigurations.ini
  45. 0  web/themes/Atom/{templates → Resources}/config/themevariables.ini
  46. 0  web/themes/Atom/{templates → Resources/view}/master.tpl
  47. 0  web/themes/Atom/{ → Resources/view}/plugins/function.id.php
  48. 0  web/themes/Atom/{ → Resources/view}/plugins/function.updated.php
  49. 0  web/themes/Atom/{ → Resources/view}/plugins/modifier.published.php
  50. 0  web/themes/Atom/{ → Resources/view}/plugins/modifier.updated.php
  51. 0  web/themes/Printer/{style → Resources/public/css}/style.css
  52. 0  web/themes/Printer/{ → Resources/public}/images/logo.gif
  53. 0  web/themes/Printer/{templates → Resources/view}/config/master.ini
  54. 0  web/themes/{Atom/templates → Printer/Resources/view}/config/pageconfigurations.ini
  55. 0  web/themes/{RSS/templates → Printer/Resources/view}/config/themepalettes.ini
  56. 0  web/themes/Printer/{templates → Resources/view}/config/themevariables.ini
  57. 0  web/themes/Printer/{templates → Resources/view}/master.tpl
  58. 0  web/themes/Printer/{ → Resources/view}/plugins/function.footnotes.php
  59. 0  web/themes/Printer/{ → Resources/view}/plugins/modifier.footnotes.php
  60. 0  web/themes/{Atom/templates → RSS/Resources}/config/master.ini
  61. 0  web/themes/RSS/{templates → Resources}/config/pageconfigurations.ini
  62. 0  web/themes/{Printer/templates → RSS/Resources}/config/themepalettes.ini
  63. 0  web/themes/RSS/{templates → Resources}/config/themevariables.ini
  64. 0  web/themes/RSS/{templates → Resources/view}/master.tpl
  65. 0  web/themes/RSS/{ → Resources/view}/plugins/function.updated.php
  66. 0  web/themes/RSS/{ → Resources/view}/plugins/function.xmlHeader.php
  67. 0  web/themes/RSS/{ → Resources/view}/plugins/modifier.published.php
  68. 0  web/themes/RSS/{ → Resources/view}/plugins/modifier.updated.php
  69. 0  web/themes/SeaBreeze/{templates → Resources}/config/NoColumns.ini
  70. 0  web/themes/SeaBreeze/{templates → Resources}/config/NoLeftColumn.ini
  71. 0  web/themes/SeaBreeze/{templates → Resources}/config/NoRightColumn.ini
  72. 0  web/themes/SeaBreeze/{templates → Resources}/config/admin.ini
  73. 0  web/themes/SeaBreeze/{templates → Resources}/config/home.ini
  74. 0  web/themes/SeaBreeze/{templates → Resources}/config/master.ini
  75. +2 −2 web/themes/SeaBreeze/{templates → Resources/config}/overrides.yml
  76. 0  web/themes/SeaBreeze/{templates → Resources}/config/pageconfigurations.ini
  77. 0  web/themes/SeaBreeze/{templates → Resources}/config/themepalettes.ini
  78. 0  web/themes/SeaBreeze/{templates → Resources}/config/themevariables.ini
  79. 0  web/themes/SeaBreeze/{style → Resources/public/css}/Blocks/menutree/horizontal.css
  80. 0  web/themes/SeaBreeze/{style → Resources/public/css}/style.css
  81. 0  web/themes/SeaBreeze/{ → Resources/public}/images/article.gif
  82. 0  web/themes/SeaBreeze/{ → Resources/public}/images/article.png
  83. 0  web/themes/SeaBreeze/{ → Resources/public}/images/blank.gif
  84. 0  web/themes/SeaBreeze/{ → Resources/public}/images/bottombg.png
  85. 0  web/themes/SeaBreeze/{ → Resources/public}/images/content_bkg.gif
  86. 0  web/themes/SeaBreeze/{ → Resources/public}/images/corner_bottom_right.gif
  87. 0  web/themes/SeaBreeze/{ → Resources/public}/images/corner_top_right.gif
  88. 0  web/themes/SeaBreeze/{ → Resources/public}/images/corner_top_right.png
  89. 0  web/themes/SeaBreeze/{ → Resources/public}/images/favicon.ico
  90. 0  web/themes/SeaBreeze/{ → Resources/public}/images/fc_left.png
  91. 0  web/themes/SeaBreeze/{ → Resources/public}/images/fc_right.png
  92. 0  web/themes/SeaBreeze/{ → Resources/public}/images/hbkg.gif
  93. 0  web/themes/SeaBreeze/{ → Resources/public}/images/hbkg.png
  94. 0  web/themes/SeaBreeze/{ → Resources/public}/images/head_bkg.png
  95. 0  web/themes/SeaBreeze/{ → Resources/public}/images/icon.gif
  96. 0  web/themes/SeaBreeze/{ → Resources/public}/images/icon.png
  97. 0  web/themes/SeaBreeze/{ → Resources/public}/images/icon2.gif
  98. 0  web/themes/SeaBreeze/{ → Resources/public}/images/input.png
  99. 0  web/themes/SeaBreeze/{ → Resources/public}/images/leftbar.gif
  100. 0  web/themes/SeaBreeze/{ → Resources/public}/images/lefttop.gif
  101. 0  web/themes/SeaBreeze/{ → Resources/public}/images/logoshort.gif
  102. 0  web/themes/SeaBreeze/{ → Resources/public}/images/logoshort.png
  103. 0  web/themes/SeaBreeze/{ → Resources/public}/images/logotop.gif
  104. 0  web/themes/SeaBreeze/{ → Resources/public}/images/mainbar.gif
  105. 0  web/themes/SeaBreeze/{ → Resources/public}/images/mainbar.png
  106. 0  web/themes/SeaBreeze/{ → Resources/public}/images/nav-button-bg.gif
  107. 0  web/themes/SeaBreeze/{ → Resources/public}/images/navtabl.png
  108. 0  web/themes/SeaBreeze/{ → Resources/public}/images/navtabl2.png
  109. 0  web/themes/SeaBreeze/{ → Resources/public}/images/navtabr.png
  110. 0  web/themes/SeaBreeze/{ → Resources/public}/images/note_icon.gif
  111. 0  web/themes/SeaBreeze/{ → Resources/public}/images/note_icon.png
  112. 0  web/themes/SeaBreeze/{ → Resources/public}/images/orange.gif
  113. 0  web/themes/SeaBreeze/{ → Resources/public}/images/preview_large.png
  114. 0  web/themes/SeaBreeze/{ → Resources/public}/images/preview_medium.png
  115. 0  web/themes/SeaBreeze/{ → Resources/public}/images/preview_small.png
  116. 0  web/themes/SeaBreeze/{ → Resources/public}/images/right_bkg.gif
  117. 0  web/themes/SeaBreeze/{ → Resources/public}/images/right_bkg.png
  118. 0  web/themes/SeaBreeze/{ → Resources/public}/images/rightbar.gif
  119. 0  web/themes/SeaBreeze/{ → Resources/public}/images/rss_image.png
  120. 0  web/themes/SeaBreeze/{ → Resources/public}/images/spacer.gif
  121. 0  web/themes/SeaBreeze/{ → Resources/public}/images/top_bkg.gif
  122. 0  web/themes/SeaBreeze/{templates → Resources/view}/NoColumns.tpl
  123. 0  web/themes/SeaBreeze/{templates → Resources/view}/NoLeftColumn.tpl
  124. 0  web/themes/SeaBreeze/{templates → Resources/view}/NoRightColumn.tpl
  125. 0  web/themes/SeaBreeze/{templates → Resources/view}/admin.tpl
  126. 0  web/themes/SeaBreeze/{templates → Resources/view}/blocks/ccblock.tpl
  127. 0  web/themes/SeaBreeze/{templates → Resources/view}/blocks/lsblock.tpl
  128. 0  web/themes/SeaBreeze/{templates → Resources/view}/blocks/rsblock.tpl
  129. 0  web/themes/SeaBreeze/{templates → Resources/view}/blocks/searchblock.tpl
  130. 0  web/themes/SeaBreeze/{templates → Resources/view}/blocks/topnavblock.tpl
  131. 0  web/themes/SeaBreeze/{templates → Resources/view}/home.tpl
  132. 0  web/themes/SeaBreeze/{templates → Resources/view}/includes/adminheader.tpl
  133. 0  web/themes/SeaBreeze/{templates → Resources/view}/includes/footer.tpl
  134. 0  web/themes/SeaBreeze/{templates → Resources/view}/includes/head.tpl
  135. 0  web/themes/SeaBreeze/{templates → Resources/view}/includes/userheader.tpl
  136. 0  web/themes/SeaBreeze/{templates → Resources/view}/master.tpl
  137. 0  web/themes/SeaBreeze/{templates → Resources/view}/modules/Blocks/blocks_block_extmenu_topnav.tpl
  138. 0  web/themes/SeaBreeze/{templates → Resources/view}/modules/Search/search_block_search.tpl
38 UPGRADING-1.4.md
View
@@ -43,6 +43,8 @@ ExampleModule/
admin.png
javascript/
view/
+ plugins/
+ function.foo.php
admin.tpl
user.tpl
Tests/
@@ -160,3 +162,39 @@ the front controller and web assets (images, js and css) only.
The `vendor/` folder is where Composer will checkout vendors however the
`vendor/hard` folder is where dependencies not manageable by Composer are
stored in the repository.
+
+## Theme structure
+
+```
+ExampleTheme/
+ DependencyInjection/
+ Listener/
+ BarListener.php
+ Resources/
+ config/
+ home.ini
+ master.ini
+ overrides.yml
+ themepalettes.ini
+ themevariables.ini
+ locale/
+ theme_example.pot
+ public/
+ css/
+ images/
+ admin.png
Drak Owner
drak added a note

It's just meant to be an example of some images - I'll rename it to prevent confusion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ javascript/
+ view/
+ blocks/
+ lsblock.tpl
+ rsblock.tpl
+ modules/
+ Search/
+ admin.tpl
+ plugins/
+ function.foo.php
+ admin.tpl
+ user.tpl
+ ExampleTheme.php
+ version.php
+```
17 src/legacy/Zikula/View.php
View
@@ -219,21 +219,12 @@ public function __construct(ContainerBuilder $container, $moduleName = '', $cach
{
case ModUtil::TYPE_MODULE :
$mpluginPath = "modules/" . $this->modinfo['directory'] . "/Resources/view/plugins";
- if (!is_dir($mpluginPath)) {
- $mpluginPath = "modules/" . $this->modinfo['directory'] . "/templates/plugins";
- }
break;
case ModUtil::TYPE_SYSTEM :
$mpluginPath = "system/" . $this->modinfo['directory'] . "/Rsources/view/plugins";
- if (!is_dir($mpluginPath)) {
- $mpluginPath = "system/" . $this->modinfo['directory'] . "/templates/plugins";
- }
break;
default:
$mpluginPath = "system/" . $this->modinfo['directory'] . "/Rsources/view/plugins";
- if (!is_dir($mpluginPath)) {
- $mpluginPath = "system/" . $this->modinfo['directory'] . "/templates/plugins";
- }
}
// add standard plugin search path
@@ -241,7 +232,7 @@ public function __construct(ContainerBuilder $container, $moduleName = '', $cach
$this->addPluginDir('config/Resources/plugins'); // Official override
$this->addPluginDir('config/plugins'); // Official override
$this->addPluginDir(ZIKULA_ROOT.'/../src/viewplugins'); // Core plugins
- $this->addPluginDir("themes/$this->theme/plugins"); // Theme plugins
+ $this->addPluginDir("themes/$this->theme/Resources/view/plugins"); // Theme plugins
$this->addPluginDir(SMARTY_DIR.'plugins'); // Smarty core plugins
$this->addPluginDir($mpluginPath); // Plugins for current module
@@ -546,8 +537,6 @@ public function get_template_path($template)
if (is_dir("$os_dir/$os_module/Resources/view")) {
$relativepath = "$os_dir/$os_module/Resources/view";
- } else {
- $relativepath = "$os_dir/$os_module/templates";
}
$templatefile = "$relativepath/$ostemplate";
@@ -1016,10 +1005,6 @@ protected function _add_plugins_dir($module)
if (is_dir("$modpath/$modinfo[directory]/Resources/view/plugins")) {
$this->addPluginDir("$modpath/$modinfo[directory]/Resources/view/plugins");
}
-
- if (is_dir("$modpath/$modinfo[directory]/templates/plugins")) {
- $this->addPluginDir("$modpath/$modinfo[directory]/templates/plugins");
- }
}
/**
16 src/legacy/Zikula/View/Theme.php
View
@@ -179,9 +179,9 @@ public function __construct(ContainerBuilder $container, $themeName)
}
EventUtil::attachCustomHandlers("themes/$themeName/EventHandlers");
- if (is_readable("themes/$themeName/templates/overrides.yml")) {
+ if (is_readable("themes/$themeName/Resources/config/overrides.yml")) {
$this->dispatcher->addListener('zikula_view.template_override', array($this, '_templateOverride'), 0);
- $this->_overrideMap = Yaml::parse("themes/$themeName/templates/overrides.yml");
+ $this->_overrideMap = Yaml::parse("themes/$themeName/Resources/config/overrides.yml");
}
$event = new GenericEvent($this);
@@ -406,8 +406,6 @@ public function get_template_path($template)
if (is_dir("themes/$themeDir/Resources/view")) {
$relativePath = "themes/$themeDir/Resources/view";
- } else {
- $relativePath = "themes/$themeDir/templates";
}
$templateFile = "$relativePath/$osTemplate";
@@ -439,7 +437,7 @@ public function get_template_path($template)
private function _plugin_dirs()
{
// add theme specific plugins directories, if they exist
- $this->addPluginDir('themes/' . $this->directory . '/plugins');
+ $this->addPluginDir('themes/' . $this->directory . '/Resources/view/plugins');
}
/**
@@ -568,10 +566,10 @@ private function _base_vars()
$this->template_dir = $this->themepath . '/templates'; // default directory for templates
$this->themepath = 'themes/' . $this->directory;
- $this->imagepath = $this->themepath . '/images';
- $this->imagelangpath = $this->themepath . '/images/' . $this->language;
- $this->stylepath = $this->themepath . '/style';
- $this->scriptpath = $this->themepath . '/javascript';
+ $this->imagepath = $this->themepath . '/Resources/public/images';
+ $this->imagelangpath = $this->themepath . '/Resources/public/images/' . $this->language;
+ $this->stylepath = $this->themepath . '/Resources/public/css';
+ $this->scriptpath = $this->themepath . '/Resources/public/javascript';
// make the base vars available to all templates
$this->assign('module', $this->toplevelmodule)
16 src/util/BlockUtil.php
View
@@ -220,19 +220,19 @@ public static function themeBlock($blockinfo)
// check for collapsable menus being enabled, and setup the collapsable menu image.
if (!isset($upb)) {
- if (file_exists('themes/' . $themedir . '/images/upb.png')) {
- $upb = '<img src="themes/' . $themedir . '/images/upb.png" alt="-" />';
- } elseif (file_exists('themes/' . $themedir . '/images/14_layer_raiselayer.png')) {
- $upb = '<img src="themes/' . $themedir . '/images/14_layer_raiselayer.png" alt="-" />';
+ if (file_exists('themes/' . $themedir . '/Resources/public/images/upb.png')) {
+ $upb = '<img src="themes/' . $themedir . '/Resources/public/images/upb.png" alt="-" />';
+ } elseif (file_exists('themes/' . $themedir . '/Resources/public/images/14_layer_raiselayer.png')) {
+ $upb = '<img src="themes/' . $themedir . '/Resources/public/images/14_layer_raiselayer.png" alt="-" />';
} else {
$upb = '<img src="images/icons/extrasmall/14_layer_raiselayer.png" alt="-" />';
}
}
if (!isset($downb)) {
- if (file_exists('themes/' . $themedir . '/images/downb.png')) {
- $downb = '<img src="themes/' . $themedir . '/images/downb.png" alt="+" />';
- } elseif (file_exists('themes/' . $themedir . '/images/14_layer_lowerlayer.png')) {
- $downb = '<img src="themes/' . $themedir . '/images/14_layer_lowerlayer.png" alt="+" />';
+ if (file_exists('themes/' . $themedir . '/Resources/public/images/downb.png')) {
+ $downb = '<img src="themes/' . $themedir . '/Resources/public/images/downb.png" alt="+" />';
+ } elseif (file_exists('themes/' . $themedir . '/Resources/public/images/14_layer_lowerlayer.png')) {
+ $downb = '<img src="themes/' . $themedir . '/Resources/public/images/14_layer_lowerlayer.png" alt="+" />';
} else {
$downb = '<img src="images/icons/extrasmall/14_layer_lowerlayer.png" alt="+" />';
}
8 src/util/ThemeUtil.php
View
@@ -240,7 +240,7 @@ public static function getThemesTable()
foreach ($themes as $theme) {
$theme = $theme->toArray();
- $theme['i18n'] = (is_dir("themes/$theme[name]/locale") ? 1 : 0);
+ $theme['i18n'] = (is_dir("themes/$theme[name]/Resources/locale") ? 1 : 0);
$themestable[$theme['id']] = $theme;
}
}
@@ -280,19 +280,17 @@ public static function getModuleStylesheet($modname = '', $stylesheet = '')
// theme directory
$theme = DataUtil::formatForOS(UserUtil::getTheme());
- $themepath = "themes/$theme/style/$osmodname";
+ $themepath = "themes/$theme/Resources/public/css/$osmodname";
// module directory
$modinfo = ModUtil::getInfoFromName($modname);
$osmoddir = DataUtil::formatForOS($modinfo['directory']);
$modpath = "modules/$osmoddir/Resources/public/css";
$syspath = "system/$osmoddir/Resources/public/css";
- $modpathOld = "modules/$osmoddir/style";
- $syspathOld = "system/$osmoddir/style";
// search for the style sheet
$csssrc = '';
- foreach (array($configpath, $themepath, $modpath, $syspath, $modpathOld, $syspathOld) as $path) {
+ foreach (array($configpath, $themepath, $modpath, $syspath) as $path) {
if (is_readable("$path/$osstylesheet")) {
$csssrc = "$path/$osstylesheet";
break;
0  web/config/templates/index.html
View
No changes.
46 web/system/Theme/Api/AdminApi.php
View
@@ -61,9 +61,9 @@ public function updatesettings($args)
if (!isset($args['themeinfo'])) {
return LogUtil::registerArgsError();
}
-
+
unset($args['themeinfo']['i18n']);
-
+
$item = $this->entityManager->find('Theme\Entity\Theme', $args['themeinfo']['id']);
$item->merge($args['themeinfo']);
$this->entityManager->flush();
@@ -187,7 +187,7 @@ public function delete($args)
if (!DBUtil::executeSQL($sql)) {
return false;
}
-
+
// delete theme
$dql = "DELETE FROM Theme\Entity\Theme t WHERE t.id = {$themeid}";
$query = $em->createQuery($dql);
@@ -388,17 +388,19 @@ public function create($args)
// create the directory structure
$dirs = array(
'',
- '/docs',
- '/images',
- '/plugins',
- '/locale',
- '/locale/en',
- '/locale/en/LC_MESSAGES',
- '/style',
- '/templates',
- '/templates/blocks',
- '/templates/config',
- '/templates/modules'
+ '/Resources',
+ '/Resources/docs',
+ '/Resources/public',
+ '/Resources/public/images',
+ '/Resources/public/css',
+ '/Resources/plugins',
+ '/Resources/locale',
+ '/Resources/locale/en',
+ '/Resources/locale/en/LC_MESSAGES',
+ '/Resources/view',
+ '/Resources/view/blocks',
+ '/Resources/view/config',
+ '/Resources/view/modules'
);
foreach ($dirs as $dir) {
@@ -419,14 +421,14 @@ public function create($args)
$files = array(
"themes/$themeinfo[name]/version.php" => 'versionfile',
- "themes/$themeinfo[name]/locale/theme_".$themeinfo['name'].".pot" => 'potfile',
- "themes/$themeinfo[name]/templates/config/themepalettes.ini" => 'palettesfile',
- "themes/$themeinfo[name]/templates/config/themevariables.ini" => 'variablesfile',
- "themes/$themeinfo[name]/templates/config/pageconfigurations.ini" => 'pageconfigurationsfile',
- "themes/$themeinfo[name]/templates/config/master.ini" => 'pageconfigurationfile',
- "themes/$themeinfo[name]/templates/master.tpl" => 'pagetemplatefile',
- "themes/$themeinfo[name]/templates/blocks/block.tpl" => 'blockfile',
- "themes/$themeinfo[name]/style/style.css" => 'cssfile'
+ "themes/$themeinfo[name]/Resources/locale/theme_".$themeinfo['name'].".pot" => 'potfile',
+ "themes/$themeinfo[name]/Resources/config/themepalettes.ini" => 'palettesfile',
+ "themes/$themeinfo[name]/Resources/config/themevariables.ini" => 'variablesfile',
+ "themes/$themeinfo[name]/Resources/config/pageconfigurations.ini" => 'pageconfigurationsfile',
+ "themes/$themeinfo[name]/Resources/config/master.ini" => 'pageconfigurationfile',
+ "themes/$themeinfo[name]/Resources/master.tpl" => 'pagetemplatefile',
+ "themes/$themeinfo[name]/Resources/blocks/block.tpl" => 'blockfile',
+ "themes/$themeinfo[name]/Resources/public/css/style.css" => 'cssfile'
);
// write the files
10 web/system/Theme/Api/UserApi.php
View
@@ -198,7 +198,7 @@ public function getconfigurations($args)
}
$themeinfo = ThemeUtil::getInfo(ThemeUtil::getIDFromName($args['theme']));
- $templatedir = ZIKULA_ROOT.'/themes/'.DataUtil::formatForOS($themeinfo['directory']).'/templates/config';
+ $templatedir = ZIKULA_ROOT.'/themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/config';
// get the available .ini files and exclude the core ones
$inifiles = FileUtil::getFiles($templatedir, false, true, '.ini', 'f');
@@ -221,7 +221,7 @@ public function gettemplates($args)
$args['type'] = isset($args['type']) ? DataUtil::formatForOS($args['type']) : 'modules';
$themeinfo = ThemeUtil::getInfo(ThemeUtil::getIDFromName($args['theme']));
- $templatedir = ZIKULA_ROOT.'/themes/'.DataUtil::formatForOS($themeinfo['directory']).'/templates';
+ $templatedir = ZIKULA_ROOT.'/themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/view';
if ($args['type'] == 'modules') {
// for module templates also search on the theme/templates folder
@@ -264,8 +264,8 @@ function _readinifile($args)
if (file_exists($ostemp.'/Theme_Config/'.$ostheme.'/'.$osfile)) {
return parse_ini_file($ostemp.'/Theme_Config/'.$ostheme.'/'.$osfile, $args['sections']);
- } else if (file_exists(ZIKULA_ROOT.'/themes/'.$ostheme.'/templates/config/'.$osfile)) {
- return parse_ini_file(ZIKULA_ROOT.'/themes/'.$ostheme.'/templates/config/'.$osfile, $args['sections']);
+ } else if (file_exists(ZIKULA_ROOT.'/themes/'.$ostheme.'/Resources/config/'.$osfile)) {
+ return parse_ini_file(ZIKULA_ROOT.'/themes/'.$ostheme.'/Resources/config/'.$osfile, $args['sections']);
}
}
@@ -293,7 +293,7 @@ public function writeinifile($args)
$osfile = DataUtil::formatForOS($args['file']);
// verify the writable paths
- $tpath = ZIKULA_ROOT.'/themes/'.$ostheme.'/templates/config';
+ $tpath = ZIKULA_ROOT.'/themes/'.$ostheme.'/Resources/config';
if (is_writable($tpath.'/'.$osfile)) {
$handle = fopen($tpath.'/'.$osfile, 'w+');
6 web/system/Theme/Controller/AdminController.php
View
@@ -111,7 +111,7 @@ private function checkRunningConfig($themeinfo)
{
$ostemp = CacheUtil::getLocalDir();
$zpath = $ostemp . '/Theme_Config/' . DataUtil::formatForOS($themeinfo['directory']);
- $tpath = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/templates/config';
+ $tpath = 'themes/' . DataUtil::formatForOS($themeinfo['directory']) . '/Resources/config';
// check if we can edit the theme and, if not, create the running config
if (!is_writable($tpath . '/pageconfigurations.ini')) {
@@ -199,7 +199,7 @@ public function updatesettingsAction($args)
if ($updatesettings) {
LogUtil::registerStatus($this->__('Done! Updated theme settings.'));
}
-
+
// redirect back to the variables page
return $this->redirect(ModUtil::url('Theme', 'admin', 'view'));
}
@@ -488,7 +488,7 @@ public function pageconfigurationsAction($args)
$pagetypes[$name] = $this->__f('%s type pages', ucfirst(substr($name, 1)));
}
// check if the file exists
- if ($exists = file_exists("themes/$themeinfo[directory]/templates/config/$pageconfiguration[file]")) {
+ if ($exists = file_exists("themes/$themeinfo[directory]/Resources/config/$pageconfiguration[file]")) {
$existingconfigs[] = $pageconfiguration['file'];
}
$pageconfigfiles[$pageconfiguration['file']] = $exists;
8 web/system/Theme/Controller/UserController.php
View
@@ -39,13 +39,13 @@ public function mainAction()
$currentthemepic = null;
foreach ($themes as $themeinfo) {
$themename = $themeinfo['name'];
- if (file_exists($themepic = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/images/preview_medium.png')) {
+ if (file_exists($themepic = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/public/images/preview_medium.png')) {
$themeinfo['previewImage'] = $themepic;
- $themeinfo['largeImage'] = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/images/preview_large.png';
+ $themeinfo['largeImage'] = 'themes/'.DataUtil::formatForOS($themeinfo['directory']).'/Resources/public/images/preview_large.png';
}
else {
- $themeinfo['previewImage'] = 'system/Theme/images/preview_medium.png';
- $themeinfo['largeImage'] = 'system/Theme/images/preview_large.png';
+ $themeinfo['previewImage'] = 'system/Theme/Resources/public/images/preview_medium.png';
+ $themeinfo['largeImage'] = 'system/Theme/Resources/public/images/preview_large.png';
}
$previewthemes[$themename] = $themeinfo;
if ($themename == $currenttheme['name']) {
0  web/themes/Andreas08/templates/config/admin.ini → web/themes/Andreas08/Resources/config/admin.ini
View
File renamed without changes
0  web/themes/Andreas08/templates/config/home.ini → web/themes/Andreas08/Resources/config/home.ini
View
File renamed without changes
0  web/themes/Andreas08/templates/config/master.ini → web/themes/Andreas08/Resources/config/master.ini
View
File renamed without changes
4 web/themes/Andreas08/templates/overrides.yml → web/themes/Andreas08/Resources/config/overrides.yml
View
@@ -1,5 +1,5 @@
## YAML Override template
## original/file.tpl: override/file.tpl
---
-system/Search/Resources/view/search_block_search.tpl: themes/Andreas08/templates/modules/Search/search_block_search.tpl
-system/Blocks/Resources/view/blocks_block_extmenu_topnav.tpl: themes/Andreas08/templates/modules/Blocks/blocks_block_extmenu_topnav.tpl
+system/Search/Resources/view/search_block_search.tpl: themes/Andreas08/Resources/view/modules/Search/search_block_search.tpl
+system/Blocks/Resources/view/blocks_block_extmenu_topnav.tpl: themes/Andreas08/Resources/view/modules/Blocks/blocks_block_extmenu_topnav.tpl
0  ...Andreas08/templates/config/pageconfigurations.ini → ...Andreas08/Resources/config/pageconfigurations.ini
View
File renamed without changes
0  ...emes/Andreas08/templates/config/themepalettes.ini → ...emes/Andreas08/Resources/config/themepalettes.ini
View
File renamed without changes
0  ...mes/Andreas08/templates/config/themevariables.ini → ...mes/Andreas08/Resources/config/themevariables.ini
View
File renamed without changes
0  ...es/Andreas08/style/Blocks/menutree/horizontal.css → ...sources/public/css/Blocks/menutree/horizontal.css
View
File renamed without changes
0  web/themes/Andreas08/style/fluid960gs/960.css → ...Andreas08/Resources/public/css/fluid960gs/960.css
View
File renamed without changes
0  web/themes/Andreas08/style/fluid960gs/grid.css → ...ndreas08/Resources/public/css/fluid960gs/grid.css
View
File renamed without changes
0  web/themes/Andreas08/style/fluid960gs/ie.css → .../Andreas08/Resources/public/css/fluid960gs/ie.css
View
File renamed without changes
0  web/themes/Andreas08/style/fluid960gs/ie6.css → ...Andreas08/Resources/public/css/fluid960gs/ie6.css
View
File renamed without changes
0  web/themes/Andreas08/style/fluid960gs/reset.css → ...dreas08/Resources/public/css/fluid960gs/reset.css
View
File renamed without changes
0  web/themes/Andreas08/style/style.css → web/themes/Andreas08/Resources/public/css/style.css
View
File renamed without changes
0  web/themes/Andreas08/images/preview_large.png → ...dreas08/Resources/public/images/preview_large.png
View
File renamed without changes
0  web/themes/Andreas08/images/preview_medium.png → ...reas08/Resources/public/images/preview_medium.png
View
File renamed without changes
0  web/themes/Andreas08/images/preview_small.png → ...dreas08/Resources/public/images/preview_small.png
View
File renamed without changes
0  web/themes/Andreas08/templates/admin.tpl → web/themes/Andreas08/Resources/view/admin.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/blocks/block.tpl → web/themes/Andreas08/Resources/view/blocks/block.tpl
View
File renamed without changes
0  ...themes/Andreas08/templates/blocks/searchblock.tpl → ...s/Andreas08/Resources/view/blocks/searchblock.tpl
View
File renamed without changes
0  ...themes/Andreas08/templates/blocks/topnavblock.tpl → ...s/Andreas08/Resources/view/blocks/topnavblock.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/body/1col.tpl → web/themes/Andreas08/Resources/view/body/1col.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/body/2col.tpl → web/themes/Andreas08/Resources/view/body/2col.tpl
View
File renamed without changes
0  ...s/Andreas08/templates/body/2col_w_centerblock.tpl → ...reas08/Resources/view/body/2col_w_centerblock.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/body/3col.tpl → web/themes/Andreas08/Resources/view/body/3col.tpl
View
File renamed without changes
0  ...s/Andreas08/templates/body/3col_w_centerblock.tpl → ...reas08/Resources/view/body/3col_w_centerblock.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/home.tpl → web/themes/Andreas08/Resources/view/home.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/includes/footer.tpl → ...emes/Andreas08/Resources/view/includes/footer.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/includes/header.tpl → ...emes/Andreas08/Resources/view/includes/header.tpl
View
File renamed without changes
0  web/themes/Andreas08/templates/master.tpl → web/themes/Andreas08/Resources/view/master.tpl
View
File renamed without changes
0  ...es/modules/Blocks/blocks_block_extmenu_topnav.tpl → ...ew/modules/Blocks/blocks_block_extmenu_topnav.tpl
View
File renamed without changes
0  .../templates/modules/Search/search_block_search.tpl → ...urces/view/modules/Search/search_block_search.tpl
View
File renamed without changes
0  web/themes/RSS/templates/config/master.ini → web/themes/Atom/Resources/config/master.ini
View
File renamed without changes
0  ...s/Printer/templates/config/pageconfigurations.ini → ...emes/Atom/Resources/config/pageconfigurations.ini
View
File renamed without changes
0  web/themes/Atom/templates/config/themevariables.ini → web/themes/Atom/Resources/config/themevariables.ini
View
File renamed without changes
0  web/themes/Atom/templates/master.tpl → web/themes/Atom/Resources/view/master.tpl
View
File renamed without changes
0  web/themes/Atom/plugins/function.id.php → ...hemes/Atom/Resources/view/plugins/function.id.php
View
File renamed without changes
0  web/themes/Atom/plugins/function.updated.php → .../Atom/Resources/view/plugins/function.updated.php
View
File renamed without changes
0  web/themes/Atom/plugins/modifier.published.php → ...tom/Resources/view/plugins/modifier.published.php
View
File renamed without changes
0  web/themes/Atom/plugins/modifier.updated.php → .../Atom/Resources/view/plugins/modifier.updated.php
View
File renamed without changes
0  web/themes/Printer/style/style.css → web/themes/Printer/Resources/public/css/style.css
View
File renamed without changes
0  web/themes/Printer/images/logo.gif → web/themes/Printer/Resources/public/images/logo.gif
View
File renamed without changes
0  web/themes/Printer/templates/config/master.ini → web/themes/Printer/Resources/view/config/master.ini
View
File renamed without changes
0  ...emes/Atom/templates/config/pageconfigurations.ini → ...nter/Resources/view/config/pageconfigurations.ini
View
File renamed without changes
0  web/themes/RSS/templates/config/themepalettes.ini → ...s/Printer/Resources/view/config/themepalettes.ini
View
File renamed without changes
0  ...hemes/Printer/templates/config/themevariables.ini → .../Printer/Resources/view/config/themevariables.ini
View
File renamed without changes
0  web/themes/Printer/templates/master.tpl → web/themes/Printer/Resources/view/master.tpl
View
File renamed without changes
0  web/themes/Printer/plugins/function.footnotes.php → ...ter/Resources/view/plugins/function.footnotes.php
View
File renamed without changes
0  web/themes/Printer/plugins/modifier.footnotes.php → ...ter/Resources/view/plugins/modifier.footnotes.php
View
File renamed without changes
0  web/themes/Atom/templates/config/master.ini → web/themes/RSS/Resources/config/master.ini
View
File renamed without changes
0  ...hemes/RSS/templates/config/pageconfigurations.ini → ...hemes/RSS/Resources/config/pageconfigurations.ini
View
File renamed without changes
0  ...themes/Printer/templates/config/themepalettes.ini → web/themes/RSS/Resources/config/themepalettes.ini
View
File renamed without changes
0  web/themes/RSS/templates/config/themevariables.ini → web/themes/RSS/Resources/config/themevariables.ini
View
File renamed without changes
0  web/themes/RSS/templates/master.tpl → web/themes/RSS/Resources/view/master.tpl
View
File renamed without changes
0  web/themes/RSS/plugins/function.updated.php → ...s/RSS/Resources/view/plugins/function.updated.php
View
File renamed without changes
0  web/themes/RSS/plugins/function.xmlHeader.php → ...RSS/Resources/view/plugins/function.xmlHeader.php
View
File renamed without changes
0  web/themes/RSS/plugins/modifier.published.php → ...RSS/Resources/view/plugins/modifier.published.php
View
File renamed without changes
0  web/themes/RSS/plugins/modifier.updated.php → ...s/RSS/Resources/view/plugins/modifier.updated.php
View
File renamed without changes
0  web/themes/SeaBreeze/templates/config/NoColumns.ini → web/themes/SeaBreeze/Resources/config/NoColumns.ini
View
File renamed without changes
0  ...hemes/SeaBreeze/templates/config/NoLeftColumn.ini → ...hemes/SeaBreeze/Resources/config/NoLeftColumn.ini
View
File renamed without changes
0  ...emes/SeaBreeze/templates/config/NoRightColumn.ini → ...emes/SeaBreeze/Resources/config/NoRightColumn.ini
View
File renamed without changes
0  web/themes/SeaBreeze/templates/config/admin.ini → web/themes/SeaBreeze/Resources/config/admin.ini
View
File renamed without changes
0  web/themes/SeaBreeze/templates/config/home.ini → web/themes/SeaBreeze/Resources/config/home.ini
View
File renamed without changes
0  web/themes/SeaBreeze/templates/config/master.ini → web/themes/SeaBreeze/Resources/config/master.ini
View
File renamed without changes
4 web/themes/SeaBreeze/templates/overrides.yml → web/themes/SeaBreeze/Resources/config/overrides.yml
View
@@ -1,5 +1,5 @@
## YAML Override template
## original/file.tpl: override/file.tpl
---
-system/Search/Resources/view/search_block_search.tpl: themes/SeaBreeze/templates/modules/Search/search_block_search.tpl
-system/Blocks/Resources/view/blocks_block_extmenu_topnav.tpl: themes/SeaBreeze/templates/modules/Blocks/blocks_block_extmenu_topnav.tpl
+system/Search/Resources/view/search_block_search.tpl: themes/SeaBreeze/Resources/view/modules/Search/search_block_search.tpl
+system/Blocks/Resources/view/blocks_block_extmenu_topnav.tpl: themes/SeaBreeze/Resources/view/modules/Blocks/blocks_block_extmenu_topnav.tpl
0  ...SeaBreeze/templates/config/pageconfigurations.ini → ...SeaBreeze/Resources/config/pageconfigurations.ini
View
File renamed without changes
0  ...emes/SeaBreeze/templates/config/themepalettes.ini → ...emes/SeaBreeze/Resources/config/themepalettes.ini
View
File renamed without changes
0  ...mes/SeaBreeze/templates/config/themevariables.ini → ...mes/SeaBreeze/Resources/config/themevariables.ini
View
File renamed without changes
0  ...es/SeaBreeze/style/Blocks/menutree/horizontal.css → ...sources/public/css/Blocks/menutree/horizontal.css
View
File renamed without changes
0  web/themes/SeaBreeze/style/style.css → web/themes/SeaBreeze/Resources/public/css/style.css
View
File renamed without changes
0  web/themes/SeaBreeze/images/article.gif → ...mes/SeaBreeze/Resources/public/images/article.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/article.png → ...mes/SeaBreeze/Resources/public/images/article.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/blank.gif → ...hemes/SeaBreeze/Resources/public/images/blank.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/bottombg.png → ...es/SeaBreeze/Resources/public/images/bottombg.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/content_bkg.gif → ...SeaBreeze/Resources/public/images/content_bkg.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/corner_bottom_right.gif → ...e/Resources/public/images/corner_bottom_right.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/corner_top_right.gif → ...eeze/Resources/public/images/corner_top_right.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/corner_top_right.png → ...eeze/Resources/public/images/corner_top_right.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/favicon.ico → ...mes/SeaBreeze/Resources/public/images/favicon.ico
View
File renamed without changes
0  web/themes/SeaBreeze/images/fc_left.png → ...mes/SeaBreeze/Resources/public/images/fc_left.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/fc_right.png → ...es/SeaBreeze/Resources/public/images/fc_right.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/hbkg.gif → ...themes/SeaBreeze/Resources/public/images/hbkg.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/hbkg.png → ...themes/SeaBreeze/Resources/public/images/hbkg.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/head_bkg.png → ...es/SeaBreeze/Resources/public/images/head_bkg.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/icon.gif → ...themes/SeaBreeze/Resources/public/images/icon.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/icon.png → ...themes/SeaBreeze/Resources/public/images/icon.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/icon2.gif → ...hemes/SeaBreeze/Resources/public/images/icon2.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/input.png → ...hemes/SeaBreeze/Resources/public/images/input.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/leftbar.gif → ...mes/SeaBreeze/Resources/public/images/leftbar.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/lefttop.gif → ...mes/SeaBreeze/Resources/public/images/lefttop.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/logoshort.gif → ...s/SeaBreeze/Resources/public/images/logoshort.gif
View
File renamed without changes
0  web/themes/SeaBreeze/images/logoshort.png → ...s/SeaBreeze/Resources/public/images/logoshort.png
View
File renamed without changes
0  web/themes/SeaBreeze/images/logotop.gif → ...mes/SeaBreeze/Resources/public/images/logotop.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/mainbar.gif → ...mes/SeaBreeze/Resources/public/images/mainbar.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/mainbar.png → ...mes/SeaBreeze/Resources/public/images/mainbar.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/nav-button-bg.gif → ...aBreeze/Resources/public/images/nav-button-bg.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/navtabl.png → ...mes/SeaBreeze/Resources/public/images/navtabl.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/navtabl2.png → ...es/SeaBreeze/Resources/public/images/navtabl2.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/navtabr.png → ...mes/SeaBreeze/Resources/public/images/navtabr.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/note_icon.gif → ...s/SeaBreeze/Resources/public/images/note_icon.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/note_icon.png → ...s/SeaBreeze/Resources/public/images/note_icon.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/orange.gif → ...emes/SeaBreeze/Resources/public/images/orange.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/preview_large.png → ...aBreeze/Resources/public/images/preview_large.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/preview_medium.png → ...Breeze/Resources/public/images/preview_medium.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/preview_small.png → ...aBreeze/Resources/public/images/preview_small.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/right_bkg.gif → ...s/SeaBreeze/Resources/public/images/right_bkg.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/right_bkg.png → ...s/SeaBreeze/Resources/public/images/right_bkg.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/rightbar.gif → ...es/SeaBreeze/Resources/public/images/rightbar.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/rss_image.png → ...s/SeaBreeze/Resources/public/images/rss_image.png
View
Diff not rendered
0  web/themes/SeaBreeze/images/spacer.gif → ...emes/SeaBreeze/Resources/public/images/spacer.gif
View
Diff not rendered
0  web/themes/SeaBreeze/images/top_bkg.gif → ...mes/SeaBreeze/Resources/public/images/top_bkg.gif
View
Diff not rendered
0  web/themes/SeaBreeze/templates/NoColumns.tpl → web/themes/SeaBreeze/Resources/view/NoColumns.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/NoLeftColumn.tpl → web/themes/SeaBreeze/Resources/view/NoLeftColumn.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/NoRightColumn.tpl → ...themes/SeaBreeze/Resources/view/NoRightColumn.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/admin.tpl → web/themes/SeaBreeze/Resources/view/admin.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/blocks/ccblock.tpl → ...hemes/SeaBreeze/Resources/view/blocks/ccblock.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/blocks/lsblock.tpl → ...hemes/SeaBreeze/Resources/view/blocks/lsblock.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/blocks/rsblock.tpl → ...hemes/SeaBreeze/Resources/view/blocks/rsblock.tpl
View
File renamed without changes
0  ...themes/SeaBreeze/templates/blocks/searchblock.tpl → ...s/SeaBreeze/Resources/view/blocks/searchblock.tpl
View
File renamed without changes
0  ...themes/SeaBreeze/templates/blocks/topnavblock.tpl → ...s/SeaBreeze/Resources/view/blocks/topnavblock.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/home.tpl → web/themes/SeaBreeze/Resources/view/home.tpl
View
File renamed without changes
0  ...emes/SeaBreeze/templates/includes/adminheader.tpl → ...SeaBreeze/Resources/view/includes/adminheader.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/includes/footer.tpl → ...emes/SeaBreeze/Resources/view/includes/footer.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/includes/head.tpl → ...themes/SeaBreeze/Resources/view/includes/head.tpl
View
File renamed without changes
0  ...hemes/SeaBreeze/templates/includes/userheader.tpl → .../SeaBreeze/Resources/view/includes/userheader.tpl
View
File renamed without changes
0  web/themes/SeaBreeze/templates/master.tpl → web/themes/SeaBreeze/Resources/view/master.tpl
View
File renamed without changes
0  ...es/modules/Blocks/blocks_block_extmenu_topnav.tpl → ...ew/modules/Blocks/blocks_block_extmenu_topnav.tpl
View
File renamed without changes
0  .../templates/modules/Search/search_block_search.tpl → ...urces/view/modules/Search/search_block_search.tpl
View
File renamed without changes
Drak

It's just meant to be an example of some images - I'll rename it to prevent confusion.

Please sign in to comment.
Something went wrong with that request. Please try again.