<?php echo htmlspecialchars($feedtitle); ?>

Options
+ + + + +	sslSerial); ?>	sslName); ?>	sslEmail); ?>	sslClientIssuerDn); ?>

	+ + +
	+ +
+

	+ + +
	+ +
+


+

	<?php echo $description['tDescription']; ?>
	+ + +

Options
- - - - -	sslSerial); ?>	sslName); ?>	sslEmail); ?>	sslClientIssuerDn); ?>

	- - -
	- -
-

	- - -
	- -
-


-

- - diff --git a/data/templates/tag2tagadd.tpl.php b/data/templates/tag2tagadd.tpl.php deleted file mode 100644 index 9482007..0000000 --- a/data/templates/tag2tagadd.tpl.php +++ /dev/null @@ -1,57 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -0) { -echo T_("Existing links:"); -foreach($links as $link) { - echo ''; - if($link['tag1'] == $tag1 || $link['tag1'] == $tag2) { - $textTag1 = ''.$tag1.''; - } else { - $textTag1 = $link['tag1']; - } - if($link['tag2'] == $tag1 || $link['tag2'] == $tag2) { - $textTag2 = ''.$tag2.''; - } else { - $textTag2 = $link['tag2']; - } - - echo $textTag1.' '.$link['relationType'].' '.$textTag2; - echo " "; -} -} else { - echo T_('No links'); -} - -$this->includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/tag2tagdelete.tpl.php b/data/templates/tag2tagdelete.tpl.php deleted file mode 100644 index 8018374..0000000 --- a/data/templates/tag2tagdelete.tpl.php +++ /dev/null @@ -1,49 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -0) { -echo T_("Existing links:"); -foreach($links as $link) { - echo ''; - if($link['tag1'] == $tag1 || $link['tag1'] == $tag2) { - $textTag1 = ''.$tag1.''; - } else { - $textTag1 = $link['tag1']; - } - if($link['tag2'] == $tag1 || $link['tag2'] == $tag2) { - $textTag2 = ''.$tag2.''; - } else { - $textTag2 = $link['tag2']; - } - - echo $textTag1.' '.$link['relationType'].' '.$textTag2; - echo " "; -} -} else { - echo T_('No links'); -} - -$this->includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/tag2tagedit.tpl.php b/data/templates/tag2tagedit.tpl.php deleted file mode 100644 index 4745ad2..0000000 --- a/data/templates/tag2tagedit.tpl.php +++ /dev/null @@ -1,73 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -

- - - -

- -0) { -echo T_("Existing links:"); -foreach($links as $link) { - echo ''; - if($link['tag1'] == $tag1 || $link['tag1'] == $tag2) { - $textTag1 = ''.$tag1.''; - } else { - $textTag1 = $link['tag1']; - } - if($link['tag2'] == $tag1 || $link['tag2'] == $tag2) { - $textTag2 = ''.$tag2.''; - } else { - $textTag2 = $link['tag2']; - } - - echo $textTag1.' '.$link['relationType'].' '.$textTag2; - echo " "; -} -} else { - echo T_('No links'); -} - -$this->includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/tagcommondescriptionedit.tpl.php b/data/templates/tagcommondescriptionedit.tpl.php deleted file mode 100644 index 207cfd2..0000000 --- a/data/templates/tagcommondescriptionedit.tpl.php +++ /dev/null @@ -1,48 +0,0 @@ -includeTemplate($GLOBALS['top_include']); - -?> - -

- - - - - - - - - - - - - - - -

	<?php echo $description['cdDescription']; ?>
	- 0) { - echo T_('Last modification:').' '.$description['cdDatetime'].', '; - $lastUser = $userservice->getUser($description['uId']); - echo '' - . SemanticScuttle_Model_UserArray::getName($lastUser) . ''; - } - ?> -
	- - -

- - -

- -

	<?php echo $description['tDescription']; ?>
	- - -

- -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/tagdelete.tpl.php b/data/templates/tagdelete.tpl.php deleted file mode 100644 index e787ff5..0000000 --- a/data/templates/tagdelete.tpl.php +++ /dev/null @@ -1,20 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/tagedit.tpl.php b/data/templates/tagedit.tpl.php deleted file mode 100644 index 860c933..0000000 --- a/data/templates/tagedit.tpl.php +++ /dev/null @@ -1,33 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/tagrename.tpl.php b/data/templates/tagrename.tpl.php deleted file mode 100644 index 894b964..0000000 --- a/data/templates/tagrename.tpl.php +++ /dev/null @@ -1,41 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - - -includeTemplate($GLOBALS['bottom_include']); -?> \ No newline at end of file diff --git a/data/templates/tags.tpl.php b/data/templates/tags.tpl.php deleted file mode 100644 index d6259cc..0000000 --- a/data/templates/tags.tpl.php +++ /dev/null @@ -1,31 +0,0 @@ -includeTemplate($GLOBALS['top_include']); -?> - - 0) { -?> - -

- - / - -

- -'. filter($row['tag']) .' '; -} -echo $contents ."\n"; -?> - -

- -includeTemplate('sidebar.tpl'); -$this->includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/data/templates/testdummy/top.inc.php b/data/templates/testdummy/top.inc.php new file mode 100644 index 0000000..7b0874c --- /dev/null +++ b/data/templates/testdummy/top.inc.php @@ -0,0 +1,66 @@ + + + + + + <?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' » ' . $pagetitle : '')); ?> + + + +'; + } +} +?> + + + + + + + + + + + + + + + + + + + +'. $subtitle ."\n"; +} +if(DEBUG_MODE) { + echo '

'. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.php.') ."

\n"; +} +if (isset($error) && $error!='') { + echo '

'. $error ."

\n"; +} +if (isset($msg) && $msg!='') { + echo '

'. $msg ."

\n"; +} +if (isset($tipMsg) && $tipMsg!='') { + echo '

'. $tipMsg ."

\n"; +} +?> diff --git a/data/templates/toolbar.inc.php b/data/templates/toolbar.inc.php deleted file mode 100644 index fb6638d..0000000 --- a/data/templates/toolbar.inc.php +++ /dev/null @@ -1,37 +0,0 @@ -isLoggedOn() && is_object($currentUser)) { - $cUserId = $userservice->getCurrentUserId(); - $cUsername = $currentUser->getUsername(); -?> - - - - - - - diff --git a/data/templates/top.inc.php b/data/templates/top.inc.php deleted file mode 100644 index bdd4b1a..0000000 --- a/data/templates/top.inc.php +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - <?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' » ' . $pagetitle : '')); ?> - - - -'; - } -} -?> - - - - - - - - - - - - - - - - - - - -'. $subtitle ."\n"; -} -if(DEBUG_MODE) { - echo '

'. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.php.') ."

\n"; -} -if (isset($error) && $error!='') { - echo '

'. $error ."

\n"; -} -if (isset($msg) && $msg!='') { - echo '

'. $msg ."

\n"; -} -if (isset($tipMsg) && $tipMsg!='') { - echo '

'. $tipMsg ."

\n"; -} -?> diff --git a/data/templates/users.tpl.php b/data/templates/users.tpl.php deleted file mode 100644 index fa92bef..0000000 --- a/data/templates/users.tpl.php +++ /dev/null @@ -1,33 +0,0 @@ -includeTemplate($GLOBALS['top_include']); - -if ($users && count($users) > 0) { -?> - - -

' - . SemanticScuttle_Model_UserArray::getName($row) . '

' - . T_('profile') . '

' - . T_('bookmarks') . '

- -includeTemplate($GLOBALS['bottom_include']); -?> diff --git a/doc/ChangeLog b/doc/ChangeLog index 8fa208c..ade19af 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,6 +1,9 @@ ChangeLog for SemantiScuttle ============================ +- Implement request #1989987: Theming support + + 0.98.0 - 2011-XX-XX ------------------- - Switch to jQuery and drop dojo diff --git a/doc/themes.rst b/doc/themes.rst new file mode 100644 index 0000000..6f34a36 --- /dev/null +++ b/doc/themes.rst @@ -0,0 +1,48 @@ +====================== +SemanticScuttle Themes +====================== +SemanticScuttle may be changed visually by supplying custom "themes" (skins) +that modify the visual appearance. + + +Changing the current theme +========================== +In ``data/config.php``, set your theme like this: :: + + $theme = 'darkmood'; + +The available themes are the folders in ``www/themes/``. +By default, SemanticScuttle ships only one usable theme ("default") and one +to demonstrate how to create your own theme ("testdummy"). + + +Creating your own theme +======================= +Have a look at the "testdummy" theme in ``www/themes/testdummy/``. + +CSS and image files +------------------- +Since both file types need to be accessible via the web server directly, +they are located in the ``www/`` folder: :: + + www/themes/$themename/ + +The main CSS file that automatically gets included is :: + + www/themes/$themename/scuttle.css + +Several template files in SemanticScuttle include image files. If they do not +exist in your theme, the default ones are used automatically. +Note that this is not true for images that are specified in the CSS files. + + +Template files +-------------- +The templates of the default file are located in :: + + data/templates/default/ + +You may put your theme template files into :: + + data/templates/$themename/ + diff --git a/src/SemanticScuttle/Model/Template.php b/src/SemanticScuttle/Model/Template.php index ff5fbbe..234e23f 100644 --- a/src/SemanticScuttle/Model/Template.php +++ b/src/SemanticScuttle/Model/Template.php @@ -76,6 +76,9 @@ class SemanticScuttle_Model_Template * Sets variables and includes the template file, * causing it to be rendered. * + * Does not take care of themes and so. + * The include path must be set so the correct theme is used. + * * @return void */ public function parse() diff --git a/src/SemanticScuttle/Model/Theme.php b/src/SemanticScuttle/Model/Theme.php new file mode 100644 index 0000000..65861b8 --- /dev/null +++ b/src/SemanticScuttle/Model/Theme.php @@ -0,0 +1,97 @@ + + * @license AGPL v3 or later http://www.gnu.org/licenses/agpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ + +/** + * A theme, the visual representation of SemanticScuttle. + * + * @category Bookmarking + * @package SemanticScuttle + * @author Christian Weiske + * @license AGPL v3 or later http://www.gnu.org/licenses/agpl.html + * @link http://sourceforge.net/projects/semanticscuttle + */ +class SemanticScuttle_Model_Theme +{ + /** + * Theme name. Also the path part of template and resource files + * + * @var string + */ + protected $name = null; + + /** + * Local path to the www themes directory. + * Needs to have a trailing slash. + * + * @var string + */ + protected $wwwThemeDir = null; + + + + /** + * Create a new theme instance. + * + * @param string $name Theme name "data/templates/(*)/" + */ + public function __construct($name = 'default') + { + $this->name = $name; + $this->wwwThemeDir = $GLOBALS['wwwdir'] . '/themes/'; + //TODO: implement theme hierarchies with parent fallback + } + + + + /** + * Returns the URL path to a resource file (www/themes/$name/$file). + * Automatically falls back to the parent theme if the file does not exist + * in the theme. + * + * Must always be used when adding i.e. images to the output. + * + * @param string $file File name to find the path for, i.e. "scuttle.css". + * + * @return string Full path + */ + public function resource($file) + { + $themeFile = $this->wwwThemeDir . $this->name . '/' . $file; + if (file_exists($themeFile)) { + return ROOT . 'themes/' . $this->name . '/' . $file; + } + + $defaultFile = $this->wwwThemeDir . 'default/' . $file; + if (file_exists($defaultFile)) { + return ROOT . 'themes/default/' . $file; + } + + //file does not exist. fall back to the theme file + // to guide the theme author a bit. + // TODO: logging. in admin mode, there should be a message + return ROOT . 'themes/' . $this->name . '/' . $file; + } + + + + /** + * Returns the theme name. + * + * @return string Theme name + */ + public function getName() + { + return $this->name; + } +} +?> \ No newline at end of file diff --git a/src/SemanticScuttle/Service/Template.php b/src/SemanticScuttle/Service/Template.php index efa8d28..b5d4cfa 100644 --- a/src/SemanticScuttle/Service/Template.php +++ b/src/SemanticScuttle/Service/Template.php @@ -14,6 +14,7 @@ */ require_once 'SemanticScuttle/Model/Template.php'; +require_once 'SemanticScuttle/Model/Theme.php'; /** * SemanticScuttle template service. @@ -38,6 +39,14 @@ class SemanticScuttle_Service_Template extends SemanticScuttle_Service */ protected $basedir; + /** + * The template theme to use. + * Set in constructor based on $GLOBALS['theme'] + * + * @var SemanticScuttle_Model_Theme + */ + protected $theme; + /** @@ -64,6 +73,8 @@ class SemanticScuttle_Service_Template extends SemanticScuttle_Service protected function __construct() { $this->basedir = $GLOBALS['TEMPLATES_DIR']; + $this->theme = new SemanticScuttle_Model_Theme($GLOBALS['theme']); + //FIXME: verify the theme exists } @@ -74,19 +85,33 @@ class SemanticScuttle_Service_Template extends SemanticScuttle_Service * @param string $template Template filename relative * to template dir * @param array $vars Array of template variables. + * The current theme object will be added + * automatically with name "theme". * * @return SemanticScuttle_Model_Template Template object */ - function loadTemplate($template, $vars = null) + public function loadTemplate($template, $vars = null) { if (substr($template, -4) != '.php') { $template .= '.php'; } + + $oldIncPath = get_include_path(); + set_include_path( + $this->basedir . $this->theme->getName() + . PATH_SEPARATOR . $this->basedir . 'default' + //needed since services are instantiated in templates + . PATH_SEPARATOR . $oldIncPath + ); + + $vars['theme'] = $this->theme; $tpl = new SemanticScuttle_Model_Template( - $this->basedir .'/'. $template, $vars, $this + $template, $vars, $this ); $tpl->parse(); + set_include_path($oldIncPath); + return $tpl; } } diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index 098e5c3..6c0d4df 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -18,9 +18,12 @@ if ('@data_dir@' == '@' . 'data_dir@') { //non pear-install $datadir = dirname(__FILE__) . '/../../data/'; + $wwwdir = dirname(__FILE__) . '/../../www/'; } else { //pear installation; files are in include path $datadir = '@data_dir@/SemanticScuttle/'; + //FIXME: when you have multiple installations, the www_dir will be wrong + $wwwdir = '@www_dir@/SemanticScuttle/'; } if (!file_exists($datadir . '/config.php')) { diff --git a/www/icon.png b/www/icon.png deleted file mode 100644 index be864a7..0000000 Binary files a/www/icon.png and /dev/null differ diff --git a/www/images/b_edit.png b/www/images/b_edit.png deleted file mode 100644 index 05711a0..0000000 Binary files a/www/images/b_edit.png and /dev/null differ diff --git a/www/images/bg_admin.png b/www/images/bg_admin.png deleted file mode 100644 index c707779..0000000 Binary files a/www/images/bg_admin.png and /dev/null differ diff --git a/www/images/bg_bar.png b/www/images/bg_bar.png deleted file mode 100644 index 7152ba1..0000000 Binary files a/www/images/bg_bar.png and /dev/null differ diff --git a/www/images/bg_header.png b/www/images/bg_header.png deleted file mode 100644 index 6fa4161..0000000 Binary files a/www/images/bg_header.png and /dev/null differ diff --git a/www/images/bg_sidebar.png b/www/images/bg_sidebar.png deleted file mode 100644 index 0edb153..0000000 Binary files a/www/images/bg_sidebar.png and /dev/null differ diff --git a/www/images/loading.gif b/www/images/loading.gif deleted file mode 100644 index 859126e..0000000 Binary files a/www/images/loading.gif and /dev/null differ diff --git a/www/images/logo.png b/www/images/logo.png deleted file mode 100644 index 4afe565..0000000 Binary files a/www/images/logo.png and /dev/null differ diff --git a/www/images/logo_24.gif b/www/images/logo_24.gif deleted file mode 100644 index d5af64d..0000000 Binary files a/www/images/logo_24.gif and /dev/null differ diff --git a/www/images/rss.gif b/www/images/rss.gif deleted file mode 100644 index 094ba10..0000000 Binary files a/www/images/rss.gif and /dev/null differ diff --git a/www/images/thumbs_up.orig.png b/www/images/thumbs_up.orig.png deleted file mode 100644 index 1a89d0e..0000000 Binary files a/www/images/thumbs_up.orig.png and /dev/null differ diff --git a/www/images/vote-against-voted.png b/www/images/vote-against-voted.png deleted file mode 100644 index 740dfc8..0000000 Binary files a/www/images/vote-against-voted.png and /dev/null differ diff --git a/www/images/vote-against.png b/www/images/vote-against.png deleted file mode 100644 index f15ea4d..0000000 Binary files a/www/images/vote-against.png and /dev/null differ diff --git a/www/images/vote-for-voted.png b/www/images/vote-for-voted.png deleted file mode 100644 index 5abd43e..0000000 Binary files a/www/images/vote-for-voted.png and /dev/null differ diff --git a/www/images/vote-for.png b/www/images/vote-for.png deleted file mode 100644 index 5973ae9..0000000 Binary files a/www/images/vote-for.png and /dev/null differ diff --git a/www/jsScuttle.php b/www/jsScuttle.php index c166755..5e5f31b 100644 --- a/www/jsScuttle.php +++ b/www/jsScuttle.php @@ -3,6 +3,7 @@ $GLOBALS['saveInLastUrl'] = false; $httpContentType = 'text/javascript'; require_once 'www-header.php'; require_once 'SemanticScuttle/functions.php'; +$theme = new SemanticScuttle_Model_Theme($GLOBALS['theme']); $player_root = ROOT .'includes/player/'; ?> @@ -62,7 +63,7 @@ function isAvailable(input, response){ username = username.trim(); var availability = document.getElementById("availability"); if (username != '') { - usernameField.style.backgroundImage = 'url(images/loading.gif)'; + usernameField.style.backgroundImage = 'url(resource('images/loading.gif'); ?>)'; if (response != '') { usernameField.style.backgroundImage = 'none'; if (response == 'true') { @@ -92,7 +93,7 @@ function useAddress(ele) { function getTitle(input, response){ var title = document.getElementById('titleField'); if (title.value == '') { - title.style.backgroundImage = 'url(images/loading.gif)'; + title.style.backgroundImage = 'url(resource('images/loading.gif');?>)'; if (response != null) { title.style.backgroundImage = 'none'; title.value = response; diff --git a/www/scuttle.css b/www/scuttle.css deleted file mode 100644 index 9e87857..0000000 --- a/www/scuttle.css +++ /dev/null @@ -1,657 +0,0 @@ -/* Watch out. This file bugs (in the header) when it is formated with Eclipse (Ctrl+Shift+F)*/ - -/* BASE */ - -* { - font-family: "trebuchet ms", tahoma, sans-serif; -} -a { - color: #47A; - text-decoration: none; -} -a:hover { - color: #258; - text-decoration: underline; -} -a img { - border: 0; -} - - -body { - margin: 0; - padding: 0; -} -input[type=text], -input[type=password], -select, -textarea { - border: 1px solid #AAA; - padding: 0.1em; -} -input[type=text], -input[type=password], -textarea { - padding: 0.2em; -} -input[type=text]:focus, -input[type=password]:focus, -select:focus, -textarea:focus { - border-color: #666; -} -p.tipMsg, -p.error, -p.success { - border: 1px solid; - font-size: small; - margin: 0.5em; - padding: 0.5em; - width: 70%; -} -p.tipMsg { - background: #FFFF99; - border-color: #CC9900; - color: #CC9900; -} -p.error { - background: #FCC; - border-color: #966; - color: #633; -} -p.success { - background: #CFC; - border-color: #696; - color: #363; -} -td#availability { - color: #285; - font-weight: bold; -} -td#availability.not-available { - color: #F00; -} -textarea { - font-size: small; - padding: 0.2em; -} -th { - padding-right: 1em; - text-align: right; -} - -/* HEADER */ - -div#header { - background: #FFF url('images/bg_header.png') bottom repeat-x; - border-bottom: 3px solid #9CD; - clear: both; -} -div#header:after { - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; -} -* html div#header { - height: 1%; -} -h1 { - float: left; - font-size: x-large; - font-weight: bold; - letter-spacing: 0.25em; - margin: 0; - padding: 1em; -} -html > body h1 { - background: url('images/logo.png') no-repeat 10px; - padding-left: 75px; -} -html > body div#header.popup h1 { - background: url('images/logo_24.gif') no-repeat 10px; - padding: 0.5em 0.5em 0.5em 50px; -} -/*html > body div#header #welcome { - position:absolute; - left:75px; -}*/ -#welcome { - border: 10px solid #995; - width: 66%; - padding: 10px; - text-align:center; - font-size: medium; -} -#bottom { - padding-top: 10px; - text-align: center; - font-size: xx-small; -} -h1 a { - color: #000; -} -h1 a:hover { - color: #000; -} -h2 { - background: #666 url('images/bg_bar.png') center center repeat-x; - border-bottom: 3px solid #DDD; - clear: both; - color: #FFF; - font-size: medium; - letter-spacing: 0.1em; - margin: 0 0 1em 0; - padding: 0.5em 1em; -} -h2 a, h2 a:hover { - color: #DDD; -} - -/*sup { - color: #77ABE0; - font-weight: bold; -}*/ - -/* NAVIGATION */ - -ul#navigation { - list-style-type: none; - margin: 0; - padding: 1.75em 1em; - width: auto; -} -ul#navigation a { - font-size: medium; - font-weight: bold; - padding: 0.2em 0.5em; -} -ul#navigation a:hover { - background: #7AD; - color: #FFF; -} -ul#navigation li { - float: left; -} -ul#navigation li.access { - float: right; -} - -/* BOOKMARKS */ - -ol#bookmarks { - list-style-type: none; - margin: 0; - padding: 0 1em; - width: 70%; -} -html > body ol#bookmarks { - margin: 0 1em; - padding: 0; -} -img.thumbnail { - float: left; - padding: 1px; - margin-right: 6px; - margin-bottom:4px; - cursor:pointer; - border:1px solid #AAA; -} -div.link a { - color: blue; - font-size: medium; -} -div.link a:visited { - color: purple; -} -div.address { - color: #285; -} -div.meta { - color: #285; -} -div.meta span { - color: #F00; -} -div.privateNote { - font-variant: small-caps; - font-size: small; - text-align: right; -} -li.xfolkentry { - border-bottom: 1px solid #DDD; - margin-bottom: 0; - padding: 1em 0.5em; -} -html > body li.xfolkentry { - border-bottom: 1px dotted #AAA; -} -li.xfolkentry div { - padding: 0.1em; -} -li.xfolkentry.deleted { - opacity: 0.5; -} -li.xfolkentry.private { - border-left: 3px solid #F00; -} -li.xfolkentry.shared { - border-left: 3px solid #FA0; -} -li.below-threshold > div { - border-right: 5px dotted #F00; -} - -li.xfolkentry div div.description span.anchorBookmark { - /*font-family:monospace;*/ -} - -/* bookmark voting */ -.vote-badge { - float: left; - width: 3em; - margin: 5px; - border: 1px solid #CCCC88; - font-weight: bold; - /*border-radius: 10px;*/ - -moz-border-radius: 10px; -} -.vote-badge span, .vote-badge a { - display: block; - text-align: center; -} -.vote-badge a:hover { - text-decoration: none; -} -.vote-badge .vote-for { - /*border-top-right-radius: 10px;*/ - /*border-top-left-radius: 10px;*/ - -moz-border-radius-topright: 10px; - -moz-border-radius-topleft: 10px; -} -.vote-badge .vote-against { - /*border-bottom-right-radius: 10px;*/ - /*border-bottom-left-radius: 10px;*/ - -moz-border-radius-bottomright: 10px; - -moz-border-radius-bottomleft: 10px; -} -.vote-badge a.vote-for:hover { - background-color: #ccffbb; -} -.vote-badge a.vote-against:hover { - background-color: #ffcccc; -} -.vote-badge-for .vote-for-inactive { - color: transparent; - background-color: #ccffbb; -} -.vote-badge-against .vote-against-inactive { - color: transparent; - background-color: #ffcccc; -} - -/* bookmark voting horizontal */ -div.vote-horiz .voting { - font-weight: bold; -} -li.xfolkentry div.vote-horiz-for { -/* border-left: 1em solid #ccffbb;*/ -/* padding-left: 0.5em;*/ -} -li.xfolkentry div.vote-horiz-against { -/* border-left: 1em solid #ffcccc;*/ -/* padding-left: 0.5em;*/ -} -.vote-horiz a, .vote-horiz .vote-for-inactive, -.vote-horiz .vote-against-inactive { - padding-left: 1.5em; - margin-left: 0.7em; -} -.vote-horiz a.vote-for:hover { - background-color: #ccffbb; -} -.vote-horiz a.vote-against:hover { - background-color: #ffcccc; -} -.vote-horiz .vote-for-inactive, .vote-horiz .vote-against-inactive { - color: #AAA; -} -.vote-horiz .vote-for { - background: url(images/vote-for.png) no-repeat; -} -.vote-horiz .vote-against { - background: url(images/vote-against.png) no-repeat; -} -.vote-horiz .vote-for-inactive { - background: url(images/vote-for-voted.png) no-repeat; -} -.vote-horiz .vote-against-inactive { - background: url(images/vote-against-voted.png) no-repeat; -} - - -/* SIDEBAR */ - -div#sidebar { - font-size: small; - position: absolute; - right: 1em; - top: 10em; - width: 25%; -} -div#sidebar a { - color: #995; -} -div#sidebar a:hover { - color: #773; -} -div#sidebar>div { - background: #FFF url('images/bg_sidebar.png') bottom repeat-x; - border: 1px solid #CC8; - color: #555; - margin-bottom: 1em; -} -div#sidebar h2 { - background: transparent; - border: 0; - color: #995; - letter-spacing: 0; - margin: 0; - padding: 0.5em 0; -} -div#sidebar hr { - display: none; -} -div#sidebar p { - margin: 1em; -} -div#sidebar p.tags a { - margin: 0; -} -div#sidebar table { - margin: 0.5em 0.5em 0 0.5em; -} -div#sidebar table td { - padding-bottom: 0.25em; - padding-right: 0.5em; -} -/* -div#sidebar ul { - list-style-type: none; - margin: 0; - padding: 0.5em; -} -div#sidebar ul li { - margin: 0.5em 0; -}*/ - -div#related { - padding: 0.5em; -} - -.crossTags { - padding:0px 3px; - border: 1px solid #999955 -} - -div#sidebar>div#maintagsmenu { - padding: 0.5em; - border: 5px solid #999955 -} - - - -/* TAGS */ - -p.commondescription { - padding-left:5px; - color: #555; - font-weight: bold; - font-size: medium; - border-left: 1px solid #CC8; - width: 70%; -} - -p.tags { - line-height: 2.25em; - /*margin: 2em 10%;*/ - text-align: justify; - vertical-align: middle; - width: 70%; -} -p.tags a, -p.tags span { - color: #47A; - margin-right: 0.5em; -} -p.tags span:hover { - cursor: pointer; - text-decoration: underline; -} -p.tags span.selected { - background: #CEC; -} - -.anchor { - cursor: pointer; - text-decoration: underline; -} - -.treeTag { - color: #999955; -} -.treeTag:hover { - cursor: pointer; - text-decoration: underline; -} -.treeTag.selected { - background: #CEC; -} - -/* PROFILE */ - -table.profile th { - width: 10em; -} - -table tr.ssl-current td { - background-color: #AFA; -} - -/* OTHER GUFF */ - -dd { - background: #CEC; - border-right: 4px solid #ACA; - color: #464; - padding: 6px; -} -dd a { - color: #464; -} -dd a:hover { - color: #000 !important; - text-decoration: underline !important; -} - -dl { - font-size: small; - margin: 1em; - width: 70%; -} -dl#profile dd { - background: #CDE; - border-color: #ABC; - color: #247; -} -dl#profile dt { - background: #BCE; - border-color: #9AC; - color: #245; - display: block; - font-weight: bold; - padding: 6px; -} -dl#profile a { - color: #446; -} -dl#profile a:hover { - color: #000 !important; - text-decoration: underline !important; -} -dl#meta dd { - line-height: 1.5em; -} -dl#meta dt { - background: #BDB; - color: #353; - display: block; - font-weight: bold; - padding: 6px; -} -dt { - border-right: 4px solid #9B9; -} -dt a { - background: #BDB; - color: #353; - display: block; - font-weight: bold; - padding: 6px; -} -dt a:hover { - background: #ACA; - border: 0; -} -form { - margin: 0; -} -form#search { - margin-right: 0.75em; - color: #CCC; - font-size: small; - float: right; - margin: 0; - position: absolute; - right: 0; - top: 6.4em; -} -form label, -form td, -form th { - font-size: small; -} -form table { - margin: 0 1em; -} -h3 { - background: #DDD; - color: #555; - font-size: small; - letter-spacing: 0.2em; - margin: 2em 1em 1em 1em; - padding: 0.25em 0.75em; -} -li { - font-size: small; - margin-bottom: 0.5em; -} -p { - font-size: small; - margin: 1em; -} -p#sort { - /*color: #CCC;*/ - font-size: small; - /*float: right;*/ - /*margin: 0;*/ - /*position: absolute;*/ - right: 0; - top: 7em; -} -html > body p#sort { - /*margin-right: 0.75em;*/ -} -p#sort a { - background: #AAA; - color: #555; - font-weight: normal; - margin-right: 0.5em; - padding: 0 1em; -} -html > body p#sort a { - margin-right: 0; -} -p#sort a:hover { - background: #CCC; - text-decoration: none !important; -} -p#sort span { - display: none; -} - -p.backToTop{ - text-align:center; -} - -p.paging { - font-size: small; - margin-left: 1em; - text-align:center; -} -p.paging a, -p.paging span.disable { - background: #888; - color: #FFF; - display: inline; - margin-right: 0.5em; - padding: 0.25em 1em; -} -p.paging a:hover { - background: #666; -} -p.paging span { - display: none; -} -p.paging span.disable { - background: #DDD; - color: #AAA; -} -div.collapsible p.tags { - line-height: 2.25em; - margin: 1em 2em; -} -th label { - padding-right: 1em; -} -ul { - margin-right: 1em; - width: 75%; -} - -.adminBackground { - /*background: #FFFFFF url(images/logo_24.png) no-repeat scroll center right;*/ - /*border-top: 1px solid; - border-color: #CC9900;*/ -} - -.adminBackground { - background: #FFF url('images/bg_admin.png') repeat-y top right; -} - -a.bookmarklet { - padding: 2px; - background-color: #AAFAEE; -} - -/* tree styles */ -#related-content.jstree-default.jstree-focused { - background: none !important; -} - - -/* add/edit bookmark */ -.ui-autocomplete { - width: 458px; -} diff --git a/www/themes/default/icon.png b/www/themes/default/icon.png new file mode 100644 index 0000000..be864a7 Binary files /dev/null and b/www/themes/default/icon.png differ diff --git a/www/themes/default/images/b_edit.png b/www/themes/default/images/b_edit.png new file mode 100644 index 0000000..05711a0 Binary files /dev/null and b/www/themes/default/images/b_edit.png differ diff --git a/www/themes/default/images/bg_admin.png b/www/themes/default/images/bg_admin.png new file mode 100644 index 0000000..c707779 Binary files /dev/null and b/www/themes/default/images/bg_admin.png differ diff --git a/www/themes/default/images/bg_bar.png b/www/themes/default/images/bg_bar.png new file mode 100644 index 0000000..7152ba1 Binary files /dev/null and b/www/themes/default/images/bg_bar.png differ diff --git a/www/themes/default/images/bg_header.png b/www/themes/default/images/bg_header.png new file mode 100644 index 0000000..6fa4161 Binary files /dev/null and b/www/themes/default/images/bg_header.png differ diff --git a/www/themes/default/images/bg_sidebar.png b/www/themes/default/images/bg_sidebar.png new file mode 100644 index 0000000..0edb153 Binary files /dev/null and b/www/themes/default/images/bg_sidebar.png differ diff --git a/www/themes/default/images/loading.gif b/www/themes/default/images/loading.gif new file mode 100644 index 0000000..859126e Binary files /dev/null and b/www/themes/default/images/loading.gif differ diff --git a/www/themes/default/images/logo.png b/www/themes/default/images/logo.png new file mode 100644 index 0000000..4afe565 Binary files /dev/null and b/www/themes/default/images/logo.png differ diff --git a/www/themes/default/images/logo_24.gif b/www/themes/default/images/logo_24.gif new file mode 100644 index 0000000..d5af64d Binary files /dev/null and b/www/themes/default/images/logo_24.gif differ diff --git a/www/themes/default/images/rss.gif b/www/themes/default/images/rss.gif new file mode 100644 index 0000000..094ba10 Binary files /dev/null and b/www/themes/default/images/rss.gif differ diff --git a/www/themes/default/images/thumbs_up.orig.png b/www/themes/default/images/thumbs_up.orig.png new file mode 100644 index 0000000..1a89d0e Binary files /dev/null and b/www/themes/default/images/thumbs_up.orig.png differ diff --git a/www/themes/default/images/vote-against-voted.png b/www/themes/default/images/vote-against-voted.png new file mode 100644 index 0000000..740dfc8 Binary files /dev/null and b/www/themes/default/images/vote-against-voted.png differ diff --git a/www/themes/default/images/vote-against.png b/www/themes/default/images/vote-against.png new file mode 100644 index 0000000..f15ea4d Binary files /dev/null and b/www/themes/default/images/vote-against.png differ diff --git a/www/themes/default/images/vote-for-voted.png b/www/themes/default/images/vote-for-voted.png new file mode 100644 index 0000000..5abd43e Binary files /dev/null and b/www/themes/default/images/vote-for-voted.png differ diff --git a/www/themes/default/images/vote-for.png b/www/themes/default/images/vote-for.png new file mode 100644 index 0000000..5973ae9 Binary files /dev/null and b/www/themes/default/images/vote-for.png differ diff --git a/www/themes/default/scuttle.css b/www/themes/default/scuttle.css new file mode 100644 index 0000000..9e87857 --- /dev/null +++ b/www/themes/default/scuttle.css @@ -0,0 +1,657 @@ +/* Watch out. This file bugs (in the header) when it is formated with Eclipse (Ctrl+Shift+F)*/ + +/* BASE */ + +* { + font-family: "trebuchet ms", tahoma, sans-serif; +} +a { + color: #47A; + text-decoration: none; +} +a:hover { + color: #258; + text-decoration: underline; +} +a img { + border: 0; +} + + +body { + margin: 0; + padding: 0; +} +input[type=text], +input[type=password], +select, +textarea { + border: 1px solid #AAA; + padding: 0.1em; +} +input[type=text], +input[type=password], +textarea { + padding: 0.2em; +} +input[type=text]:focus, +input[type=password]:focus, +select:focus, +textarea:focus { + border-color: #666; +} +p.tipMsg, +p.error, +p.success { + border: 1px solid; + font-size: small; + margin: 0.5em; + padding: 0.5em; + width: 70%; +} +p.tipMsg { + background: #FFFF99; + border-color: #CC9900; + color: #CC9900; +} +p.error { + background: #FCC; + border-color: #966; + color: #633; +} +p.success { + background: #CFC; + border-color: #696; + color: #363; +} +td#availability { + color: #285; + font-weight: bold; +} +td#availability.not-available { + color: #F00; +} +textarea { + font-size: small; + padding: 0.2em; +} +th { + padding-right: 1em; + text-align: right; +} + +/* HEADER */ + +div#header { + background: #FFF url('images/bg_header.png') bottom repeat-x; + border-bottom: 3px solid #9CD; + clear: both; +} +div#header:after { + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; +} +* html div#header { + height: 1%; +} +h1 { + float: left; + font-size: x-large; + font-weight: bold; + letter-spacing: 0.25em; + margin: 0; + padding: 1em; +} +html > body h1 { + background: url('images/logo.png') no-repeat 10px; + padding-left: 75px; +} +html > body div#header.popup h1 { + background: url('images/logo_24.gif') no-repeat 10px; + padding: 0.5em 0.5em 0.5em 50px; +} +/*html > body div#header #welcome { + position:absolute; + left:75px; +}*/ +#welcome { + border: 10px solid #995; + width: 66%; + padding: 10px; + text-align:center; + font-size: medium; +} +#bottom { + padding-top: 10px; + text-align: center; + font-size: xx-small; +} +h1 a { + color: #000; +} +h1 a:hover { + color: #000; +} +h2 { + background: #666 url('images/bg_bar.png') center center repeat-x; + border-bottom: 3px solid #DDD; + clear: both; + color: #FFF; + font-size: medium; + letter-spacing: 0.1em; + margin: 0 0 1em 0; + padding: 0.5em 1em; +} +h2 a, h2 a:hover { + color: #DDD; +} + +/*sup { + color: #77ABE0; + font-weight: bold; +}*/ + +/* NAVIGATION */ + +ul#navigation { + list-style-type: none; + margin: 0; + padding: 1.75em 1em; + width: auto; +} +ul#navigation a { + font-size: medium; + font-weight: bold; + padding: 0.2em 0.5em; +} +ul#navigation a:hover { + background: #7AD; + color: #FFF; +} +ul#navigation li { + float: left; +} +ul#navigation li.access { + float: right; +} + +/* BOOKMARKS */ + +ol#bookmarks { + list-style-type: none; + margin: 0; + padding: 0 1em; + width: 70%; +} +html > body ol#bookmarks { + margin: 0 1em; + padding: 0; +} +img.thumbnail { + float: left; + padding: 1px; + margin-right: 6px; + margin-bottom:4px; + cursor:pointer; + border:1px solid #AAA; +} +div.link a { + color: blue; + font-size: medium; +} +div.link a:visited { + color: purple; +} +div.address { + color: #285; +} +div.meta { + color: #285; +} +div.meta span { + color: #F00; +} +div.privateNote { + font-variant: small-caps; + font-size: small; + text-align: right; +} +li.xfolkentry { + border-bottom: 1px solid #DDD; + margin-bottom: 0; + padding: 1em 0.5em; +} +html > body li.xfolkentry { + border-bottom: 1px dotted #AAA; +} +li.xfolkentry div { + padding: 0.1em; +} +li.xfolkentry.deleted { + opacity: 0.5; +} +li.xfolkentry.private { + border-left: 3px solid #F00; +} +li.xfolkentry.shared { + border-left: 3px solid #FA0; +} +li.below-threshold > div { + border-right: 5px dotted #F00; +} + +li.xfolkentry div div.description span.anchorBookmark { + /*font-family:monospace;*/ +} + +/* bookmark voting */ +.vote-badge { + float: left; + width: 3em; + margin: 5px; + border: 1px solid #CCCC88; + font-weight: bold; + /*border-radius: 10px;*/ + -moz-border-radius: 10px; +} +.vote-badge span, .vote-badge a { + display: block; + text-align: center; +} +.vote-badge a:hover { + text-decoration: none; +} +.vote-badge .vote-for { + /*border-top-right-radius: 10px;*/ + /*border-top-left-radius: 10px;*/ + -moz-border-radius-topright: 10px; + -moz-border-radius-topleft: 10px; +} +.vote-badge .vote-against { + /*border-bottom-right-radius: 10px;*/ + /*border-bottom-left-radius: 10px;*/ + -moz-border-radius-bottomright: 10px; + -moz-border-radius-bottomleft: 10px; +} +.vote-badge a.vote-for:hover { + background-color: #ccffbb; +} +.vote-badge a.vote-against:hover { + background-color: #ffcccc; +} +.vote-badge-for .vote-for-inactive { + color: transparent; + background-color: #ccffbb; +} +.vote-badge-against .vote-against-inactive { + color: transparent; + background-color: #ffcccc; +} + +/* bookmark voting horizontal */ +div.vote-horiz .voting { + font-weight: bold; +} +li.xfolkentry div.vote-horiz-for { +/* border-left: 1em solid #ccffbb;*/ +/* padding-left: 0.5em;*/ +} +li.xfolkentry div.vote-horiz-against { +/* border-left: 1em solid #ffcccc;*/ +/* padding-left: 0.5em;*/ +} +.vote-horiz a, .vote-horiz .vote-for-inactive, +.vote-horiz .vote-against-inactive { + padding-left: 1.5em; + margin-left: 0.7em; +} +.vote-horiz a.vote-for:hover { + background-color: #ccffbb; +} +.vote-horiz a.vote-against:hover { + background-color: #ffcccc; +} +.vote-horiz .vote-for-inactive, .vote-horiz .vote-against-inactive { + color: #AAA; +} +.vote-horiz .vote-for { + background: url(images/vote-for.png) no-repeat; +} +.vote-horiz .vote-against { + background: url(images/vote-against.png) no-repeat; +} +.vote-horiz .vote-for-inactive { + background: url(images/vote-for-voted.png) no-repeat; +} +.vote-horiz .vote-against-inactive { + background: url(images/vote-against-voted.png) no-repeat; +} + + +/* SIDEBAR */ + +div#sidebar { + font-size: small; + position: absolute; + right: 1em; + top: 10em; + width: 25%; +} +div#sidebar a { + color: #995; +} +div#sidebar a:hover { + color: #773; +} +div#sidebar>div { + background: #FFF url('images/bg_sidebar.png') bottom repeat-x; + border: 1px solid #CC8; + color: #555; + margin-bottom: 1em; +} +div#sidebar h2 { + background: transparent; + border: 0; + color: #995; + letter-spacing: 0; + margin: 0; + padding: 0.5em 0; +} +div#sidebar hr { + display: none; +} +div#sidebar p { + margin: 1em; +} +div#sidebar p.tags a { + margin: 0; +} +div#sidebar table { + margin: 0.5em 0.5em 0 0.5em; +} +div#sidebar table td { + padding-bottom: 0.25em; + padding-right: 0.5em; +} +/* +div#sidebar ul { + list-style-type: none; + margin: 0; + padding: 0.5em; +} +div#sidebar ul li { + margin: 0.5em 0; +}*/ + +div#related { + padding: 0.5em; +} + +.crossTags { + padding:0px 3px; + border: 1px solid #999955 +} + +div#sidebar>div#maintagsmenu { + padding: 0.5em; + border: 5px solid #999955 +} + + + +/* TAGS */ + +p.commondescription { + padding-left:5px; + color: #555; + font-weight: bold; + font-size: medium; + border-left: 1px solid #CC8; + width: 70%; +} + +p.tags { + line-height: 2.25em; + /*margin: 2em 10%;*/ + text-align: justify; + vertical-align: middle; + width: 70%; +} +p.tags a, +p.tags span { + color: #47A; + margin-right: 0.5em; +} +p.tags span:hover { + cursor: pointer; + text-decoration: underline; +} +p.tags span.selected { + background: #CEC; +} + +.anchor { + cursor: pointer; + text-decoration: underline; +} + +.treeTag { + color: #999955; +} +.treeTag:hover { + cursor: pointer; + text-decoration: underline; +} +.treeTag.selected { + background: #CEC; +} + +/* PROFILE */ + +table.profile th { + width: 10em; +} + +table tr.ssl-current td { + background-color: #AFA; +} + +/* OTHER GUFF */ + +dd { + background: #CEC; + border-right: 4px solid #ACA; + color: #464; + padding: 6px; +} +dd a { + color: #464; +} +dd a:hover { + color: #000 !important; + text-decoration: underline !important; +} + +dl { + font-size: small; + margin: 1em; + width: 70%; +} +dl#profile dd { + background: #CDE; + border-color: #ABC; + color: #247; +} +dl#profile dt { + background: #BCE; + border-color: #9AC; + color: #245; + display: block; + font-weight: bold; + padding: 6px; +} +dl#profile a { + color: #446; +} +dl#profile a:hover { + color: #000 !important; + text-decoration: underline !important; +} +dl#meta dd { + line-height: 1.5em; +} +dl#meta dt { + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; +} +dt { + border-right: 4px solid #9B9; +} +dt a { + background: #BDB; + color: #353; + display: block; + font-weight: bold; + padding: 6px; +} +dt a:hover { + background: #ACA; + border: 0; +} +form { + margin: 0; +} +form#search { + margin-right: 0.75em; + color: #CCC; + font-size: small; + float: right; + margin: 0; + position: absolute; + right: 0; + top: 6.4em; +} +form label, +form td, +form th { + font-size: small; +} +form table { + margin: 0 1em; +} +h3 { + background: #DDD; + color: #555; + font-size: small; + letter-spacing: 0.2em; + margin: 2em 1em 1em 1em; + padding: 0.25em 0.75em; +} +li { + font-size: small; + margin-bottom: 0.5em; +} +p { + font-size: small; + margin: 1em; +} +p#sort { + /*color: #CCC;*/ + font-size: small; + /*float: right;*/ + /*margin: 0;*/ + /*position: absolute;*/ + right: 0; + top: 7em; +} +html > body p#sort { + /*margin-right: 0.75em;*/ +} +p#sort a { + background: #AAA; + color: #555; + font-weight: normal; + margin-right: 0.5em; + padding: 0 1em; +} +html > body p#sort a { + margin-right: 0; +} +p#sort a:hover { + background: #CCC; + text-decoration: none !important; +} +p#sort span { + display: none; +} + +p.backToTop{ + text-align:center; +} + +p.paging { + font-size: small; + margin-left: 1em; + text-align:center; +} +p.paging a, +p.paging span.disable { + background: #888; + color: #FFF; + display: inline; + margin-right: 0.5em; + padding: 0.25em 1em; +} +p.paging a:hover { + background: #666; +} +p.paging span { + display: none; +} +p.paging span.disable { + background: #DDD; + color: #AAA; +} +div.collapsible p.tags { + line-height: 2.25em; + margin: 1em 2em; +} +th label { + padding-right: 1em; +} +ul { + margin-right: 1em; + width: 75%; +} + +.adminBackground { + /*background: #FFFFFF url(images/logo_24.png) no-repeat scroll center right;*/ + /*border-top: 1px solid; + border-color: #CC9900;*/ +} + +.adminBackground { + background: #FFF url('images/bg_admin.png') repeat-y top right; +} + +a.bookmarklet { + padding: 2px; + background-color: #AAFAEE; +} + +/* tree styles */ +#related-content.jstree-default.jstree-focused { + background: none !important; +} + + +/* add/edit bookmark */ +.ui-autocomplete { + width: 458px; +} diff --git a/www/themes/testdummy/images/logo.png b/www/themes/testdummy/images/logo.png new file mode 100644 index 0000000..4a8f8ba Binary files /dev/null and b/www/themes/testdummy/images/logo.png differ diff --git a/www/themes/testdummy/scuttle.css b/www/themes/testdummy/scuttle.css new file mode 100644 index 0000000..c62cd19 --- /dev/null +++ b/www/themes/testdummy/scuttle.css @@ -0,0 +1,12 @@ +@import url(../default/scuttle.css); + +body { + background-color: #FEA; +} + +html > body h1 { + background: url('images/logo.png') no-repeat 10px; +} +div#header { + background: #FEA; +} -- cgit v1.2.3 From 2419885577b4e38b82f5b0f4fbfe8077f680d825 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Fri, 27 May 2011 06:59:33 +0200 Subject: make upgrade file fully rST-compatible and move SQL commands out into single schema files --- data/schema/1.sql | 20 ++++ data/schema/2.sql | 10 ++ data/schema/3.sql | 85 +++++++++++++++++ data/schema/4.sql | 11 +++ data/schema/5.sql | 1 + doc/UPGRADE.txt | 268 +++++++++++++++++------------------------------------- 6 files changed, 210 insertions(+), 185 deletions(-) create mode 100644 data/schema/1.sql create mode 100644 data/schema/2.sql create mode 100644 data/schema/3.sql create mode 100644 data/schema/4.sql create mode 100644 data/schema/5.sql (limited to 'data') diff --git a/data/schema/1.sql b/data/schema/1.sql new file mode 100644 index 0000000..e09a210 --- /dev/null +++ b/data/schema/1.sql @@ -0,0 +1,20 @@ +RENAME TABLE `sc_tags` TO `sc_bookmarks2tags` ; + + CREATE TABLE `sc_searchhistory` ( + `shId` int(11) NOT NULL auto_increment, + `shTerms` varchar(255) NOT NULL default '', + `shRange` varchar(32) NOT NULL default '', + `shDatetime` datetime NOT NULL default '0000-00-00 00:00:00', + `shNbResults` int(6) NOT NULL default '0', + `uId` int(11) NOT NULL default '0', + PRIMARY KEY (`shId`) + ); + + CREATE TABLE `sc_tags` ( + `tId` int(11) NOT NULL auto_increment, + `tag` varchar(32) NOT NULL default '', + `uId` int(11) NOT NULL default '0', + `tDescription` varchar(255) default NULL, + PRIMARY KEY (`tId`), + UNIQUE KEY `sc_tags_tag_uId` (`tag`, `uId`) + ); diff --git a/data/schema/2.sql b/data/schema/2.sql new file mode 100644 index 0000000..6c3bfaf --- /dev/null +++ b/data/schema/2.sql @@ -0,0 +1,10 @@ +ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 ) +CREATE TABLE `sc_tagscache` ( + `tcId` int(11) NOT NULL auto_increment, + `tag1` varchar(100) NOT NULL default '', + `tag2` varchar(100) NOT NULL default '', + `relationType` varchar(32) NOT NULL default '', + `uId` int(11) NOT NULL default '0', + PRIMARY KEY (`tcId`), + UNIQUE KEY `sc_tagscache_tag1_tag2_type_uId` (`tag1`,`tag2`,`relationType`,`uId`) +); diff --git a/data/schema/3.sql b/data/schema/3.sql new file mode 100644 index 0000000..32431b9 --- /dev/null +++ b/data/schema/3.sql @@ -0,0 +1,85 @@ +/* modify and add fields */ +ALTER TABLE `sc_bookmarks` MODIFY `bAddress` varchar(1500) NOT NULL; +ALTER TABLE `sc_bookmarks` MODIFY `bDescription` TEXT default NULL; +ALTER TABLE `sc_bookmarks` ADD `bPrivateNote` TEXT NULL AFTER `bDescription` ; +ALTER TABLE `sc_tags` MODIFY `tDescription` TEXT default NULL; +ALTER TABLE `sc_commondescription` MODIFY `cdDescription` TEXT default NULL; + +/* convert to UTF-8 if your table is ISO-something (through BLOB: tips provided by MYSQL documentation)*/ +/* first need to remove index keys because of BLOB constraints*/ +ALTER TABLE `sc_tags` DROP INDEX `sc_tags_tag_uId`; +ALTER TABLE `sc_bookmarks2tags` DROP INDEX `sc_bookmarks2tags_tag_bId`; +ALTER TABLE `sc_bookmarks2tags` DROP INDEX `sc_bookmarks2tags_bId`; +ALTER TABLE `sc_tags2tags` DROP INDEX `sc_tags2tags_tag1_tag2_uId`; +ALTER TABLE `sc_commondescription` DROP INDEX `sc_commondescription_tag_datetime`; +ALTER TABLE `sc_tagscache` DROP INDEX `sc_tagscache_tag1_tag2_type_uId`; +ALTER TABLE `sc_tagsstats` DROP INDEX `sc_tagsstats_tag1_type_uId`; + +/* secondly convert through BLOB type */ +ALTER TABLE `sc_bookmarks` CHANGE `bTitle` `bTitle` BLOB; +ALTER TABLE `sc_bookmarks` CHANGE `bTitle` `bTitle` varchar(255) CHARACTER SET utf8; +ALTER TABLE `sc_bookmarks` CHANGE `bAddress` `bAddress` BLOB; +ALTER TABLE `sc_bookmarks` CHANGE `bAddress` `bAddress` varchar(1500) CHARACTER SET utf8; +ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` BLOB; +ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` text CHARACTER SET utf8; +ALTER TABLE `sc_bookmarks` CHANGE `bPrivateNote` `bPrivateNote` BLOB; +ALTER TABLE `sc_bookmarks` CHANGE `bPrivateNote` `bPrivateNote` text CHARACTER SET utf8; + +ALTER TABLE `sc_tags` CHANGE `tag` `tag` BLOB; +ALTER TABLE `sc_tags` CHANGE `tag` `tag` varchar(100) CHARACTER SET utf8; +ALTER TABLE `sc_tags` CHANGE `tDescription` `tDescription` BLOB; +ALTER TABLE `sc_tags` CHANGE `tDescription` `tDescription` text CHARACTER SET utf8; + +ALTER TABLE `sc_bookmarks2tags` CHANGE `tag` `tag` BLOB; +ALTER TABLE `sc_bookmarks2tags` CHANGE `tag` `tag` varchar(100) CHARACTER SET utf8; + +ALTER TABLE `sc_users` CHANGE `name` `name` BLOB; +ALTER TABLE `sc_users` CHANGE `name` `name` varchar(50) CHARACTER SET utf8; +ALTER TABLE `sc_users` CHANGE `uContent` `uContent` BLOB; +ALTER TABLE `sc_users` CHANGE `uContent` `uContent` text CHARACTER SET utf8; + +ALTER TABLE `sc_tags2tags` CHANGE `tag1` `tag1` BLOB; +ALTER TABLE `sc_tags2tags` CHANGE `tag1` `tag1` varchar(100) CHARACTER SET utf8; +ALTER TABLE `sc_tags2tags` CHANGE `tag2` `tag2` BLOB; +ALTER TABLE `sc_tags2tags` CHANGE `tag2` `tag2` varchar(100) CHARACTER SET utf8; + +ALTER TABLE `sc_tagsstats` CHANGE `tag1` `tag1` BLOB; +ALTER TABLE `sc_tagsstats` CHANGE `tag1` `tag1` varchar(100) CHARACTER SET utf8; + +ALTER TABLE `sc_tagscache` CHANGE `tag1` `tag1` BLOB; +ALTER TABLE `sc_tagscache` CHANGE `tag1` `tag1` varchar(100) CHARACTER SET utf8; +ALTER TABLE `sc_tagscache` CHANGE `tag2` `tag2` BLOB; +ALTER TABLE `sc_tagscache` CHANGE `tag2` `tag2` varchar(100) CHARACTER SET utf8; + +ALTER TABLE `sc_commondescription` CHANGE `tag` `tag` BLOB; +ALTER TABLE `sc_commondescription` CHANGE `tag` `tag` varchar(100) CHARACTER SET utf8; +ALTER TABLE `sc_commondescription` CHANGE `cdTitle` `cdTitle` BLOB; +ALTER TABLE `sc_commondescription` CHANGE `cdTitle` `cdTitle` varchar(255) CHARACTER SET utf8; +ALTER TABLE `sc_commondescription` CHANGE `cdDescription` `cdDescription` BLOB; +ALTER TABLE `sc_commondescription` CHANGE `cdDescription` `cdDescription` text CHARACTER SET utf8; + +ALTER TABLE `sc_searchhistory` CHANGE `shTerms` `shTerms` BLOB; +ALTER TABLE `sc_searchhistory` CHANGE `shTerms` `shTerms` varchar(255) CHARACTER SET utf8; +ALTER TABLE `sc_searchhistory` CHANGE `shRange` `shRange` BLOB; +ALTER TABLE `sc_searchhistory` CHANGE `shRange` `shRange` varchar(32) CHARACTER SET utf8; + +/* Thirdly re-add index keys */ +ALTER TABLE `sc_tags` ADD UNIQUE KEY `sc_tags_tag_uId` (`tag`, `uId`); +ALTER TABLE `sc_bookmarks2tags` ADD UNIQUE KEY `sc_bookmarks2tags_tag_bId` (`tag`,`bId`); +ALTER TABLE `sc_bookmarks2tags` ADD KEY `sc_bookmarks2tags_bId` (`bId`); +ALTER TABLE `sc_tags2tags` ADD UNIQUE KEY `sc_tags2tags_tag1_tag2_uId` (`tag1`,`tag2`,`relationType`,`uId`); +ALTER TABLE `sc_commondescription` ADD UNIQUE KEY `sc_commondescription_tag_datetime` (`tag`,`cdDatetime`); +ALTER TABLE `sc_tagscache` ADD UNIQUE KEY `sc_tagscache_tag1_tag2_type_uId` (`tag1`,`tag2`,`relationType`,`uId`); +ALTER TABLE `sc_tagsstats` ADD UNIQUE KEY `sc_tagsstats_tag1_type_uId` (`tag1`,`relationType`,`uId`); + +/* Change tables to utf-8 charset */ +ALTER TABLE `sc_bookmarks` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_tags` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_bookmarks2tags` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_users` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_watched` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_tags2tags` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_tagsstats` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_tagscache` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_commondescription` CHARACTER SET utf8 COLLATE utf8_general_ci; +ALTER TABLE `sc_searchhistory` CHARACTER SET utf8 COLLATE utf8_general_ci; diff --git a/data/schema/4.sql b/data/schema/4.sql new file mode 100644 index 0000000..022aaf0 --- /dev/null +++ b/data/schema/4.sql @@ -0,0 +1,11 @@ +ALTER TABLE `sc_bookmarks` ADD `bVoting` INT NOT NULL; +ALTER TABLE `sc_bookmarks` ADD `bVotes` INT NOT NULL; + +CREATE TABLE `sc_votes` ( + `bId` INT NOT NULL , + `uId` INT NOT NULL , + `vote` INT( 2 ) NOT NULL , + UNIQUE KEY `bid_2` (`bId`,`uId`), + KEY `bid` (`bId`), + KEY `uid` (`uId`) +) CHARACTER SET utf8 COLLATE utf8_general_ci ; diff --git a/data/schema/5.sql b/data/schema/5.sql new file mode 100644 index 0000000..d4c9afc --- /dev/null +++ b/data/schema/5.sql @@ -0,0 +1 @@ +ALTER TABLE `sc_bookmarks` ADD `bShort` VARCHAR(16) NULL DEFAULT NULL; diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt index 2d4c4d2..0e570e5 100644 --- a/doc/UPGRADE.txt +++ b/doc/UPGRADE.txt @@ -4,261 +4,159 @@ Upgrading SemanticScuttle from a previous version From version 0.97 to 0.98 -------------------------- -Database updates: Apply data/schema/6.sql or do the following: - - CREATE TABLE `sc_version` ( - `schema_version` int(11) NOT NULL - ) DEFAULT CHARSET=utf8; - - INSERT INTO `sc_version` (`schema_version`) VALUES ('6'); +========================= +Database updates +---------------- +Apply ``data/schema/6.sql`` From version 0.96 to 0.97 -------------------------- +========================= No database changes necessary. From version 0.95 to 0.96 -------------------------- -Update your database: -- ALTER TABLE `sc_bookmarks` ADD `bShort` VARCHAR(16) NULL DEFAULT NULL; +========================= +Database updates +---------------- +Apply ``data/schema/5.sql`` -API: -The method signatures of addBookmark() and updateBookmark() -changed due to the addition of the $short parameter. +API +--- +The method signatures of ``addBookmark()`` and ``updateBookmark()`` +changed due to the addition of the ``$short`` parameter. We got complaints about the changed file structure, and people told -us that they just cannot set the document root to www/, because they -are not admins on their http server. This is a valid point, and -with 0.96.0 you can easily change it. See INSTALL.txt for more information -about moving www/. +us that they just cannot set the document root to ``www/``, because they +are not admins on their HTTP server. This is a valid point, and +with 0.96.0 you can easily change it. See `INSTALL.txt`_ for more information +about moving ``www/``. + +.. _INSTALL.txt: INSTALL.html From version 0.94 to 0.95 --------------------------- +========================= The file structure completely changed in 0.95.0 compared to previous versions. We recommend that you start with a -fresh installation, just copying over your config.php file. -Set your web server document root directory to www/. +fresh installation, just copying over your ``config.php`` file. +Set your web server document root directory to ``www/``. Yes, we kind of lost the ability to run SemanticScuttle in a subdirectory of a hostname. This functionality will be back in one of the next releases, but for now, you have to live with it. -Update your database: -- ALTER TABLE `sc_bookmarks` ADD `bVoting` INT NOT NULL; -- ALTER TABLE `sc_bookmarks` ADD `bVotes` INT NOT NULL; -- Add the new votes database table. See data/tables.sql. +Update your database +-------------------- +Apply ``data/schema/4.sql``. Currently, only MySQL can be used as database backend. All other DBMS (database management systems) have not been tested except for PostgreSQL, and SemanticScuttle fails there. -The de_AT translation has been re-added. This is because -de_AT provides a rather ugly "official German" style, -while the normal de_DE is friendlier. Choose what you like. +Translation +----------- +The ``de_AT`` translation has been re-added. This is because +``de_AT`` provides a rather ugly "official German" style, +while the normal ``de_DE`` is friendlier. Choose what you like. From version 0.93 to 0.94 -------------------------- +========================= - Nothing changed except for the default configuration file. It is recommended to start with a fresh config file, but not neccesary. Old config files still work. -- If you used translation de_AT, please switch to de_DE. - de_AT was moved to de_DE and de_AT has been removed. +- If you used translation ``de_AT``, please switch to ``de_DE``. + ``de_AT`` was moved to ``de_DE`` and ``de_AT`` has been removed. From version 0.92 to 0.93 -------------------------- +========================= - Backup your database - Make a copy from your SemanticScuttle Web directory -- Upgrade your database by following instructions ONE after ONE (order is important) : -#NOTHING TO CHANGE IN DB -- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example -$footerMessage = ''; #HTML message appearing at the bottom of the page (just above SemanticScuttle credits) -$sidebarTopMessage = ''; #HTML message appearing at the top of the sidebar -$sidebarBottomMessage = ''; #HTML message appearing at the bottom of the sidebar -$adminsCanModifyBookmarksFromOtherUsers = true; # 'true' if admin users can edit or delete bookmarks belonging to other users. Else 'false'. -$adminsAreAdvisedTagsFromOtherAdmins = false; # 'true' if tags from other admins are proposed to each admin (in add/edit a bookmark page). Else 'false'. -$defaultPerPageForAdmins = 20; # default number of bookmarks per page for admins (-1 means no limit) +- Upgrade your current configuration file (``config.inc.php``) with respect to ``config.inc.php.example`` :: + + $footerMessage = ''; #HTML message appearing at the bottom of the page (just above SemanticScuttle credits) + $sidebarTopMessage = ''; #HTML message appearing at the top of the sidebar + $sidebarBottomMessage = ''; #HTML message appearing at the bottom of the sidebar + $adminsCanModifyBookmarksFromOtherUsers = true; # 'true' if admin users can edit or delete bookmarks belonging to other users. Else 'false'. + $adminsAreAdvisedTagsFromOtherAdmins = false; # 'true' if tags from other admins are proposed to each admin (in add/edit a bookmark page). Else 'false'. + $defaultPerPageForAdmins = 20; # default number of bookmarks per page for admins (-1 means no limit) From version 0.91 to 0.92 -------------------------- +========================= Message: this version modifies the database to UTF-8 charset. The idea is to convert the content (through BLOB type) and then to change the tables' charsets. - Backup your database - Make a copy from your SemanticScuttle Web directory -- Upgrade your database by following instructions ONE after ONE (order is important) : - -/* modify and add fields */ -ALTER TABLE `sc_bookmarks` MODIFY `bAddress` varchar(1500) NOT NULL; -ALTER TABLE `sc_bookmarks` MODIFY `bDescription` TEXT default NULL; -ALTER TABLE `sc_bookmarks` ADD `bPrivateNote` TEXT NULL AFTER `bDescription` ; -ALTER TABLE `sc_tags` MODIFY `tDescription` TEXT default NULL; -ALTER TABLE `sc_commondescription` MODIFY `cdDescription` TEXT default NULL; - -/* convert to UTF-8 if your table is ISO-something (through BLOB: tips provided by MYSQL documentation)*/ -/* first need to remove index keys because of BLOB constraints*/ -ALTER TABLE `sc_tags` DROP INDEX `sc_tags_tag_uId`; -ALTER TABLE `sc_bookmarks2tags` DROP INDEX `sc_bookmarks2tags_tag_bId`; -ALTER TABLE `sc_bookmarks2tags` DROP INDEX `sc_bookmarks2tags_bId`; -ALTER TABLE `sc_tags2tags` DROP INDEX `sc_tags2tags_tag1_tag2_uId`; -ALTER TABLE `sc_commondescription` DROP INDEX `sc_commondescription_tag_datetime`; -ALTER TABLE `sc_tagscache` DROP INDEX `sc_tagscache_tag1_tag2_type_uId`; -ALTER TABLE `sc_tagsstats` DROP INDEX `sc_tagsstats_tag1_type_uId`; - -/* secondly convert through BLOB type */ -ALTER TABLE `sc_bookmarks` CHANGE `bTitle` `bTitle` BLOB; -ALTER TABLE `sc_bookmarks` CHANGE `bTitle` `bTitle` varchar(255) CHARACTER SET utf8; -ALTER TABLE `sc_bookmarks` CHANGE `bAddress` `bAddress` BLOB; -ALTER TABLE `sc_bookmarks` CHANGE `bAddress` `bAddress` varchar(1500) CHARACTER SET utf8; -ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` BLOB; -ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` text CHARACTER SET utf8; -ALTER TABLE `sc_bookmarks` CHANGE `bPrivateNote` `bPrivateNote` BLOB; -ALTER TABLE `sc_bookmarks` CHANGE `bPrivateNote` `bPrivateNote` text CHARACTER SET utf8; - -ALTER TABLE `sc_tags` CHANGE `tag` `tag` BLOB; -ALTER TABLE `sc_tags` CHANGE `tag` `tag` varchar(100) CHARACTER SET utf8; -ALTER TABLE `sc_tags` CHANGE `tDescription` `tDescription` BLOB; -ALTER TABLE `sc_tags` CHANGE `tDescription` `tDescription` text CHARACTER SET utf8; - -ALTER TABLE `sc_bookmarks2tags` CHANGE `tag` `tag` BLOB; -ALTER TABLE `sc_bookmarks2tags` CHANGE `tag` `tag` varchar(100) CHARACTER SET utf8; - -ALTER TABLE `sc_users` CHANGE `name` `name` BLOB; -ALTER TABLE `sc_users` CHANGE `name` `name` varchar(50) CHARACTER SET utf8; -ALTER TABLE `sc_users` CHANGE `uContent` `uContent` BLOB; -ALTER TABLE `sc_users` CHANGE `uContent` `uContent` text CHARACTER SET utf8; - -ALTER TABLE `sc_tags2tags` CHANGE `tag1` `tag1` BLOB; -ALTER TABLE `sc_tags2tags` CHANGE `tag1` `tag1` varchar(100) CHARACTER SET utf8; -ALTER TABLE `sc_tags2tags` CHANGE `tag2` `tag2` BLOB; -ALTER TABLE `sc_tags2tags` CHANGE `tag2` `tag2` varchar(100) CHARACTER SET utf8; - -ALTER TABLE `sc_tagsstats` CHANGE `tag1` `tag1` BLOB; -ALTER TABLE `sc_tagsstats` CHANGE `tag1` `tag1` varchar(100) CHARACTER SET utf8; - -ALTER TABLE `sc_tagscache` CHANGE `tag1` `tag1` BLOB; -ALTER TABLE `sc_tagscache` CHANGE `tag1` `tag1` varchar(100) CHARACTER SET utf8; -ALTER TABLE `sc_tagscache` CHANGE `tag2` `tag2` BLOB; -ALTER TABLE `sc_tagscache` CHANGE `tag2` `tag2` varchar(100) CHARACTER SET utf8; - -ALTER TABLE `sc_commondescription` CHANGE `tag` `tag` BLOB; -ALTER TABLE `sc_commondescription` CHANGE `tag` `tag` varchar(100) CHARACTER SET utf8; -ALTER TABLE `sc_commondescription` CHANGE `cdTitle` `cdTitle` BLOB; -ALTER TABLE `sc_commondescription` CHANGE `cdTitle` `cdTitle` varchar(255) CHARACTER SET utf8; -ALTER TABLE `sc_commondescription` CHANGE `cdDescription` `cdDescription` BLOB; -ALTER TABLE `sc_commondescription` CHANGE `cdDescription` `cdDescription` text CHARACTER SET utf8; - -ALTER TABLE `sc_searchhistory` CHANGE `shTerms` `shTerms` BLOB; -ALTER TABLE `sc_searchhistory` CHANGE `shTerms` `shTerms` varchar(255) CHARACTER SET utf8; -ALTER TABLE `sc_searchhistory` CHANGE `shRange` `shRange` BLOB; -ALTER TABLE `sc_searchhistory` CHANGE `shRange` `shRange` varchar(32) CHARACTER SET utf8; - -/* Thirdly re-add index keys */ -ALTER TABLE `sc_tags` ADD UNIQUE KEY `sc_tags_tag_uId` (`tag`, `uId`); -ALTER TABLE `sc_bookmarks2tags` ADD UNIQUE KEY `sc_bookmarks2tags_tag_bId` (`tag`,`bId`); -ALTER TABLE `sc_bookmarks2tags` ADD KEY `sc_bookmarks2tags_bId` (`bId`); -ALTER TABLE `sc_tags2tags` ADD UNIQUE KEY `sc_tags2tags_tag1_tag2_uId` (`tag1`,`tag2`,`relationType`,`uId`); -ALTER TABLE `sc_commondescription` ADD UNIQUE KEY `sc_commondescription_tag_datetime` (`tag`,`cdDatetime`); -ALTER TABLE `sc_tagscache` ADD UNIQUE KEY `sc_tagscache_tag1_tag2_type_uId` (`tag1`,`tag2`,`relationType`,`uId`); -ALTER TABLE `sc_tagsstats` ADD UNIQUE KEY `sc_tagsstats_tag1_type_uId` (`tag1`,`relationType`,`uId`); - -/* Change tables to utf-8 charset */ -ALTER TABLE `sc_bookmarks` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_tags` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_bookmarks2tags` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_users` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_watched` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_tags2tags` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_tagsstats` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_tagscache` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_commondescription` CHARACTER SET utf8 COLLATE utf8_general_ci; -ALTER TABLE `sc_searchhistory` CHARACTER SET utf8 COLLATE utf8_general_ci; +- Upgrade your database by applying ``data/schema/3.sql`` +- Upgrade your current configuration file (``config.inc.php``) with respect to ``config.inc.php.example`` -- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example -* Add variable : $descriptionAnchors = array("author", "isbn", "address"=>"[address][street][/street][city][/city][/address]"); #add a possible anchor (structured content) for bookmarks' description field -* Add variable : $enableCommonTagDescriptionEditedByAll = true; #true mean everybody can edit common description. Else just the admins can do it. -* Add variable : $googleAnalyticsCode = ''; #Allow GoogleAnalytics tracker https://www.google.com/analytics/ + - Add variable :: + + $descriptionAnchors = array("author", "isbn", "address"=>"[address][street][/street][city][/city][/address]"); #add a possible anchor (structured content) for bookmarks' description field + + - Add variable :: + + $enableCommonTagDescriptionEditedByAll = true; #true mean everybody can edit common description. Else just the admins can do it. + - Add variable :: + + $googleAnalyticsCode = ''; #Allow GoogleAnalytics tracker https://www.google.com/analytics/ From version 0.90 to 0.91 -------------------------- +========================= - Backup you database - Make a copy from your SemanticScuttle Web directory -- Upgrade your database by following instructions ONE after ONE (order is important) : - * ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 ) - * CREATE TABLE `sc_tagscache` ( - `tcId` int(11) NOT NULL auto_increment, - `tag1` varchar(100) NOT NULL default '', - `tag2` varchar(100) NOT NULL default '', - `relationType` varchar(32) NOT NULL default '', - `uId` int(11) NOT NULL default '0', - PRIMARY KEY (`tcId`), - UNIQUE KEY `sc_tagscache_tag1_tag2_type_uId` (`tag1`,`tag2`,`relationType`,`uId`) -); -- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example - * Delete last line : include_once('debug.inc.php'); - * Add variable: $menu2Tags = array('example', 'of', 'menu', 'tags'); - * Add variable: $debugMode = true; # if true, show debug messages +- Upgrade your database by applying ``data/schema/2.sql`` +- Upgrade your current configuration file (``config.inc.php``) with respect to ``config.inc.php.example`` + - Delete last line :: -From version 0.89 to 0.90 -------------------------- + include_once('debug.inc.php'); -- Backup you database -- Make a copy from your SemanticScuttle Web directory + - Add variable:: -- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example -# add these lines under $enableWebsiteThumbnails = false; # enableWebsiteThumbnails {true|false}: -$thumbnailsUserId = ''; -$thumbnailsKey = ''; + $menu2Tags = array('example', 'of', 'menu', 'tags'); + - Add variable:: + $debugMode = true; # if true, show debug messages -From version 0.88 to 0.89 -------------------------- + +From version 0.89 to 0.90 +========================= - Backup you database - Make a copy from your SemanticScuttle Web directory -- Upgrade your database by following instructions ONE after ONE (order is important) : +- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example -* change the table called 'sc_tags' into 'sc_bookmarks2tags' by executing the following SQL commands (after changing 'yourdatabasename' and adapting its name prefix 'sc_' to your convenience): + add these lines under ``$enableWebsiteThumbnails = false; # enableWebsiteThumbnails {true|false}``:: - RENAME TABLE `yourdatabasename`.`sc_tags` TO `yourdatabasename`.`sc_bookmarks2tags` ; + $thumbnailsUserId = ''; + $thumbnailsKey = ''; -* add the following table (adapt its name prefix to your convenience) executing the following SQL commands: +From version 0.88 to 0.89 +========================= - CREATE TABLE `sc_searchhistory` ( - `shId` int(11) NOT NULL auto_increment, - `shTerms` varchar(255) NOT NULL default '', - `shRange` varchar(32) NOT NULL default '', - `shDatetime` datetime NOT NULL default '0000-00-00 00:00:00', - `shNbResults` int(6) NOT NULL default '0', - `uId` int(11) NOT NULL default '0', - PRIMARY KEY (`shId`) - ); +- Backup you database +- Make a copy from your SemanticScuttle Web directory +- Upgrade your database by applying ``data/schema/1.sql`` +- Upgrade your current configuration file (``config.inc.php``) with respect to ``config.inc.php.example`` - CREATE TABLE `sc_tags` ( - `tId` int(11) NOT NULL auto_increment, - `tag` varchar(32) NOT NULL default '', - `uId` int(11) NOT NULL default '0', - `tDescription` varchar(255) default NULL, - PRIMARY KEY (`tId`), - UNIQUE KEY `sc_tags_tag_uId` (`tag`, `uId`) - ); + - add line:: -- Upgrade your current configuration file (config.inc.php) with respect to config.inc.php.example - # add line: $sizeSearchHistory = 10; - # add sidebar block index line: + + - add sidebar block index line:: + $index_sidebar_blocks = array('search','menu','users','popular'); - # add line: + + - add line:: $enableGoogleCustomSearch = true; -- cgit v1.2.3

		←
		←
+ + +	<?php echo filter($row['bDescription'], 'xml'); ?>	← + 0): ?> + + + $anchorValue): ?> + + + + +
	<?php echo filter($row['bPrivateNote'], 'xml'); ?>	← +
	+ +	←
	" to include one tag in another. e.g.: europe>france>paris'))?>

	+ +
	+ + + + + '; + echo T_('edit common description').')'; + } + + if ($popup) { + ?> + + + + +

		←
		←
- - -	<?php echo filter($row['bDescription'], 'xml'); ?>	← - 0): ?> - - - $anchorValue): ?> - - - - -
	<?php echo filter($row['bPrivateNote'], 'xml'); ?>	← -
	- -	←
	" to include one tag in another. e.g.: europe>france>paris'))?>

	- -
	- - - - - '; - echo T_('edit common description').')'; - } - - if ($popup) { - ?> - - - - -

'.T_('Users management').'

'.T_('Users management').'

.


	<?php echo $description['cdDescription']; ?>
	+ 0) { + echo T_('Last modification:').' '.$description['cdDatetime'].', '; + $lastUser = $userservice->getUser($description['uId']); + echo '' + . SemanticScuttle_Model_UserArray::getName($lastUser) . ''; + } + ?> +
	+ + +

'.T_('Users management').'

'.T_('Users management').'

$title

'. T_('Not Found') .'

'. T_('General server error') .'

+'.T_('Menu Tags').' '; + //} +?> +

$title

'. T_('Not Found') .'

'. T_('General server error') .'

-'.T_('Menu Tags').' '; - //} -?> -

.