aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-09-03 20:56:35 +0000
committerplegall <plg@piwigo.org>2005-09-03 20:56:35 +0000
commitc614c0798e96109170d2382121e897cc5b80cb06 (patch)
tree5b2089f26a75c504ed16c5929917a6dfa3712a88
parent9c6f769b9424557f5cda93e6f7f4f1366ad427e7 (diff)
(not in ChangeLog)
- yoga template used for installation and by default in user_infos table - adaptation of yoga template to itself (no use of icons from template default) git-svn-id: http://piwigo.org/svn/trunk@860 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--install.php4
-rw-r--r--install/config.sql2
-rw-r--r--install/phpwebgallery_structure.sql2
-rw-r--r--template/yoga/admin/cat_list.tpl12
-rw-r--r--template/yoga/admin/cat_modify.tpl12
-rw-r--r--template/yoga/admin/group_list.tpl4
-rw-r--r--template/yoga/admin/picture_modify.tpl4
-rw-r--r--template/yoga/admin/user_list.tpl2
-rw-r--r--template/yoga/category.tpl4
-rw-r--r--template/yoga/picture.tpl2
10 files changed, 23 insertions, 25 deletions
diff --git a/install.php b/install.php
index 3a7a69ec3..e2c2f5eca 100644
--- a/install.php
+++ b/install.php
@@ -155,8 +155,6 @@ if( !get_magic_quotes_gpc() )
}
//----------------------------------------------------- variable initialization
-$install_style = 'default';
-
// Obtain various vars
$dbhost = (!empty($_POST['dbhost'])) ? $_POST['dbhost'] : 'localhost';
$dbuser = (!empty($_POST['dbuser'])) ? $_POST['dbuser'] : '';
@@ -209,7 +207,7 @@ include( './language/'.$language.'/common.lang.php' );
include( './language/'.$language.'/admin.lang.php' );
include( './language/'.$language.'/install.lang.php' );
//----------------------------------------------------- template initialization
-$template=setup_style($install_style);
+$template=setup_style('yoga');
$template->set_filenames( array('install'=>'install.tpl') );
$step = 1;
//---------------------------------------------------------------- form analyze
diff --git a/install/config.sql b/install/config.sql
index fa27ce1e3..41d109dae 100644
--- a/install/config.sql
+++ b/install/config.sql
@@ -1,7 +1,7 @@
-- initial configuration for PhpWebGallery
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_language','en_UK.iso-8859-1','Default gallery language');
-INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_template','default','Default gallery style');
+INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_template','yoga','Default gallery style');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxwidth','','maximum width authorized for displaying images');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('default_maxheight','','maximum height authorized for the displaying images');
INSERT INTO phpwebgallery_config (param,value,comment) VALUES ('nb_comment_page','10','number of comments to display on each page');
diff --git a/install/phpwebgallery_structure.sql b/install/phpwebgallery_structure.sql
index 5d0bac12a..7662746fd 100644
--- a/install/phpwebgallery_structure.sql
+++ b/install/phpwebgallery_structure.sql
@@ -262,7 +262,7 @@ CREATE TABLE `phpwebgallery_user_infos` (
`expand` enum('true','false') NOT NULL default 'false',
`show_nb_comments` enum('true','false') NOT NULL default 'false',
`recent_period` tinyint(3) unsigned NOT NULL default '7',
- `template` varchar(255) NOT NULL default 'default',
+ `template` varchar(255) NOT NULL default 'yoga',
`registration_date` datetime NOT NULL default '0000-00-00 00:00:00',
UNIQUE KEY `user_infos_ui1` (`user_id`)
) TYPE=MyISAM;
diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
index 6b59afb03..eac26fa78 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/yoga/admin/cat_list.tpl
@@ -11,17 +11,17 @@
<li> <!-- category {category.ID} -->
<ul class="categoryActions">
- <li><a href="{category.U_JUMPTO}" title="{lang:jump to category}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
- <li><a href="{category.U_EDIT}" title="{lang:edit category informations}"><img src="./template/default/theme/category_edit.png" alt="{lang:edit}"/></a></li>
+ <li><a href="{category.U_JUMPTO}" title="{lang:jump to category}"><img src="./template/yoga/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
+ <li><a href="{category.U_EDIT}" title="{lang:edit category informations}"><img src="./template/yoga/theme/category_edit.png" alt="{lang:edit}"/></a></li>
<!-- BEGIN elements -->
- <li><a href="{category.elements.URL}" title="{lang:manage category elements}"><img src="./template/default/theme/category_elements.png" alt="{lang:elements}" /></a></li>
+ <li><a href="{category.elements.URL}" title="{lang:manage category elements}"><img src="./template/yoga/theme/category_elements.png" alt="{lang:elements}" /></a></li>
<!-- END elements -->
- <li><a href="{category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/default/theme/category_children.png" alt="{lang:sub-categories}" /></a></li>
+ <li><a href="{category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/yoga/theme/category_children.png" alt="{lang:sub-categories}" /></a></li>
<!-- BEGIN permissions -->
- <li><a href="{category.permissions.URL}" title="{lang:edit category permissions}" ><img src="./template/default/theme/category_permissions.png" alt="{lang:permissions}" /></a></li>
+ <li><a href="{category.permissions.URL}" title="{lang:edit category permissions}" ><img src="./template/yoga/theme/category_permissions.png" alt="{lang:permissions}" /></a></li>
<!-- END permissions -->
<!-- BEGIN delete -->
- <li><a href="{category.delete.URL}" title="{lang:delete category}"><img src="./template/default/theme/category_delete.png" alt="{lang:delete}" /></a></li>
+ <li><a href="{category.delete.URL}" title="{lang:delete category}"><img src="./template/yoga/theme/category_delete.png" alt="{lang:delete}" /></a></li>
<!-- END delete -->
</ul>
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index 678bef349..d64df4960 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -4,16 +4,16 @@
<h3>{CATEGORIES_NAV}</h3>
<ul class="categoryActions">
- <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
+ <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="./template/yoga/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
<!-- BEGIN elements -->
- <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="./template/default/theme/category_elements.png" alt="{lang:elements}" /></a></li>
+ <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="./template/yoga/theme/category_elements.png" alt="{lang:elements}" /></a></li>
<!-- END elements -->
- <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/default/theme/category_children.png" alt="{lang:sub-categories}" /></a></li>
+ <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="./template/yoga/theme/category_children.png" alt="{lang:sub-categories}" /></a></li>
<!-- BEGIN permissions -->
- <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="./template/default/theme/category_permissions.png" alt="{lang:permissions}" /></a></li>
+ <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="./template/yoga/theme/category_permissions.png" alt="{lang:permissions}" /></a></li>
<!-- END permissions -->
<!-- BEGIN delete -->
- <li><a href="{delete.URL}" title="{lang:delete category}"><img src="./template/default/theme/category_delete.png" alt="{lang:delete}" /></a></li>
+ <li><a href="{delete.URL}" title="{lang:delete category}"><img src="./template/yoga/theme/category_delete.png" alt="{lang:delete}" /></a></li>
<!-- END delete -->
</ul>
@@ -113,7 +113,7 @@
<!-- END picture -->
<!-- BEGIN random -->
- <img src="./template/default/theme/category_representant_random.png" alt="{lang:Random picture}" class="miniature" />
+ <img src="./template/yoga/theme/category_representant_random.png" alt="{lang:Random picture}" class="miniature" />
<!-- END random -->
</td>
<td>
diff --git a/template/yoga/admin/group_list.tpl b/template/yoga/admin/group_list.tpl
index 4344c10da..480307d2f 100644
--- a/template/yoga/admin/group_list.tpl
+++ b/template/yoga/admin/group_list.tpl
@@ -19,8 +19,8 @@
<td>{group.NAME}</td>
<td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td>
<td style="text-align:center;">
- <a href="{group.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
- <a href="{group.U_DELETE}"><img src="./template/default/theme/delete.png" style="border:none" alt="delete" title="{lang:delete}" /></a>
+ <a href="{group.U_PERM}"><img src="./template/yoga/theme/permissions.png" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
+ <a href="{group.U_DELETE}"><img src="./template/yoga/theme/delete.png" style="border:none" alt="delete" title="{lang:delete}" /></a>
</td>
</tr>
<!-- END group -->
diff --git a/template/yoga/admin/picture_modify.tpl b/template/yoga/admin/picture_modify.tpl
index 46abed7b0..44564486a 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/yoga/admin/picture_modify.tpl
@@ -5,9 +5,9 @@
<ul class="categoryActions">
<!-- BEGIN jumpto -->
- <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="./template/default/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
+ <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="./template/yoga/theme/category_jump-to.png" alt="{lang:jump to}" /></a></li>
<!-- END jumpto -->
- <li><a href="{U_SYNC}" title="{lang:synchronize metadata}"><img src="./template/default/theme/sync_metadata.png" alt="{lang:synchronize}" /></a></li>
+ <li><a href="{U_SYNC}" title="{lang:synchronize metadata}"><img src="./template/yoga/theme/sync_metadata.png" alt="{lang:synchronize}" /></a></li>
</ul>
<form action="{F_ACTION}" method="post" id="properties">
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index ad6b18678..67e8b131b 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -85,7 +85,7 @@
<td>{user.EMAIL}</td>
<td>{user.GROUPS}</td>
<td style="text-align:center;">
- <a href="{user.U_PERM}"><img src="./template/default/theme/permissions.png" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
+ <a href="{user.U_PERM}"><img src="./template/yoga/theme/permissions.png" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
</td>
</tr>
<!-- END user -->
diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 96744606d..d728e8856 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -94,10 +94,10 @@
<ul class="categoryActions">
<li>&nbsp;</li>
<!-- BEGIN caddie -->
- <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" alt="{lang:caddie}"/></a></li>
+ <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="./template/yoga/theme/caddie_add.png" alt="{lang:caddie}"/></a></li>
<!-- END caddie -->
<!-- BEGIN edit -->
- <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="./template/default/theme/category_edit.png" alt="{lang:edit}"/></a></li>
+ <li><a href="{edit.URL}" title="{lang:edit category informations}"><img src="./template/yoga/theme/category_edit.png" alt="{lang:edit}"/></a></li>
<!-- END edit -->
</ul>
<h2>{TITLE}</h2>
diff --git a/template/yoga/picture.tpl b/template/yoga/picture.tpl
index 98704466c..8aecc0262 100644
--- a/template/yoga/picture.tpl
+++ b/template/yoga/picture.tpl
@@ -26,7 +26,7 @@
<a href="{U_ADMIN}" title="{L_ADMIN}"><img src="template/yoga/theme/preferences.png" alt="{L_ADMIN}"></a>
<!-- END admin -->
<!-- BEGIN caddie -->
- <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="./template/default/theme/caddie_add.png" alt="{lang:caddie}"/></a>
+ <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="./template/yoga/theme/caddie_add.png" alt="{lang:caddie}"/></a>
<!-- END caddie -->
</div>