diff options
| author | julien <julien@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-18 22:27:54 +0300 |
|---|---|---|
| committer | julien <julien@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2008-03-18 22:27:54 +0300 |
| commit | 55d8a3ad0bcb68a5c0da0c0b81c873d3d317b41e (patch) | |
| tree | 3582c7885fd2b774d196aa52f4a83e015f5b6cb7 | |
| parent | 29a8e2bbb4ba99657395ef51d7adedde77847fc1 (diff) | |
Commited some very good patch by Maciej Zawadziński :
-fix #106, #112 : Admin index and menu
-fix #88 : nice login screen
-fix #105 : nice plugin admin management,
-fix #40 : outlink/download tracking, solves bugs and adds some options
+Some code cleanup regarding new coding standard
86 files changed, 13037 insertions, 6850 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index e16a890132..477a4b9f01 100755 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -1,4 +1,4 @@ -; <?php exit; ?> DO NOT REMOVE THIS LINE
+; <?php exit; ?> DO NOT REMOVE THIS LINE [superuser] login = root password = @@ -25,11 +25,12 @@ default = en [Plugins] Plugins[] = PluginsAdmin +Plugins[] = AdminHome Plugins[] = API Plugins[] = Widgetize Plugins[] = Home Plugins[] = Actions -Plugins[] = Dashboard
+Plugins[] = Dashboard Plugins[] = Referers Plugins[] = UserSettings @@ -40,14 +41,15 @@ Plugins[] = VisitTime Plugins[] = VisitorInterest Plugins[] = ExamplePlugin Plugins[] = Provider -
-Plugins[] = Login
-Plugins[] = UsersManager
-Plugins[] = SitesManager
+ +Plugins[] = Login +Plugins[] = UsersManager +Plugins[] = SitesManager Plugins[] = Installation [PluginsInstalled] PluginsInstalled[] = Login +PluginsInstalled[] = AdminHome PluginsInstalled[] = UsersManager PluginsInstalled[] = SitesManager PluginsInstalled[] = Installation @@ -77,7 +79,7 @@ dataTable_default_sort_order = desc dataTable_default_limit = 10 ; minimum required version (minimum requirement know to date = ->newInstanceArgs) -minimum_php_version = 5.1.3
+minimum_php_version = 5.1.3 minimum_memory_limit = 128 @@ -180,4 +182,4 @@ cache_dir = tmp/cache ; error reporting inside Smarty error_reporting = E_ALL|E_NOTICE ; should be set to false in a piwik release -debugging = true
\ No newline at end of file +debugging = true diff --git a/libs/PhpDocumentor-1.3.2/docbuilder/blank.html b/libs/PhpDocumentor-1.3.2/docbuilder/blank.html index 3ba0113011..7eea276e96 100755 --- a/libs/PhpDocumentor-1.3.2/docbuilder/blank.html +++ b/libs/PhpDocumentor-1.3.2/docbuilder/blank.html @@ -1,18 +1,18 @@ -<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
- <title>docBuilder - phpDocumentor web interface</title>
- <meta name="Generator" content="EditPlus">
- <meta name="Author" content="Andrew Eddie">
- <meta name="Description" content="Blank page">
- <style type="text/css">
- body, td, th {
- font-family: monospace;
- font-size: 10pt;
- }
- </style>
-</head>
-<body text="#000000" bgcolor="#e0e0e0">
-Awaiting your command...
-</body>
-</html>
+<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>docBuilder - phpDocumentor web interface</title> +<meta name="Generator" content="EditPlus"> +<meta name="Author" content="Andrew Eddie"> +<meta name="Description" content="Blank page"> +<style type="text/css">
+body,td,th {
+ font-family: monospace;
+ font-size: 10pt;
+}
+</style> +</head> +<body text="#000000" bgcolor="#e0e0e0"> +Awaiting your command... +</body> +</html> diff --git a/libs/PhpDocumentor-1.3.2/docbuilder/includes/tab.webfx.css b/libs/PhpDocumentor-1.3.2/docbuilder/includes/tab.webfx.css index ad05c3233a..0e014715a6 100755 --- a/libs/PhpDocumentor-1.3.2/docbuilder/includes/tab.webfx.css +++ b/libs/PhpDocumentor-1.3.2/docbuilder/includes/tab.webfx.css @@ -4,88 +4,81 @@ bright: rgb(234,242,255); normal: rgb(120,172,255);
dark: rgb(0,66,174);
-*/
-
-
-
-
-.dynamic-tab-pane-control.tab-pane {
- position: relative;
- width: 100%;
-}
-
-.dynamic-tab-pane-control .tab-row .tab {
- font-family: Verdana, Helvetica, Arial;
- font-size: 12px;
- cursor: Default;
- display: inline;
- margin: 1px -5px 1px 5px;
- float: left;
- padding: 3px 6px 3px 6px;
- background: rgb(234,242,255);
- border: 1px solid;
- border-color: rgb(120,172,255);
- border-left: 0;
- border-bottom: 0;
- border-top: 0;
-
- cursor: hand;
- cursor: pointer;
-
- z-index: 1;
- position: relative;
- top: 0;
-}
-
-.dynamic-tab-pane-control .tab-row .tab.selected {
- border: 1px solid rgb(120,172,255);
- border-bottom: 0;
- z-index: 3;
- padding: 2px 6px 5px 6px;
- margin: 1px -6px -2px 0px;
- top: -2px;
- background: white;
-}
-
-.dynamic-tab-pane-control .tab-row .tab a {
- font-family: Verdana, Helvetica, Arial;
- font-size: 13px;
- color: rgb(0,66,174);
- text-decoration: none;
- cursor: hand;
- cursor: pointer;
-}
-
-.dynamic-tab-pane-control .tab-row .hover a {
- color: rgb(0,66,174);
-}
-
-.dynamic-tab-pane-control .tab-row .tab.selected a {
- font-weight: bold;
-}
-
-.dynamic-tab-pane-control .tab-page {
- clear: both;
- border: 1px solid rgb(120,172,255);
- background: White;
- z-index: 2;
-/*
+*/ +.dynamic-tab-pane-control.tab-pane { + position: relative; + width: 100%; +} + +.dynamic-tab-pane-control .tab-row .tab { + font-family: Verdana, Helvetica, Arial; + font-size: 12px; + cursor: Default; + display: inline; + margin: 1px -5px 1px 5px; + float: left; + padding: 3px 6px 3px 6px; + background: rgb(234, 242, 255); + border: 1px solid; + border-color: rgb(120, 172, 255); + border-left: 0; + border-bottom: 0; + border-top: 0; + cursor: hand; + cursor: pointer; + z-index: 1; + position: relative; + top: 0; +} + +.dynamic-tab-pane-control .tab-row .tab.selected { + border: 1px solid rgb(120, 172, 255); + border-bottom: 0; + z-index: 3; + padding: 2px 6px 5px 6px; + margin: 1px -6px -2px 0px; + top: -2px; + background: white; +} + +.dynamic-tab-pane-control .tab-row .tab a { + font-family: Verdana, Helvetica, Arial; + font-size: 13px; + color: rgb(0, 66, 174); + text-decoration: none; + cursor: hand; + cursor: pointer; +} + +.dynamic-tab-pane-control .tab-row .hover a { + color: rgb(0, 66, 174); +} + +.dynamic-tab-pane-control .tab-row .tab.selected a { + font-weight: bold; +} + +.dynamic-tab-pane-control .tab-page { + clear: both; + border: 1px solid rgb(120, 172, 255); + background: White; + z-index: 2; + /*
position: relative;
top: -2px;
-*/
- position: absolute;
- top: 23px;
-
- color: Black;
- font-family: Verdana, Helvetica, Arial;
- font-size: 13px;
- padding: 10px;
-}
-
-.dynamic-tab-pane-control .tab-row {
- z-index: 1;
- white-space: nowrap;
- background: rgb(234,242,255);
- height: 1.85em;
- width: 100%;
-}
+*/ + position: absolute; + top: 23px; + color: Black; + font-family: Verdana, Helvetica, Arial; + font-size: 13px; + padding: 10px; +} + +.dynamic-tab-pane-control .tab-row { + z-index: 1; + white-space: nowrap; + background: rgb(234, 242, 255); + height: 1.85em; + width: 100%; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/docbuilder/index.html b/libs/PhpDocumentor-1.3.2/docbuilder/index.html index 2907dd0c77..6bd776b3d2 100755 --- a/libs/PhpDocumentor-1.3.2/docbuilder/index.html +++ b/libs/PhpDocumentor-1.3.2/docbuilder/index.html @@ -1,17 +1,20 @@ -<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>docBuilder - phpDocumentor web interface</title>
-<meta name="Generator" content="EditPlus">
-<meta name="Author" content="Andrew Eddie">
-<meta name="Description" content="Frameset for phpDcoumentor docBuilder web interface">
-</head>
-
-<frameset rows="35,*,40,135">
- <frame src="top.php" frameborder="no">
- <frame src="config.php" name="DataFrame" frameborder="no">
- <frame src="actions.php" name="ActionFrame" scrolling="no" marginwidth="0" marginheight="0" frameborder="no">
- <frame src="blank.html" name="OutputFrame" marginwidth="0" marginheight="0" frameborder="yes">
-</frameset>
-
-</html>
+<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>docBuilder - phpDocumentor web interface</title> +<meta name="Generator" content="EditPlus"> +<meta name="Author" content="Andrew Eddie"> +<meta name="Description" + content="Frameset for phpDcoumentor docBuilder web interface"> +</head> + +<frameset rows="35,*,40,135"> + <frame src="top.php" frameborder="no"> + <frame src="config.php" name="DataFrame" frameborder="no"> + <frame src="actions.php" name="ActionFrame" scrolling="no" + marginwidth="0" marginheight="0" frameborder="no"> + <frame src="blank.html" name="OutputFrame" marginwidth="0" + marginheight="0" frameborder="yes"> +</frameset> + +</html> diff --git a/libs/PhpDocumentor-1.3.2/docs/media/banner.css b/libs/PhpDocumentor-1.3.2/docs/media/banner.css index 35ff3cc3d5..2d8161b754 100755 --- a/libs/PhpDocumentor-1.3.2/docs/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/docs/media/banner.css @@ -1,33 +1,30 @@ -body
-{
- background-color: #EEEEEE;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- text-align: right;
- clear: both;
- padding: .5em;
- border-top: 2px solid #AAAAAA;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #DDDDDD;
- border: 1px solid #AAAAAA;
- color: #000090;
-}
+body { + background-color: #EEEEEE; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + text-align: right; + clear: both; + padding: .5em; + border-top: 2px solid #AAAAAA; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #DDDDDD; + border: 1px solid #AAAAAA; + color: #000090; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/docs/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/docs/media/stylesheet.css index 9f8d0c46c4..6ea7a6f6d6 100755 --- a/libs/PhpDocumentor-1.3.2/docs/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/docs/media/stylesheet.css @@ -1,146 +1,532 @@ -a { color: #000090; text-decoration: none; }
-a:hover, a:active, a:focus { color: highlighttext; background-color: highlight; text-decoration: none; }
-
-body { background: #FFFFFF; }
-body, table { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; }
-
-a img { border: 0px; }
-
-/* Page layout/boxes */
-
-.info-box { }
-.info-box-title { margin: 1em 0em 0em 0em; font-weight: normal; font-size: 14pt; color: #999999; border-bottom: 2px solid #999999; }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree { white-space: nowrap; font: icon }
-.tree dd { margin-left: 19px }
-.tree dl { margin: 0px }
-.tree-icon { vertical-align: middle; border: 0px; margin-right: 3px }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; color: #014fbe; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { font-weight: bold; }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; }
-.tutorial { border-width: thin; border-color: #0066ff; }
-.tutorial-nav-box { width: 100%; border: 1px solid #999999; background-color: #F8F8F8; }
-.folder-title { font-style: italic; font-family: Verdana, Arial, Helvetica, sans-serif }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left}
-.class-name { color: #0000AA; font-weight: bold; }
-
-.method-summary { color: #009000; padding-left: 1em; font-size: 8pt; }
-.method-header { }
-.method-definition { margin-bottom: .2em }
-.method-title { color: #009000; font-weight: bold; }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { color: #014fbe; margin-bottom: .3em }
-.var-type { font-style: italic; }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { color: #014fbe;}
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { color: #FF6600; }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-code a:link { padding: 1px; text-decoration: underline; color: #0000DD; }
-.src-code a:visited { text-decoration: underline; color: #0000DD; }
-.src-code a:active { background-color: #FFFF66; color: #008000; }
-.src-code a:hover { background-color: #FFFF66; text-decoration: overline underline; color: #008000; }
-
-.src-comm { color: #666666; }
-.src-id { color: #FF6600; font-style: italic; }
-.src-inc { color: #0000AA; font-weight: bold; }
-.src-key { color: #0000AA; font-weight: bold; }
-.src-num { color: #CC0000; }
-.src-str { color: #CC0000; }
-.src-sym { }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #666666; }
-.src-doc-close-template { color: #666666 }
-.src-doc-coretag { color: #008000; }
-.src-doc-inlinetag {}
-.src-doc-internal {}
-.src-doc-tag { color: #0080CC; }
-.src-doc-template { color: #666666 }
-.src-doc-type { font-style: italic; color: #444444 }
-.src-doc-var { color: #444444 }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-*[class="example"] { line-height : 0.5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-*[class="listing"] { line-height : 0.5em; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border-bottom: 1px solid #999999; color: #999999; }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #000090; + text-decoration: none; +} + +a:hover,a:active,a:focus { + color: highlighttext; + background-color: highlight; + text-decoration: none; +} + +body { + background: #FFFFFF; +} + +body,table { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; +} + +a img { + border: 0px; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + font-weight: normal; + font-size: 14pt; + color: #999999; + border-bottom: 2px solid #999999; +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F8F8F8; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree { + white-space: nowrap; + font: icon +} + +.tree dd { + margin-left: 19px +} + +.tree dl { + margin: 0px +} + +.tree-icon { + vertical-align: middle; + border: 0px; + margin-right: 3px +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + color: #014fbe; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + font-weight: bold; +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; +} + +.tutorial { + border-width: thin; + border-color: #0066ff; +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #999999; + background-color: #F8F8F8; +} + +.folder-title { + font-style: italic; + font-family: Verdana, Arial, Helvetica, sans-serif +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left +} + +.class-name { + color: #0000AA; + font-weight: bold; +} + +.method-summary { + color: #009000; + padding-left: 1em; + font-size: 8pt; +} + +.method-header { + +} + +.method-definition { + margin-bottom: .2em +} + +.method-title { + color: #009000; + font-weight: bold; +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + color: #014fbe; + margin-bottom: .3em +} + +.var-type { + font-style: italic; +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + color: #014fbe; +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + color: #FF6600; +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-code a:link { + padding: 1px; + text-decoration: underline; + color: #0000DD; +} + +.src-code a:visited { + text-decoration: underline; + color: #0000DD; +} + +.src-code a:active { + background-color: #FFFF66; + color: #008000; +} + +.src-code a:hover { + background-color: #FFFF66; + text-decoration: overline underline; + color: #008000; +} + +.src-comm { + color: #666666; +} + +.src-id { + color: #FF6600; + font-style: italic; +} + +.src-inc { + color: #0000AA; + font-weight: bold; +} + +.src-key { + color: #0000AA; + font-weight: bold; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #CC0000; +} + +.src-sym { + +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #666666; +} + +.src-doc-close-template { + color: #666666 +} + +.src-doc-coretag { + color: #008000; +} + +.src-doc-inlinetag { + +} + +.src-doc-internal { + +} + +.src-doc-tag { + color: #0080CC; +} + +.src-doc-template { + color: #666666 +} + +.src-doc-type { + font-style: italic; + color: #444444 +} + +.src-doc-var { + color: #444444 +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +*[class="example"] { + line-height: 0.5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +*[class="listing"] { + line-height: 0.5em; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border-bottom: 1px solid #999999; + color: #999999; +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/index.html b/libs/PhpDocumentor-1.3.2/index.html index 80b7ca41a9..d8dc8b1a00 100755 --- a/libs/PhpDocumentor-1.3.2/index.html +++ b/libs/PhpDocumentor-1.3.2/index.html @@ -1,17 +1,20 @@ -<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>docBuilder - phpDocumentor web interface</title>
-<meta name="Generator" content="EditPlus">
-<meta name="Author" content="Andrew Eddie">
-<meta name="Description" content="Frameset for phpDocumentor docBuilder web interface">
-</head>
-
-<frameset rows="35,*,40,135">
- <frame src="docbuilder/top.php" frameborder="no">
- <frame src="docbuilder/config.php" name="DataFrame" frameborder="no">
- <frame src="docbuilder/actions.php" name="ActionFrame" scrolling="no" marginwidth="0" marginheight="0" frameborder="no">
- <frame src="docbuilder/blank.html" name="OutputFrame" marginwidth="0" marginheight="0" frameborder="yes">
-</frameset>
-
-</html>
+<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>docBuilder - phpDocumentor web interface</title> +<meta name="Generator" content="EditPlus"> +<meta name="Author" content="Andrew Eddie"> +<meta name="Description" + content="Frameset for phpDocumentor docBuilder web interface"> +</head> + +<frameset rows="35,*,40,135"> + <frame src="docbuilder/top.php" frameborder="no"> + <frame src="docbuilder/config.php" name="DataFrame" frameborder="no"> + <frame src="docbuilder/actions.php" name="ActionFrame" scrolling="no" + marginwidth="0" marginheight="0" frameborder="no"> + <frame src="docbuilder/blank.html" name="OutputFrame" marginwidth="0" + marginheight="0" frameborder="yes"> +</frameset> + +</html> diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/CHM/default/templates/default/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/CHM/default/templates/default/templates/media/stylesheet.css index f294645db4..b4eb54a703 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/CHM/default/templates/default/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/CHM/default/templates/default/templates/media/stylesheet.css @@ -1,130 +1,154 @@ -BODY, DIV, SPAN, PRE, CODE, TD, TH {
- line-height: 140%;
- font-size: 10pt;
- font-family: verdana,arial,sans-serif;
-}
-
-H1 {
- font-size: 12pt;
-}
-
-H4 {
- font-size: 10pt;
- font-weight: bold;
-}
-
-P.label {
- margin-bottom: 5px;
-}
-P.dt {
- margin-top: 0px;
- margin-bottom: 0px;
-}
-P.indent {
- margin-top: 0px;
- margin-left: 20px;
- margin-bottom: 0px;
-}
-P.method {
- background-color: #f0f0f0;
- padding: 2px;
- border: 1px #cccccc solid;
-}
-
-A {
- text-decoration: none;
-}
-
-A:link{
- color: #336699;
-}
-
-A:visited {
- color: #003366;
-}
-
-A:active, A:hover {
- color: #6699CC;
-}
-
-A:hover{
- text-decoration: underline;
-}
-
-SPAN.type {
- color: #336699;
- font-size: xx-small;
- font-weight: normal;
- }
-
-PRE {
- background-color: #EEEEEE;
- padding: 10px;
- border-width: 1px;
- border-color: #336699;
- border-style: solid;
-}
-
-HR {
- color: #336699;
- background-color: #336699;
- border-width: 0px;
- height: 1px;
- filter: Alpha (opacity=100,finishopacity=0,style=1);
-}
-
-DIV.sdesc {
- font-weight: bold;
- background-color: #EEEEEE;
- padding: 10px;
- border-width: 1px;
- border-color: #336699;
- border-style: solid;
-}
-
-DIV.desc {
- font-family: monospace;
- background-color: #EEEEEE;
- padding: 10px;
- border-width: 1px;
- border-color: #336699;
- border-style: solid;
-}
-
-SPAN.code {
- font-family: monospace;
-}
-
-CODE.varsummarydefault{
- padding: 1px;
- border-width: 1px;
- border-style: dashed;
- border-color: #336699;
-}
-
-UL.tute {
- margin: 0px;
- padding: 0px;
- padding-left: 5px;
- }
-
-LI.tute {
- line-height: 140%;
- font-size: 10pt;
- text-indent: -15px;
- padding-bottom: 2px;
- padding-left: 14px;
-}
-
-.small{
- font-size: 9pt;
-}
-
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-.src-code { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
+BODY,DIV,SPAN,PRE,CODE,TD,TH { + line-height: 140%; + font-size: 10pt; + font-family: verdana, arial, sans-serif; +} + +H1 { + font-size: 12pt; +} + +H4 { + font-size: 10pt; + font-weight: bold; +} + +P.label { + margin-bottom: 5px; +} + +P.dt { + margin-top: 0px; + margin-bottom: 0px; +} + +P.indent { + margin-top: 0px; + margin-left: 20px; + margin-bottom: 0px; +} + +P.method { + background-color: #f0f0f0; + padding: 2px; + border: 1px #cccccc solid; +} + +A { + text-decoration: none; +} + +A:link { + color: #336699; +} + +A:visited { + color: #003366; +} + +A:active,A:hover { + color: #6699CC; +} + +A:hover { + text-decoration: underline; +} + +SPAN.type { + color: #336699; + font-size: xx-small; + font-weight: normal; +} + +PRE { + background-color: #EEEEEE; + padding: 10px; + border-width: 1px; + border-color: #336699; + border-style: solid; +} + +HR { + color: #336699; + background-color: #336699; + border-width: 0px; + height: 1px; + filter: Alpha ( opacity = 100, finishopacity = 0, style = 1 ); +} + +DIV.sdesc { + font-weight: bold; + background-color: #EEEEEE; + padding: 10px; + border-width: 1px; + border-color: #336699; + border-style: solid; +} + +DIV.desc { + font-family: monospace; + background-color: #EEEEEE; + padding: 10px; + border-width: 1px; + border-color: #336699; + border-style: solid; +} + +SPAN.code { + font-family: monospace; +} + +CODE.varsummarydefault { + padding: 1px; + border-width: 1px; + border-style: dashed; + border-color: #336699; +} + +UL.tute { + margin: 0px; + padding: 0px; + padding-left: 5px; +} + +LI.tute { + line-height: 140%; + font-size: 10pt; + text-indent: -15px; + padding-bottom: 2px; + padding-left: 14px; +} + +.small { + font-size: 9pt; +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +.src-code { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/media/style.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/media/style.css index 067a6761b1..37636009ff 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/media/style.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/HandS/templates/media/style.css @@ -1,135 +1,626 @@ -a{ background-color: transparent; color: #636331; text-decoration: none; }
-a:hover{ text-decoration: underline; }
-a.menu{ background-color: transparent; color: #636331; }
-body{ background-color: #ffffff; background-image: url("background.png"); background-repeat: repeat-y; color: #000000; font-family: tahoma,verdana,arial,sans-serif; font-size: 10pt; margin: 0; padding: 0; }
-dd { margin-left: 0px; padding-left: 1em; }
-div.credit{ font-size: 8pt; text-align: center; }
-div.description,div.tags,div.function{ padding-left: 15px; }
-div.header-top-right-subpackage{ background-color: #fdfcf2; color: #636331; font-size: 12pt; font-weight: bold; padding: 10px; text-align: right; }
-div.package{ padding-left: 5px; }
-div.warning{ background-color: transparent; color: #ff0000; }
-hr{ border-color: #ccc9a4; border-style: solid; height: 1px; margin-bottom: 10px; margin-top: 10px; }
-li { list-style-type: square; }
-td{ font-size: 10pt; vertical-align: top; }
-td.class-overview{ padding: 2px; padding-left: 1em; }
-td.code{ background-color: #ccc9a4; color: #000000; padding-left: 3em; padding-right: 1em; text-indent: -2em; }
-td.code-border{ background-color: #636331; color: #000000; }
-td.header-line{ background-color: #636331; color: #ffffff; }
-td.header-menu{ background-color: #ccc9a4; color: #636331; font-size: 8pt; padding: 2px; padding-right: 5px; text-align: right; }
-td.header-top-left{ background-color: #fdfcf2; color: #636331; font-size: 16pt; font-weight: bold; padding: 10px; text-align: left; }
-td.header-top-right{ background-color: #fdfcf2; color: #636331; font-size: 16pt; font-weight: bold; padding: 10px; text-align: right; }
-td.indent { padding-left: 1em; }
-td.menu{ padding: 2px; padding-left: 5px; }
-td.type,.folder-title,.method-result,.include-type{ font-style: italic; }
-ul{ margin-left: 0px; padding-left: 8px; vertical-align: top; }
-.class-name { color: #000000; font-weight: bold; }
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left; }
-.const-title { }
-.description{ color: #000000; }
-.detail,div.top,span.smalllinenumber{ font-size: 8pt; }
-.disabled{ color: #ccc9a4; font-style: italic; }
-.evenrow{ border: 1px solid #ccc9a4; color: #000000; margin-bottom: 1em; padding: .5em; }
-.include-title{ }
-.index-item-body { margin-bottom: .5em; margin-top: .5em; }
-.index-item-description { margin-top: .25em; }
-.index-item-details { font-size: 8pt; font-style: italic; font-weight: normal; }
-.index-letter { font-size: 12pt; }
-.index-letter-menu { margin: 1em; text-align: center; }
-.index-letter-section { background-color: #ccc9a4; border: 1px dotted #636331; margin-bottom: 1em; padding: .5em; }
-.index-letter-title { font-size: 12pt; font-weight: bold; }
-.info-box{ }
-.info-box-body{ border: 1px solid #ccc9a4; padding: .5em; }
-.info-box-title{ background-color: #ccc9a4; border: 1px solid #636331; color: #636331; font-size: 14pt; font-weight: normal; margin: 1em 0em 0em 0em; padding: .25em; }
-.line-number, .var-name-summary { font-size: 8pt; font-weight: bold; }
-.method-definition { font-size: 8pt; margin-bottom: .3em; padding-left: 1em; }
-.method-definition{ font-size: 8pt; margin-bottom: .3em; }
-.method-header{ }
-.method-result { color: #636331; font-size: 8pt; font-style: italic; }
-.method-signature{ color: #ccc9a4; font-size: 85%; margin: .5em 0em; }
-.nav-bar{ font-size: 8pt; margin: 0em 0em 1em 0em; padding: .2em; text-align: right; white-space: nowrap; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover{ background-color: #dddddd; outline: 1px solid #999999; text-decoration: none; }
-.nav-button-disabled{ color: #999999; }
-.notes{ font-size: 8pt; font-style: italic; }
-.oddrow{ background-color: #fdfcf2; border: 1px solid #ccc9a4; color: #000000; margin-bottom: 1em; padding: .5em; }
-.package{ padding-left : 2em; font-size : 9pt; }
-.package-details{ font-size: 85%; }
-.package-title{ border-bottom: 1px solid #000000; font-size: 14pt; font-weight: bold; }
-.page-body{ margin: auto; max-width: 800px; }
-.parameters{ list-style-type: square; margin-bottom: 0em; margin-left: 3em; margin-right: 1em; margin-top: 0em; padding-left: 0em; vertical-align: top; }
-.redefinitions{ font-size: 8pt; margin-left: 2em; padding-left: 0em; }
-.separator{ background-color: #ccc9a4; height: 1px; }
-.short-description{ color: #636331; font-weight: bold; }
-.src-code li, .php-src li, .php li, .listing li { list-style-type: decimal }
-/* This will not be executed by IE, so now we have a fix! */
-.php-src { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.sub-package{ font-size: 120%; font-weight: bold; }
-.tags{ color: #636331; list-style-type: square; margin-bottom: 0em; margin-left: 3em; margin-right: 1em; margin-top: 0em; padding-left: 0em; vertical-align: top; }
-.tree dl { margin: 0px; }
-.tutorial{ border-color: #0066ff; border-width: thin; }
-.tutorial-nav-box{ background-color: #fdfcf2; border: 1px solid #999999; width: 100%; }
-.var-default{ }
-.var-summary-description { font-size: 8pt; font-weight: normal; color: #000000; }
-.var-description{ color: #000000; font-weight: normal; }
-.var-header{ }
-.var-name, .const-name, .method-title,.method-name,.include-name,.var-name,.field { font-weight: bold; }
-.var-summary,.method-summary{ font-size: 8pt;}
-.var-title{ margin-bottom: .3em; }
-.var-type{ color: #636331; font-style: italic; }
-.var-type-summary{ color: #636331; font-size: 8pt; font-style: italic; padding-left: 1em; }
-.warning{ color: #ff6600; }
-
-/* Syntax highlighting */
-
-.src-code { background-color: #f5f5f5; border: 1px solid #ccc9a4; padding: 1em; margin : 0px;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; margin: 1em 0em 0em 0em; padding: .25em; border: 2px solid #999999; background-color: #fdfcf2;
- color: #636331; }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + background-color: transparent; + color: #636331; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +a.menu { + background-color: transparent; + color: #636331; +} + +body { + background-color: #ffffff; + background-image: url("background.png"); + background-repeat: repeat-y; + color: #000000; + font-family: tahoma, verdana, arial, sans-serif; + font-size: 10pt; + margin: 0; + padding: 0; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +div.credit { + font-size: 8pt; + text-align: center; +} + +div.description,div.tags,div.function { + padding-left: 15px; +} + +div.header-top-right-subpackage { + background-color: #fdfcf2; + color: #636331; + font-size: 12pt; + font-weight: bold; + padding: 10px; + text-align: right; +} + +div.package { + padding-left: 5px; +} + +div.warning { + background-color: transparent; + color: #ff0000; +} + +hr { + border-color: #ccc9a4; + border-style: solid; + height: 1px; + margin-bottom: 10px; + margin-top: 10px; +} + +li { + list-style-type: square; +} + +td { + font-size: 10pt; + vertical-align: top; +} + +td.class-overview { + padding: 2px; + padding-left: 1em; +} + +td.code { + background-color: #ccc9a4; + color: #000000; + padding-left: 3em; + padding-right: 1em; + text-indent: -2em; +} + +td.code-border { + background-color: #636331; + color: #000000; +} + +td.header-line { + background-color: #636331; + color: #ffffff; +} + +td.header-menu { + background-color: #ccc9a4; + color: #636331; + font-size: 8pt; + padding: 2px; + padding-right: 5px; + text-align: right; +} + +td.header-top-left { + background-color: #fdfcf2; + color: #636331; + font-size: 16pt; + font-weight: bold; + padding: 10px; + text-align: left; +} + +td.header-top-right { + background-color: #fdfcf2; + color: #636331; + font-size: 16pt; + font-weight: bold; + padding: 10px; + text-align: right; +} + +td.indent { + padding-left: 1em; +} + +td.menu { + padding: 2px; + padding-left: 5px; +} + +td.type,.folder-title,.method-result,.include-type { + font-style: italic; +} + +ul { + margin-left: 0px; + padding-left: 8px; + vertical-align: top; +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left; +} + +.const-title { + +} + +.description { + color: #000000; +} + +.detail,div.top,span.smalllinenumber { + font-size: 8pt; +} + +.disabled { + color: #ccc9a4; + font-style: italic; +} + +.evenrow { + border: 1px solid #ccc9a4; + color: #000000; + margin-bottom: 1em; + padding: .5em; +} + +.include-title { + +} + +.index-item-body { + margin-bottom: .5em; + margin-top: .5em; +} + +.index-item-description { + margin-top: .25em; +} + +.index-item-details { + font-size: 8pt; + font-style: italic; + font-weight: normal; +} + +.index-letter { + font-size: 12pt; +} + +.index-letter-menu { + margin: 1em; + text-align: center; +} + +.index-letter-section { + background-color: #ccc9a4; + border: 1px dotted #636331; + margin-bottom: 1em; + padding: .5em; +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold; +} + +.info-box { + +} + +.info-box-body { + border: 1px solid #ccc9a4; + padding: .5em; +} + +.info-box-title { + background-color: #ccc9a4; + border: 1px solid #636331; + color: #636331; + font-size: 14pt; + font-weight: normal; + margin: 1em 0em 0em 0em; + padding: .25em; +} + +.line-number,.var-name-summary { + font-size: 8pt; + font-weight: bold; +} + +.method-definition { + font-size: 8pt; + margin-bottom: .3em; + padding-left: 1em; +} + +.method-definition { + font-size: 8pt; + margin-bottom: .3em; +} + +.method-header { + +} + +.method-result { + color: #636331; + font-size: 8pt; + font-style: italic; +} + +.method-signature { + color: #ccc9a4; + font-size: 85%; + margin: .5em 0em; +} + +.nav-bar { + font-size: 8pt; + margin: 0em 0em 1em 0em; + padding: .2em; + text-align: right; + white-space: nowrap; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #dddddd; + outline: 1px solid #999999; + text-decoration: none; +} + +.nav-button-disabled { + color: #999999; +} + +.notes { + font-size: 8pt; + font-style: italic; +} + +.oddrow { + background-color: #fdfcf2; + border: 1px solid #ccc9a4; + color: #000000; + margin-bottom: 1em; + padding: .5em; +} + +.package { + padding-left: 2em; + font-size: 9pt; +} + +.package-details { + font-size: 85%; +} + +.package-title { + border-bottom: 1px solid #000000; + font-size: 14pt; + font-weight: bold; +} + +.page-body { + margin: auto; + max-width: 800px; +} + +.parameters { + list-style-type: square; + margin-bottom: 0em; + margin-left: 3em; + margin-right: 1em; + margin-top: 0em; + padding-left: 0em; + vertical-align: top; +} + +.redefinitions { + font-size: 8pt; + margin-left: 2em; + padding-left: 0em; +} + +.separator { + background-color: #ccc9a4; + height: 1px; +} + +.short-description { + color: #636331; + font-weight: bold; +} + +.src-code li,.php-src li,.php li,.listing li { + list-style-type: decimal +} + +/* This will not be executed by IE, so now we have a fix! */ +.php-src { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.sub-package { + font-size: 120%; + font-weight: bold; +} + +.tags { + color: #636331; + list-style-type: square; + margin-bottom: 0em; + margin-left: 3em; + margin-right: 1em; + margin-top: 0em; + padding-left: 0em; + vertical-align: top; +} + +.tree dl { + margin: 0px; +} + +.tutorial { + border-color: #0066ff; + border-width: thin; +} + +.tutorial-nav-box { + background-color: #fdfcf2; + border: 1px solid #999999; + width: 100%; +} + +.var-default { + +} + +.var-summary-description { + font-size: 8pt; + font-weight: normal; + color: #000000; +} + +.var-description { + color: #000000; + font-weight: normal; +} + +.var-header { + +} + +.var-name,.const-name,.method-title,.method-name,.include-name,.var-name,.field + { + font-weight: bold; +} + +.var-summary,.method-summary { + font-size: 8pt; +} + +.var-title { + margin-bottom: .3em; +} + +.var-type { + color: #636331; + font-style: italic; +} + +.var-type-summary { + color: #636331; + font-size: 8pt; + font-style: italic; + padding-left: 1em; +} + +.warning { + color: #ff6600; +} + +/* Syntax highlighting */ +.src-code { + background-color: #f5f5f5; + border: 1px solid #ccc9a4; + padding: 1em; + margin: 0px; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + margin: 1em 0em 0em 0em; + padding: .25em; + border: 2px solid #999999; + background-color: #fdfcf2; + color: #636331; +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/media/style.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/media/style.css index 919f9d9c46..bbe8d98b95 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/media/style.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/PHP/templates/media/style.css @@ -1,195 +1,314 @@ -.php {
- padding: 1em;
-}
-.php-src { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-body
-{
- color: #000000;
- background-color: #ffffff;
- background-image: url("background.png");
- background-repeat: repeat-y;
- font-family: tahoma, verdana, arial, sans-serif;
- font-size: 10pt;
- margin: 0;
- padding: 0;
-}
-
-a
-{
- color: #000099;
- background-color: transparent;
- text-decoration: none;
-}
-
-a:hover
-{
- text-decoration: underline;
-}
-
-a.menu
-{
- color: #ffffff;
- background-color: transparent;
-}
-
-td
-{
- font-size: 10pt;
-}
-
-td.header_top
-{
- color: #ffffff;
- background-color: #9999cc;
- font-size: 16pt;
- font-weight: bold;
- text-align: right;
- padding: 10px;
-}
-
-td.header_line
-{
- color: #ffffff;
- background-color: #333366;
-}
-
-td.header_menu
-{
- color: #ffffff;
- background-color: #666699;
- font-size: 8pt;
- text-align: right;
- padding: 2px;
- padding-right: 5px;
-}
-
-td.menu
-{
- padding: 2px;
- padding-left: 5px;
-}
-
-td.code_border
-{
- color: #000000;
- background-color: #c0c0c0;
-}
-
-td.code
-{
- color: #000000;
- background-color: #f0f0f0;
-}
-
-td.type
-{
- font-style: italic;
-}
-
-div.credit
-{
- font-size: 8pt;
- text-align: center;
-}
-
-div.package
-{
- padding-left: 5px;
-}
-
-div.tags
-{
- padding-left: 15px;
-}
-
-div.function
-{
- padding-left: 15px;
-}
-
-div.top
-{
- font-size: 8pt;
-}
-
-div.warning
-{
- color: #ff0000;
- background-color: transparent;
-}
-
-div.description
-{
- padding-left: 15px;
-}
-
-hr
-{
- height: 1px;
- border-style: solid;
- border-color: #c0c0c0;
- margin-top: 10px;
- margin-bottom: 10px;
-}
-
-span.smalllinenumber
-{
- font-size: 8pt;
-}
-
-ul {
- margin-left: 0px;
- padding-left: 8px;
-}
-/* Syntax highlighting */
-
-.src-code { background-color: #f5f5f5; border: 1px solid #ccc9a4; padding: 0 0 0 1em; margin : 0px;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; margin: 1em 0em 0em 0em; padding: .25em; border: 2px solid #999999; background-color: #9999CC }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+.php { + padding: 1em; +} + +.php-src { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +body { + color: #000000; + background-color: #ffffff; + background-image: url("background.png"); + background-repeat: repeat-y; + font-family: tahoma, verdana, arial, sans-serif; + font-size: 10pt; + margin: 0; + padding: 0; +} + +a { + color: #000099; + background-color: transparent; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +a.menu { + color: #ffffff; + background-color: transparent; +} + +td { + font-size: 10pt; +} + +td.header_top { + color: #ffffff; + background-color: #9999cc; + font-size: 16pt; + font-weight: bold; + text-align: right; + padding: 10px; +} + +td.header_line { + color: #ffffff; + background-color: #333366; +} + +td.header_menu { + color: #ffffff; + background-color: #666699; + font-size: 8pt; + text-align: right; + padding: 2px; + padding-right: 5px; +} + +td.menu { + padding: 2px; + padding-left: 5px; +} + +td.code_border { + color: #000000; + background-color: #c0c0c0; +} + +td.code { + color: #000000; + background-color: #f0f0f0; +} + +td.type { + font-style: italic; +} + +div.credit { + font-size: 8pt; + text-align: center; +} + +div.package { + padding-left: 5px; +} + +div.tags { + padding-left: 15px; +} + +div.function { + padding-left: 15px; +} + +div.top { + font-size: 8pt; +} + +div.warning { + color: #ff0000; + background-color: transparent; +} + +div.description { + padding-left: 15px; +} + +hr { + height: 1px; + border-style: solid; + border-color: #c0c0c0; + margin-top: 10px; + margin-bottom: 10px; +} + +span.smalllinenumber { + font-size: 8pt; +} + +ul { + margin-left: 0px; + padding-left: 8px; +} + +/* Syntax highlighting */ +.src-code { + background-color: #f5f5f5; + border: 1px solid #ccc9a4; + padding: 0 0 0 1em; + margin: 0px; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + margin: 1em 0em 0em 0em; + padding: .25em; + border: 2px solid #999999; + background-color: #9999CC +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/layout.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/layout.css index bd892a5a71..c61b691b94 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/layout.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/layout.css @@ -1,81 +1,93 @@ -#header {
- z-index: 100;
- position: absolute;
- top: 0px;
- left: 0px;
- width: 100%;
- height: 5%;
-}
-#nav {
- z-index: 200;
- position: absolute;
- top: 5%;
- left: 0px;
- width: 15%;
- height: 1600px;
- clip: auto;
- overflow: auto;
-}
-#body {
- position: absolute;
- top: 6%;
- left: 17%;
- width: 82%;
-}
-#content {
- clear: both;
- top: -1px;
-}
-#packagePosition {
- position: absolute;
- right: 5px;
- top: 0px;
- width: 35%;
- height: 100%;
-}
-#packageTitle {
- position: absolute;
- right: 0px;
-}
-#packageTitle2 {
- position: absolute;
- right: -3px;
- top: -2px;
-}
-#elementPath {
- position: absolute;
- right: 0px;
- bottom: 0px;
-}
-#navLinks {
- position: absolute;
- top: 0px;
- left: 10px;
- height: 100%;
-
-}
-.leftCol {
- width: auto;
- float: left;
-}
-.middleCol {
- width: auto;
- float: left;
-}
-.rightCol {
- width: auto;
- float: left;
-}
-#credit {
- margin-top: 20px;
- margin-bottom: 50px;
-}
-
-/** Fixed layout for nav on mozilla */
-head:first-child+body div#header {
- position: fixed;
-}
-head:first-child+body div#nav {
- position: fixed;
- height: 94%
-}
+#header { + z-index: 100; + position: absolute; + top: 0px; + left: 0px; + width: 100%; + height: 5%; +} + +#nav { + z-index: 200; + position: absolute; + top: 5%; + left: 0px; + width: 15%; + height: 1600px; + clip: auto; + overflow: auto; +} + +#body { + position: absolute; + top: 6%; + left: 17%; + width: 82%; +} + +#content { + clear: both; + top: -1px; +} + +#packagePosition { + position: absolute; + right: 5px; + top: 0px; + width: 35%; + height: 100%; +} + +#packageTitle { + position: absolute; + right: 0px; +} + +#packageTitle2 { + position: absolute; + right: -3px; + top: -2px; +} + +#elementPath { + position: absolute; + right: 0px; + bottom: 0px; +} + +#navLinks { + position: absolute; + top: 0px; + left: 10px; + height: 100%; +} + +.leftCol { + width: auto; + float: left; +} + +.middleCol { + width: auto; + float: left; +} + +.rightCol { + width: auto; + float: left; +} + +#credit { + margin-top: 20px; + margin-bottom: 50px; +} + +/** Fixed layout for nav on mozilla */ +head:first-child+body div#header { + position: fixed; +} + +head:first-child+body div#nav { + position: fixed; + height: 94% +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/layout.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/layout.css index bd892a5a71..c61b691b94 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/layout.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/layout.css @@ -1,81 +1,93 @@ -#header {
- z-index: 100;
- position: absolute;
- top: 0px;
- left: 0px;
- width: 100%;
- height: 5%;
-}
-#nav {
- z-index: 200;
- position: absolute;
- top: 5%;
- left: 0px;
- width: 15%;
- height: 1600px;
- clip: auto;
- overflow: auto;
-}
-#body {
- position: absolute;
- top: 6%;
- left: 17%;
- width: 82%;
-}
-#content {
- clear: both;
- top: -1px;
-}
-#packagePosition {
- position: absolute;
- right: 5px;
- top: 0px;
- width: 35%;
- height: 100%;
-}
-#packageTitle {
- position: absolute;
- right: 0px;
-}
-#packageTitle2 {
- position: absolute;
- right: -3px;
- top: -2px;
-}
-#elementPath {
- position: absolute;
- right: 0px;
- bottom: 0px;
-}
-#navLinks {
- position: absolute;
- top: 0px;
- left: 10px;
- height: 100%;
-
-}
-.leftCol {
- width: auto;
- float: left;
-}
-.middleCol {
- width: auto;
- float: left;
-}
-.rightCol {
- width: auto;
- float: left;
-}
-#credit {
- margin-top: 20px;
- margin-bottom: 50px;
-}
-
-/** Fixed layout for nav on mozilla */
-head:first-child+body div#header {
- position: fixed;
-}
-head:first-child+body div#nav {
- position: fixed;
- height: 94%
-}
+#header { + z-index: 100; + position: absolute; + top: 0px; + left: 0px; + width: 100%; + height: 5%; +} + +#nav { + z-index: 200; + position: absolute; + top: 5%; + left: 0px; + width: 15%; + height: 1600px; + clip: auto; + overflow: auto; +} + +#body { + position: absolute; + top: 6%; + left: 17%; + width: 82%; +} + +#content { + clear: both; + top: -1px; +} + +#packagePosition { + position: absolute; + right: 5px; + top: 0px; + width: 35%; + height: 100%; +} + +#packageTitle { + position: absolute; + right: 0px; +} + +#packageTitle2 { + position: absolute; + right: -3px; + top: -2px; +} + +#elementPath { + position: absolute; + right: 0px; + bottom: 0px; +} + +#navLinks { + position: absolute; + top: 0px; + left: 10px; + height: 100%; +} + +.leftCol { + width: auto; + float: left; +} + +.middleCol { + width: auto; + float: left; +} + +.rightCol { + width: auto; + float: left; +} + +#credit { + margin-top: 20px; + margin-bottom: 50px; +} + +/** Fixed layout for nav on mozilla */ +head:first-child+body div#header { + position: fixed; +} + +head:first-child+body div#nav { + position: fixed; + height: 94% +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/print.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/print.css index 82c767e6d4..5909308b1c 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/print.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/print.css @@ -1,25 +1,33 @@ -BODY {
- margin: 1em;
-}
-#header {
-}
-#nav {
- display: none;
-}
-#packagePosition {
- text-align: right;
-}
-#packageTitle {
- display: inline;
- margin: 5px;
-}
-#packageTitle2 {
- display: none;
-}
-#elementPath {
- display: inline;
- margin: 5px;
-}
-#navLinks {
- display: none;
-}
+BODY { + margin: 1em; +} + +#header { + +} + +#nav { + display: none; +} + +#packagePosition { + text-align: right; +} + +#packageTitle { + display: inline; + margin: 5px; +} + +#packageTitle2 { + display: none; +} + +#elementPath { + display: inline; + margin: 5px; +} + +#navLinks { + display: none; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/style.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/style.css index 56fff99498..faed596c67 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/style.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/media/style.css @@ -1,236 +1,409 @@ -BODY {
- background: #FFFFFF;
- font-family: Arial;
- margin: 0px;
- padding: 0px;
-}
-A {
- color: #CC4400;
- font-weight: bold;
-}
-A:Hover {
- color: white;
- background-color: #334B66;
- font-weight: bold;
- text-decoration: none;
-}
-
-#packageTitle {
- font-size: 160%;
- font-weight: bold;
- text-align: right;
- color: #CC6633;
-}
-#packageTitle2 {
- font-size: 160%;
- font-weight: bold;
- text-align: right;
- color: #334B66;
- background-color: #6699CC;
-}
-#packageLinks {
- background-color: #6699CC;
-}
-#header {
- background-color: #6699CC;
- border-bottom: solid #334B66 4px;
-}
-#nav {
- background-color: #6699CC;
- padding: 4px;
- border-right: solid #334B66 4px;
-}
-#index {
- padding: 18px;
-}
-hr {
- width: 80%;
- background-color: #6699CC;
- color: #6699CC;
- margin-top: 15px;
- margin-bottom: 15px;
- clear: both;
-}
-.links {
- text-align: left;
- width: 98%;
- margin: auto;
-}
-UL {
- margin: 0px;
- padding: 0px;
- padding-left: 5px;
- list-style-type: none;
-}
-li {
- text-indent: -15px;
- padding-bottom: 2px;
- padding-left: 14px;
-}
-dd {
- margin-bottom: .5em;
-}
-.small {
- font-size: 80%;
-}
-h3 {
-}
-.middleCol {
- margin-left: -1px;
- border-right: dotted gray 1px;
- border-left: dotted gray 1px;
- padding: 5px;
-}
-.leftCol {
- border-right: dotted gray 1px;
- padding: 5px;
-}
-.rightCol {
- margin-left: -1px;
- border-left: dotted gray 1px;
- padding: 5px;
-}
-#elementPath {
- font-size: 14px;
- font-weight: bold;
- color: #334B66;
-}
-.constructor {
- /*border: dashed #334B66 1px;*/
- font-weight: bold;
-}
-#credit {
- text-align: center;
- color: #334B66;
- font-weight: bold;
-}
-div.contents {
- border: solid #334B66 1px;
- padding: 3px;
- margin-bottom: 5px;
- clear: all;
-}
-H1 {
- margin: 0px;
-}
-H2 {
- margin: 0px;
- margin-bottom: 2px;
-}
-H3 {
- margin: 0px;
-}
-H4 {
- margin: 0px;
-}
-#classTree {
- padding: 0px;
- margin: 0px;
-}
-div.indent {
- margin-left: 15px;
-}
-.warning {
- color: red;
- background-color: #334B66;
- font-weight: bold;
-}
-code {
- font-family: fixed;
- padding: 3px;
- color: #334B66;
- background-color: #dddddd;
-}
-.type {
- color: #334B66;
-}
-.value {
- color: #334B66;
- border: dotted #334B66 1px;
-}
-.top {
- color: #334B66;
- border-bottom: dotted #334B66 1px;
- padding-bottom: 4px;
-}
-.php-src, .php, .listing {
- font-family: fixed;
- padding: 3px;
- color: #334B66;
- background-color: #dddddd;
- font-family: 'Courier New', Courier, monospace; font-weight: normal;
-}
-DIV#nav DL {
- margin: 0px;
- padding: 0px;
- list-style-type: none;
-}
-div.classtree {
- font-size: 130%;
- font-weight: bold;
- background-color: #CC6633;
- border: dotted #334B66 2px;
-}
-span.linenumber,p.linenumber {
- font-weight: bold,italic;
-}
-span.smalllinenumber {
- font-weight: bold,italic;
- font-size: 9pt;
-}
-ul {
- margin-left: 0px;
- padding-left: 8px;
-}
-/* Syntax highlighting */
-
-.src-code { background-color: #f5f5f5; border: 1px solid #ccc9a4; padding: 0px; margin : 0px}
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-/*.src-code pre { }*/
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; margin: 1em 0em 0em 0em; padding: .25em;
- border: 2px solid #CC6633; background-color: #6699CC }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+BODY { + background: #FFFFFF; + font-family: Arial; + margin: 0px; + padding: 0px; +} + +A { + color: #CC4400; + font-weight: bold; +} + +A:Hover { + color: white; + background-color: #334B66; + font-weight: bold; + text-decoration: none; +} + +#packageTitle { + font-size: 160%; + font-weight: bold; + text-align: right; + color: #CC6633; +} + +#packageTitle2 { + font-size: 160%; + font-weight: bold; + text-align: right; + color: #334B66; + background-color: #6699CC; +} + +#packageLinks { + background-color: #6699CC; +} + +#header { + background-color: #6699CC; + border-bottom: solid #334B66 4px; +} + +#nav { + background-color: #6699CC; + padding: 4px; + border-right: solid #334B66 4px; +} + +#index { + padding: 18px; +} + +hr { + width: 80%; + background-color: #6699CC; + color: #6699CC; + margin-top: 15px; + margin-bottom: 15px; + clear: both; +} + +.links { + text-align: left; + width: 98%; + margin: auto; +} + +UL { + margin: 0px; + padding: 0px; + padding-left: 5px; + list-style-type: none; +} + +li { + text-indent: -15px; + padding-bottom: 2px; + padding-left: 14px; +} + +dd { + margin-bottom: .5em; +} + +.small { + font-size: 80%; +} + +h3 { + +} + +.middleCol { + margin-left: -1px; + border-right: dotted gray 1px; + border-left: dotted gray 1px; + padding: 5px; +} + +.leftCol { + border-right: dotted gray 1px; + padding: 5px; +} + +.rightCol { + margin-left: -1px; + border-left: dotted gray 1px; + padding: 5px; +} + +#elementPath { + font-size: 14px; + font-weight: bold; + color: #334B66; +} + +.constructor { /*border: dashed #334B66 1px;*/ + font-weight: bold; +} + +#credit { + text-align: center; + color: #334B66; + font-weight: bold; +} + +div.contents { + border: solid #334B66 1px; + padding: 3px; + margin-bottom: 5px; + clear: all; +} + +H1 { + margin: 0px; +} + +H2 { + margin: 0px; + margin-bottom: 2px; +} + +H3 { + margin: 0px; +} + +H4 { + margin: 0px; +} + +#classTree { + padding: 0px; + margin: 0px; +} + +div.indent { + margin-left: 15px; +} + +.warning { + color: red; + background-color: #334B66; + font-weight: bold; +} + +code { + font-family: fixed; + padding: 3px; + color: #334B66; + background-color: #dddddd; +} + +.type { + color: #334B66; +} + +.value { + color: #334B66; + border: dotted #334B66 1px; +} + +.top { + color: #334B66; + border-bottom: dotted #334B66 1px; + padding-bottom: 4px; +} + +.php-src,.php,.listing { + font-family: fixed; + padding: 3px; + color: #334B66; + background-color: #dddddd; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +DIV#nav DL { + margin: 0px; + padding: 0px; + list-style-type: none; +} + +div.classtree { + font-size: 130%; + font-weight: bold; + background-color: #CC6633; + border: dotted #334B66 2px; +} + +span.linenumber,p.linenumber { + font-weight: bold, italic; +} + +span.smalllinenumber { + font-weight: bold, italic; + font-size: 9pt; +} + +ul { + margin-left: 0px; + padding-left: 8px; +} + +/* Syntax highlighting */ +.src-code { + background-color: #f5f5f5; + border: 1px solid #ccc9a4; + padding: 0px; + margin: 0px +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +/*.src-code pre { }*/ +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + margin: 1em 0em 0em 0em; + padding: .25em; + border: 2px solid #CC6633; + background-color: #6699CC +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/style.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/style.css index 91088b374b..94a6836c6b 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/style.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/Smarty/templates/default/templates/style.css @@ -1,172 +1,208 @@ -BODY {
- font-family: Arial;
- margin: 0px;
- padding: 0px;
-}
-A {
- color: #CC4400;
- font-weight: bold;
-}
-A:Hover {
- color: white;
- background-color: #334B66;
- font-weight: bold;
- text-decoration: none;
-}
-
-#packageTitle {
- font-size: 160%;
- font-weight: bold;
- text-align: right;
- color: #CC6633;
-}
-#packageTitle2 {
- font-size: 160%;
- font-weight: bold;
- text-align: right;
- color: #334B66;
- background-color: #6699CC;
-}
-#packageLinks {
- background-color: #6699CC;
-}
-#header {
- background-color: #6699CC;
- border-bottom: solid #334B66 4px;
-}
-#nav {
- background-color: #6699CC;
- padding: 4px;
- border-right: solid #334B66 4px;
-}
-#index {
- padding: 18px;
-}
-hr {
- width: 80%;
- background-color: #6699CC;
- color: #6699CC;
- margin-top: 15px;
- margin-bottom: 15px;
- clear: both;
-}
-.links {
- text-align: left;
- width: 98%;
- margin: auto;
-}
-UL {
- margin: 0px;
- padding: 0px;
- padding-left: 5px;
- list-style-type: none;
-}
-li {
- text-indent: -15px;
- padding-bottom: 2px;
- padding-left: 14px;
-}
-dd {
- margin-bottom: .5em;
-}
-.small {
- font-size: 80%;
-}
-h3 {
-}
-.middleCol {
- margin-left: -1px;
- border-right: dotted gray 1px;
- border-left: dotted gray 1px;
- padding: 5px;
-}
-.leftCol {
- border-right: dotted gray 1px;
- padding: 5px;
-}
-.rightCol {
- margin-left: -1px;
- border-left: dotted gray 1px;
- padding: 5px;
-}
-#elementPath {
- font-size: 14px;
- font-weight: bold;
- color: #334B66;
-}
-.constructor {
- /*border: dashed #334B66 1px;*/
- font-weight: bold;
-}
-#credit {
- text-align: center;
- color: #334B66;
- font-weight: bold;
-}
-div.contents {
- border: solid #334B66 1px;
- padding: 3px;
- margin-bottom: 5px;
- clear: all;
-}
-H1 {
- margin: 0px;
-}
-H2 {
- margin: 0px;
- margin-bottom: 2px;
-}
-H3 {
- margin: 0px;
-}
-H4 {
- margin: 0px;
-}
-#classTree {
- padding: 0px;
- margin: 0px;
-}
-div.indent {
- margin-left: 15px;
-}
-.warning {
- color: red;
- background-color: #334B66;
- font-weight: bold;
-}
-code {
- font-family: fixed;
- padding: 3px;
- color: #334B66;
- background-color: #dddddd;
-}
-.type {
- color: #334B66;
-}
-.value {
- color: #334B66;
- border: dotted #334B66 1px;
-}
-.top {
- color: #334B66;
- border-bottom: dotted #334B66 1px;
- padding-bottom: 4px;
-}
-DIV#nav DL {
- margin: 0px;
- padding: 0px;
- list-style-type: none;
-}
-div.classtree {
- font-size: 130%;
- font-weight: bold;
- background-color: #CC6633;
- border: dotted #334B66 2px;
-}
-span.linenumber,p.linenumber {
- font-weight: bold,italic;
-}
-span.smalllinenumber {
- font-weight: bold,italic;
- font-size: 9pt;
-}
+BODY { + font-family: Arial; + margin: 0px; + padding: 0px; +} + +A { + color: #CC4400; + font-weight: bold; +} + +A:Hover { + color: white; + background-color: #334B66; + font-weight: bold; + text-decoration: none; +} + +#packageTitle { + font-size: 160%; + font-weight: bold; + text-align: right; + color: #CC6633; +} + +#packageTitle2 { + font-size: 160%; + font-weight: bold; + text-align: right; + color: #334B66; + background-color: #6699CC; +} + +#packageLinks { + background-color: #6699CC; +} + +#header { + background-color: #6699CC; + border-bottom: solid #334B66 4px; +} + +#nav { + background-color: #6699CC; + padding: 4px; + border-right: solid #334B66 4px; +} + +#index { + padding: 18px; +} + +hr { + width: 80%; + background-color: #6699CC; + color: #6699CC; + margin-top: 15px; + margin-bottom: 15px; + clear: both; +} + +.links { + text-align: left; + width: 98%; + margin: auto; +} + +UL { + margin: 0px; + padding: 0px; + padding-left: 5px; + list-style-type: none; +} + +li { + text-indent: -15px; + padding-bottom: 2px; + padding-left: 14px; +} + +dd { + margin-bottom: .5em; +} + +.small { + font-size: 80%; +} + +h3 { + +} + +.middleCol { + margin-left: -1px; + border-right: dotted gray 1px; + border-left: dotted gray 1px; + padding: 5px; +} + +.leftCol { + border-right: dotted gray 1px; + padding: 5px; +} + +.rightCol { + margin-left: -1px; + border-left: dotted gray 1px; + padding: 5px; +} + +#elementPath { + font-size: 14px; + font-weight: bold; + color: #334B66; +} + +.constructor { /*border: dashed #334B66 1px;*/ + font-weight: bold; +} + +#credit { + text-align: center; + color: #334B66; + font-weight: bold; +} + +div.contents { + border: solid #334B66 1px; + padding: 3px; + margin-bottom: 5px; + clear: all; +} + +H1 { + margin: 0px; +} + +H2 { + margin: 0px; + margin-bottom: 2px; +} + +H3 { + margin: 0px; +} + +H4 { + margin: 0px; +} + +#classTree { + padding: 0px; + margin: 0px; +} + +div.indent { + margin-left: 15px; +} + +.warning { + color: red; + background-color: #334B66; + font-weight: bold; +} + +code { + font-family: fixed; + padding: 3px; + color: #334B66; + background-color: #dddddd; +} + +.type { + color: #334B66; +} + +.value { + color: #334B66; + border: dotted #334B66 1px; +} + +.top { + color: #334B66; + border-bottom: dotted #334B66 1px; + padding-bottom: 4px; +} + +DIV#nav DL { + margin: 0px; + padding: 0px; + list-style-type: none; +} + +div.classtree { + font-size: 130%; + font-weight: bold; + background-color: #CC6633; + border: dotted #334B66 2px; +} + +span.linenumber,p.linenumber { + font-weight: bold, italic; +} + +span.smalllinenumber { + font-weight: bold, italic; + font-size: 9pt; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/banner.css index e67227b7cb..3502ec4182 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background-color: #CCCCFF;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #6666AA;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #AAAADD;
- border: 1px solid black;
- color: yellow;
-}
+body { + background-color: #CCCCFF; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #6666AA; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #AAAADD; + border: 1px solid black; + color: yellow; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/stylesheet.css index 620673eb13..a3c177a86d 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/default/templates/media/stylesheet.css @@ -1,184 +1,550 @@ -a { color: #336699; text-decoration: none; }
-a:hover { color: #6699CC; text-decoration: underline; }
-a:active { color: #6699CC; text-decoration: underline; }
-
-body { background : #FFFFFF; }
-body, table { font-family: Georgia, Times New Roman, Times, serif; font-size: 10pt }
-p, li { line-height: 140% }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 2px solid #999999; background-color: #CCCCFF }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree { }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 1px solid #999999; background-color: #F8F8F8; }
-.nav-button-disabled { color: #999999; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #DDDDDD; outline: 1px solid #999999; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left}
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold; }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { margin-bottom: .3em }
-.var-type { font-style: italic; }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #336699; padding: 1em; background-color: #EEEEEE; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; margin: 1em 0em 0em 0em; padding: .25em; border: 2px solid #999999; background-color: #CCCCFF }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #336699; + text-decoration: none; +} + +a:hover { + color: #6699CC; + text-decoration: underline; +} + +a:active { + color: #6699CC; + text-decoration: underline; +} + +body { + background: #FFFFFF; +} + +body,table { + font-family: Georgia, Times New Roman, Times, serif; + font-size: 10pt +} + +p,li { + line-height: 140% +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 2px solid #999999; + background-color: #CCCCFF +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F8F8F8; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree { + +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #999999; + background-color: #F8F8F8; +} + +.nav-button-disabled { + color: #999999; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #DDDDDD; + outline: 1px solid #999999; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold; +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + font-style: italic; +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #336699; + padding: 1em; + background-color: #EEEEEE; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + margin: 1em 0em 0em 0em; + padding: .25em; + border: 2px solid #999999; + background-color: #CCCCFF +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +} + /*------------------------------------------------------------------------------
webfx-tree
-------------------------------------------------------------------------------*/
-
-.webfx-tree-container {
- margin: 0px;
- padding: 0px;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item {
- padding: 0px;
- margin: 0px;
- color: black;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item a {
- margin-left: 3px;
- padding: 1px 2px 1px 2px;
- color: black;
- text-decoration: none;
-}
-
-.webfx-tree-item a:hover, .webfx-tree-item a:active, .webfx-tree-item a:focus {
- color: black;
- background: #CCCCFF;
- text-decoration: none
-}
-
-.webfx-tree-item img {
- vertical-align: middle;
- border: 0px;
-}
-
-.webfx-tree-icon {
- width: 16px;
- height: 16px;
-}
-
+------------------------------------------------------------------------------*/ +.webfx-tree-container { + margin: 0px; + padding: 0px; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item { + padding: 0px; + margin: 0px; + color: black; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item a { + margin-left: 3px; + padding: 1px 2px 1px 2px; + color: black; + text-decoration: none; +} + +.webfx-tree-item a:hover,.webfx-tree-item a:active,.webfx-tree-item a:focus + { + color: black; + background: #CCCCFF; + text-decoration: none +} + +.webfx-tree-item img { + vertical-align: middle; + border: 0px; +} + +.webfx-tree-icon { + width: 16px; + height: 16px; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/banner.css index 1b7fa8a243..7604f01c00 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background-color: #EEEEEE;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #AAAAAA;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #DDDDDD;
- border: 1px solid #AAAAAA;
- color: #000090;
-}
+body { + background-color: #EEEEEE; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #AAAAAA; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #DDDDDD; + border: 1px solid #AAAAAA; + color: #000090; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/stylesheet.css index 498826ae13..e4405133ba 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/earthli/templates/media/stylesheet.css @@ -1,181 +1,541 @@ -a { color: #000090; text-decoration: none; }
-a:hover, a:active, a:focus { color: highlighttext; background-color: highlight; text-decoration: none; }
-
-body { background : #FFFFFF; }
-body, table { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; }
-
-a img { border: 0px; }
-
-/* Page layout/boxes */
-
-.info-box { }
-.info-box-title { margin: 1em 0em 0em 0em; font-weight: normal; font-size: 14pt; color: #999999; border-bottom: 2px solid #999999; }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree { }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; color: #014fbe; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { font-weight: bold; }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.sub-package { font-weight: bold; }
-.tutorial { border-width: thin; border-color: #0066ff; }
-.tutorial-nav-box { width: 100%; border: 1px solid #999999; background-color: #F8F8F8; }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left}
-.class-name { color: #0000AA; font-weight: bold; }
-
-.method-summary { color: #009000; padding-left: 1em; font-size: 8pt; }
-.method-header { }
-.method-definition { margin-bottom: .2em }
-.method-title { color: #009000; font-weight: bold; }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { color: #014fbe; margin-bottom: .3em }
-.var-type { font-style: italic; }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { color: #014fbe;}
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { color: #FF6600; }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-code a:link { padding: 1px; text-decoration: underline; color: #0000DD; }
-.src-code a:visited { text-decoration: underline; color: #0000DD; }
-.src-code a:active { background-color: #FFFF66; color: #008000; }
-.src-code a:hover { background-color: #FFFF66; text-decoration: overline underline; color: #008000; }
-
-.src-comm { color: #666666; }
-.src-id { color: #FF6600; font-style: italic; }
-.src-inc { color: #0000AA; font-weight: bold; }
-.src-key { color: #0000AA; font-weight: bold; }
-.src-num { color: #CC0000; }
-.src-str { color: #CC0000; }
-.src-sym { }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #666666; }
-.src-doc-close-template { color: #666666 }
-.src-doc-coretag { color: #008000; }
-.src-doc-inlinetag {}
-.src-doc-internal {}
-.src-doc-tag { color: #0080CC; }
-.src-doc-template { color: #666666 }
-.src-doc-type { font-style: italic; color: #444444 }
-.src-doc-var { color: #444444 }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border-bottom: 1px solid #999999; color: #999999; }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #000090; + text-decoration: none; +} + +a:hover,a:active,a:focus { + color: highlighttext; + background-color: highlight; + text-decoration: none; +} + +body { + background: #FFFFFF; +} + +body,table { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; +} + +a img { + border: 0px; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + font-weight: normal; + font-size: 14pt; + color: #999999; + border-bottom: 2px solid #999999; +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F8F8F8; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree { + +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + color: #014fbe; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + font-weight: bold; +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.sub-package { + font-weight: bold; +} + +.tutorial { + border-width: thin; + border-color: #0066ff; +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #999999; + background-color: #F8F8F8; +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left +} + +.class-name { + color: #0000AA; + font-weight: bold; +} + +.method-summary { + color: #009000; + padding-left: 1em; + font-size: 8pt; +} + +.method-header { + +} + +.method-definition { + margin-bottom: .2em +} + +.method-title { + color: #009000; + font-weight: bold; +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + color: #014fbe; + margin-bottom: .3em +} + +.var-type { + font-style: italic; +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + color: #014fbe; +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + color: #FF6600; +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-code a:link { + padding: 1px; + text-decoration: underline; + color: #0000DD; +} + +.src-code a:visited { + text-decoration: underline; + color: #0000DD; +} + +.src-code a:active { + background-color: #FFFF66; + color: #008000; +} + +.src-code a:hover { + background-color: #FFFF66; + text-decoration: overline underline; + color: #008000; +} + +.src-comm { + color: #666666; +} + +.src-id { + color: #FF6600; + font-style: italic; +} + +.src-inc { + color: #0000AA; + font-weight: bold; +} + +.src-key { + color: #0000AA; + font-weight: bold; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #CC0000; +} + +.src-sym { + +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #666666; +} + +.src-doc-close-template { + color: #666666 +} + +.src-doc-coretag { + color: #008000; +} + +.src-doc-inlinetag { + +} + +.src-doc-internal { + +} + +.src-doc-tag { + color: #0080CC; +} + +.src-doc-template { + color: #666666 +} + +.src-doc-type { + font-style: italic; + color: #444444 +} + +.src-doc-var { + color: #444444 +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border-bottom: 1px solid #999999; + color: #999999; +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +} + /*------------------------------------------------------------------------------
webfx-tree
-------------------------------------------------------------------------------*/
-
-.webfx-tree-container {
- margin: 0px;
- padding: 0px;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item {
- padding: 0px;
- margin: 0px;
- color: black;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item a {
- margin-left: 3px;
- padding: 1px 2px 1px 2px;
- color: black;
- text-decoration: none;
-}
-
-.webfx-tree-item a:hover, .webfx-tree-item a:active {
- color: highlighttext;
- background: highlight;
- text-decoration: none
-}
-
-.webfx-tree-item img {
- vertical-align: middle;
- border: 0px;
-}
-
-.webfx-tree-icon {
- width: 16px;
- height: 16px;
-}
-
+------------------------------------------------------------------------------*/ +.webfx-tree-container { + margin: 0px; + padding: 0px; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item { + padding: 0px; + margin: 0px; + color: black; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item a { + margin-left: 3px; + padding: 1px 2px 1px 2px; + color: black; + text-decoration: none; +} + +.webfx-tree-item a:hover,.webfx-tree-item a:active { + color: highlighttext; + background: highlight; + text-decoration: none +} + +.webfx-tree-item img { + vertical-align: middle; + border: 0px; +} + +.webfx-tree-icon { + width: 16px; + height: 16px; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/banner.css index 462d95ef09..04661af64a 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background: #EEEEEE url(bg_left.png) repeat;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #999999;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #EEEEEE;
- border: 1px solid black;
- color: #0000C0;
-}
+body { + background: #EEEEEE url(bg_left.png) repeat; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #999999; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #EEEEEE; + border: 1px solid black; + color: #0000C0; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/stylesheet.css index 26bc041d78..0d67c48a91 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/l0l33t/templates/media/stylesheet.css @@ -1,196 +1,559 @@ -a
-{
- color: #336699;
- text-decoration: underline;
-}
-
-a:hover, a:active, a:focus
-{
- text-decoration: underline;
- color: #6699CC
-}
-
-body { background : #FFFFFF; font-family: "Courier New", Courier, fixed; font-size: 10pt }
-table { font-size: 10pt }
-p, li { line-height: 140% }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 1px solid #336699; background-color: #EEEEEE }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F4F4F4; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.menu-body { background: #EEEEEE url(bg_left.css) repeat }
-.tree dl { margin: 0px }
-.tree a { text-decoration: none }
-.tree a:hover, .tree a:active, .tree a:focus { text-decoration: underline }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 1px solid #AAAAAA; background: #EEEEEE url(bg_left.png) repeat; }
-.nav-button-disabled { color: #AAAAAA; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #CCCCCC; outline: 1px solid #999999; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #CC0000; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left; background-color: DDDDFF }
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { margin-bottom: .3em }
-.var-type { font-style: italic; border: 1px dashed #336699 }
-.var-name { font-weight: bold; }
-.var-default { border: 1px dashed #336699 }
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #336699; padding: 1em;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px solid #336699; background-color: #F4F4F4; padding: .5em; }
-.listing { border: 1px solid #336699; background-color: #F4F4F4; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border-bottom: 1px solid #336699; padding: 2px }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #336699; + text-decoration: underline; +} + +a:hover,a:active,a:focus { + text-decoration: underline; + color: #6699CC +} + +body { + background: #FFFFFF; + font-family: "Courier New", Courier, fixed; + font-size: 10pt +} + +table { + font-size: 10pt +} + +p,li { + line-height: 140% +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 1px solid #336699; + background-color: #EEEEEE +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F4F4F4; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.menu-body { + background: #EEEEEE url(bg_left.css) repeat +} + +.tree dl { + margin: 0px +} + +.tree a { + text-decoration: none +} + +.tree a:hover,.tree a:active,.tree a:focus { + text-decoration: underline +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #AAAAAA; + background: #EEEEEE url(bg_left.png) repeat; +} + +.nav-button-disabled { + color: #AAAAAA; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #CCCCCC; + outline: 1px solid #999999; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #CC0000; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left; + background-color: DDDDFF +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + font-style: italic; + border: 1px dashed #336699 +} + +.var-name { + font-weight: bold; +} + +.var-default { + border: 1px dashed #336699 +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #336699; + padding: 1em; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px solid #336699; + background-color: #F4F4F4; + padding: .5em; +} + +.listing { + border: 1px solid #336699; + background-color: #F4F4F4; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border-bottom: 1px solid #336699; + padding: 2px +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +} + /*------------------------------------------------------------------------------
webfx-tree
-------------------------------------------------------------------------------*/
-
-.webfx-tree-container {
- margin: 0px;
- padding: 0px;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item {
- padding: 0px;
- margin: 0px;
- color: black;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item a {
- margin-left: 3px;
- padding: 1px 2px 1px 2px;
- color: black;
- text-decoration: none;
-}
-
-.webfx-tree-item a:hover, .webfx-tree-item a:active, .webfx-tree-item a:focus {
- color: white;
- background: #6699CC;
- text-decoration: none
-}
-
-.webfx-tree-item img {
- vertical-align: middle;
- border: 0px;
-}
-
-.webfx-tree-icon {
- width: 16px;
- height: 16px;
-}
-
+------------------------------------------------------------------------------*/ +.webfx-tree-container { + margin: 0px; + padding: 0px; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item { + padding: 0px; + margin: 0px; + color: black; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item a { + margin-left: 3px; + padding: 1px 2px 1px 2px; + color: black; + text-decoration: none; +} + +.webfx-tree-item a:hover,.webfx-tree-item a:active,.webfx-tree-item a:focus + { + color: white; + background: #6699CC; + text-decoration: none +} + +.webfx-tree-item img { + vertical-align: middle; + border: 0px; +} + +.webfx-tree-icon { + width: 16px; + height: 16px; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/banner.css index ad63e90dea..cd842ec972 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background-color: #FFFFFF;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #999999;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #EEEEEE;
- border: 1px solid black;
- color: #0000C0;
-}
+body { + background-color: #FFFFFF; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #999999; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #EEEEEE; + border: 1px solid black; + color: #0000C0; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/stylesheet.css index 4228d4915d..390769c210 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phpdoc.de/templates/media/stylesheet.css @@ -1,184 +1,549 @@ -a { color: #0000C0; text-decoration: underline; }
-a:hover { text-decoration: underline; background-color: #FFFFFF }
-a:active { text-decoration: underline; background-color: #FFFFFF }
-
-body, table { background-color: #EEEEEE; font-family: Verdana, Arial, sans-serif; font-size: 10pt }
-p, li { line-height: 140% }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 2px solid #999999; background-color: #FFFFFF }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree { }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 1px solid #AAAAAA; background-color: #DDDDFF; }
-.nav-button-disabled { color: #AAAAAA; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #CCCCCC; outline: 1px solid #999999; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left; background-color: DDDDFF }
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { background-color: #DDDDFF; padding: 1px; }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { background-color: #DDDDFF; padding: 1px; }
-.var-title { margin-bottom: .3em }
-.var-type { font-style: italic; }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #999999; padding: 1em;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border: 2px solid #999999; background-color: #FFFFFF; padding: 2px }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #0000C0; + text-decoration: underline; +} + +a:hover { + text-decoration: underline; + background-color: #FFFFFF +} + +a:active { + text-decoration: underline; + background-color: #FFFFFF +} + +body,table { + background-color: #EEEEEE; + font-family: Verdana, Arial, sans-serif; + font-size: 10pt +} + +p,li { + line-height: 140% +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 2px solid #999999; + background-color: #FFFFFF +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F8F8F8; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree { + +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #AAAAAA; + background-color: #DDDDFF; +} + +.nav-button-disabled { + color: #AAAAAA; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #CCCCCC; + outline: 1px solid #999999; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left; + background-color: DDDDFF +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + background-color: #DDDDFF; + padding: 1px; +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + background-color: #DDDDFF; + padding: 1px; +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + font-style: italic; +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #999999; + padding: 1em; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border: 2px solid #999999; + background-color: #FFFFFF; + padding: 2px +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +} + /*------------------------------------------------------------------------------
webfx-tree
-------------------------------------------------------------------------------*/
-
-.webfx-tree-container {
- margin: 0px;
- padding: 0px;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item {
- padding: 0px;
- margin: 0px;
- color: black;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item a {
- margin-left: 3px;
- padding: 1px 2px 1px 2px;
- color: black;
- text-decoration: none;
-}
-
-.webfx-tree-item a:hover, .webfx-tree-item a:active {
- color: #666666;
- background: white;
- text-decoration: none
-}
-
-.webfx-tree-item img {
- vertical-align: middle;
- border: 0px;
-}
-
-.webfx-tree-icon {
- width: 16px;
- height: 16px;
-}
-
+------------------------------------------------------------------------------*/ +.webfx-tree-container { + margin: 0px; + padding: 0px; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item { + padding: 0px; + margin: 0px; + color: black; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item a { + margin-left: 3px; + padding: 1px 2px 1px 2px; + color: black; + text-decoration: none; +} + +.webfx-tree-item a:hover,.webfx-tree-item a:active { + color: #666666; + background: white; + text-decoration: none +} + +.webfx-tree-item img { + vertical-align: middle; + border: 0px; +} + +.webfx-tree-icon { + width: 16px; + height: 16px; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/banner.css index cd725a1d31..2382b17b16 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background-color: #DDDDDD;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #999999;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #CCCCCC;
- border: 1px solid black;
- color: blue;
-}
+body { + background-color: #DDDDDD; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #999999; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #CCCCCC; + border: 1px solid black; + color: blue; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/stylesheet.css index 6aa49e12bc..80cf8da92e 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/DOM/phphtmllib/templates/media/stylesheet.css @@ -1,184 +1,548 @@ -a { color: #0000FF; text-decoration: none; }
-a:hover { color: #FF0000; text-decoration: underline; }
-a:active { color: #FF0000; text-decoration: underline; }
-
-body { background-color: #EEEEEE; font-family: Verdana, Arial, sans-serif }
-body, table { font-size: 10pt }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 2px solid #999999; background-color: #DDDDDD }
-.info-box-body { border: 1px solid #999999; padding: .5em; background-color: #F8F8F8; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; margin-bottom: 1em}
-.evenrow { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree { }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 2px solid #999999; background-color: #DDDDDD }
-.nav-button-disabled { color: #999999; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #AAAAAA; outline: 1px solid #666666; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left}
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold; }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #0066BB; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { margin-bottom: .3em }
-.var-type { color: red; font-weight: bold }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #336699; padding: 1em; background-color: #EEEEEE;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: #666666; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; }
-.listing { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border-bottom: 1px solid #888888; color: #888888; }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #0000FF; + text-decoration: none; +} + +a:hover { + color: #FF0000; + text-decoration: underline; +} + +a:active { + color: #FF0000; + text-decoration: underline; +} + +body { + background-color: #EEEEEE; + font-family: Verdana, Arial, sans-serif +} + +body,table { + font-size: 10pt +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 2px solid #999999; + background-color: #DDDDDD +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; + background-color: #F8F8F8; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree { + +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 2px solid #999999; + background-color: #DDDDDD +} + +.nav-button-disabled { + color: #999999; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #AAAAAA; + outline: 1px solid #666666; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold; +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #0066BB; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + color: red; + font-weight: bold +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #336699; + padding: 1em; + background-color: #EEEEEE; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: #666666; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; +} + +.listing { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border-bottom: 1px solid #888888; + color: #888888; +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +} + /*------------------------------------------------------------------------------
webfx-tree
-------------------------------------------------------------------------------*/
-
-.webfx-tree-container {
- margin: 0px;
- padding: 0px;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item {
- padding: 0px;
- margin: 0px;
- color: black;
- white-space: nowrap;
- font: icon;
-}
-
-.webfx-tree-item a {
- margin-left: 3px;
- padding: 1px 2px 1px 2px;
- color: black;
- text-decoration: none;
-}
-
-.webfx-tree-item a:hover, .webfx-tree-item a:active {
- color: white;
- background: red;
- text-decoration: none
-}
-
-.webfx-tree-item img {
- vertical-align: middle;
- border: 0px;
-}
-
-.webfx-tree-icon {
- width: 16px;
- height: 16px;
-}
-
+------------------------------------------------------------------------------*/ +.webfx-tree-container { + margin: 0px; + padding: 0px; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item { + padding: 0px; + margin: 0px; + color: black; + white-space: nowrap; + font: icon; +} + +.webfx-tree-item a { + margin-left: 3px; + padding: 1px 2px 1px 2px; + color: black; + text-decoration: none; +} + +.webfx-tree-item a:hover,.webfx-tree-item a:active { + color: white; + background: red; + text-decoration: none +} + +.webfx-tree-item img { + vertical-align: middle; + border: 0px; +} + +.webfx-tree-icon { + width: 16px; + height: 16px; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/banner.css index e67227b7cb..3502ec4182 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background-color: #CCCCFF;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #6666AA;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #AAAADD;
- border: 1px solid black;
- color: yellow;
-}
+body { + background-color: #CCCCFF; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #6666AA; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #AAAADD; + border: 1px solid black; + color: yellow; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/stylesheet.css index 565b21bde7..6d21638f67 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/default/templates/media/stylesheet.css @@ -1,144 +1,516 @@ -a { color: #336699; text-decoration: none; }
-a:hover { color: #6699CC; text-decoration: underline; }
-a:active { color: #6699CC; text-decoration: underline; }
-
-body { background : #FFFFFF; }
-body, table { font-family: Georgia, Times New Roman, Times, serif; font-size: 10pt }
-p, li { line-height: 140% }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 2px solid #999999; background-color: #CCCCFF }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree dl { margin: 0px }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 1px solid #999999; background-color: #F8F8F8; }
-.nav-button-disabled { color: #999999; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #DDDDDD; outline: 1px solid #999999; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left}
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold; }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { margin-bottom: .3em }
-.var-type { font-style: italic; }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #336699; padding: 1em; background-color: #EEEEEE; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-*[class="example"] { line-height : 0.5em }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-*[class="listing"] { line-height : 0.5em }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; margin: 1em 0em 0em 0em; padding: .25em; border: 2px solid #999999; background-color: #CCCCFF }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #336699; + text-decoration: none; +} + +a:hover { + color: #6699CC; + text-decoration: underline; +} + +a:active { + color: #6699CC; + text-decoration: underline; +} + +body { + background: #FFFFFF; +} + +body,table { + font-family: Georgia, Times New Roman, Times, serif; + font-size: 10pt +} + +p,li { + line-height: 140% +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 2px solid #999999; + background-color: #CCCCFF +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F8F8F8; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree dl { + margin: 0px +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #999999; + background-color: #F8F8F8; +} + +.nav-button-disabled { + color: #999999; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #DDDDDD; + outline: 1px solid #999999; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold; +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + font-style: italic; +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #336699; + padding: 1em; + background-color: #EEEEEE; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +*[class="example"] { + line-height: 0.5em +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +*[class="listing"] { + line-height: 0.5em +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + margin: 1em 0em 0em 0em; + padding: .25em; + border: 2px solid #999999; + background-color: #CCCCFF +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/banner.css index 35ff3cc3d5..2d8161b754 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/banner.css @@ -1,33 +1,30 @@ -body
-{
- background-color: #EEEEEE;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- text-align: right;
- clear: both;
- padding: .5em;
- border-top: 2px solid #AAAAAA;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #DDDDDD;
- border: 1px solid #AAAAAA;
- color: #000090;
-}
+body { + background-color: #EEEEEE; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + text-align: right; + clear: both; + padding: .5em; + border-top: 2px solid #AAAAAA; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #DDDDDD; + border: 1px solid #AAAAAA; + color: #000090; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/stylesheet.css index 9f8d0c46c4..6ea7a6f6d6 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/earthli/templates/media/stylesheet.css @@ -1,146 +1,532 @@ -a { color: #000090; text-decoration: none; }
-a:hover, a:active, a:focus { color: highlighttext; background-color: highlight; text-decoration: none; }
-
-body { background: #FFFFFF; }
-body, table { font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 10pt; }
-
-a img { border: 0px; }
-
-/* Page layout/boxes */
-
-.info-box { }
-.info-box-title { margin: 1em 0em 0em 0em; font-weight: normal; font-size: 14pt; color: #999999; border-bottom: 2px solid #999999; }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree { white-space: nowrap; font: icon }
-.tree dd { margin-left: 19px }
-.tree dl { margin: 0px }
-.tree-icon { vertical-align: middle; border: 0px; margin-right: 3px }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; color: #014fbe; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { font-weight: bold; }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; }
-.tutorial { border-width: thin; border-color: #0066ff; }
-.tutorial-nav-box { width: 100%; border: 1px solid #999999; background-color: #F8F8F8; }
-.folder-title { font-style: italic; font-family: Verdana, Arial, Helvetica, sans-serif }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left}
-.class-name { color: #0000AA; font-weight: bold; }
-
-.method-summary { color: #009000; padding-left: 1em; font-size: 8pt; }
-.method-header { }
-.method-definition { margin-bottom: .2em }
-.method-title { color: #009000; font-weight: bold; }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { color: #014fbe; margin-bottom: .3em }
-.var-type { font-style: italic; }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { color: #014fbe;}
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { color: #FF6600; }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-code a:link { padding: 1px; text-decoration: underline; color: #0000DD; }
-.src-code a:visited { text-decoration: underline; color: #0000DD; }
-.src-code a:active { background-color: #FFFF66; color: #008000; }
-.src-code a:hover { background-color: #FFFF66; text-decoration: overline underline; color: #008000; }
-
-.src-comm { color: #666666; }
-.src-id { color: #FF6600; font-style: italic; }
-.src-inc { color: #0000AA; font-weight: bold; }
-.src-key { color: #0000AA; font-weight: bold; }
-.src-num { color: #CC0000; }
-.src-str { color: #CC0000; }
-.src-sym { }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #666666; }
-.src-doc-close-template { color: #666666 }
-.src-doc-coretag { color: #008000; }
-.src-doc-inlinetag {}
-.src-doc-internal {}
-.src-doc-tag { color: #0080CC; }
-.src-doc-template { color: #666666 }
-.src-doc-type { font-style: italic; color: #444444 }
-.src-doc-var { color: #444444 }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-*[class="example"] { line-height : 0.5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-*[class="listing"] { line-height : 0.5em; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border-bottom: 1px solid #999999; color: #999999; }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #000090; + text-decoration: none; +} + +a:hover,a:active,a:focus { + color: highlighttext; + background-color: highlight; + text-decoration: none; +} + +body { + background: #FFFFFF; +} + +body,table { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 10pt; +} + +a img { + border: 0px; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + font-weight: normal; + font-size: 14pt; + color: #999999; + border-bottom: 2px solid #999999; +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F8F8F8; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree { + white-space: nowrap; + font: icon +} + +.tree dd { + margin-left: 19px +} + +.tree dl { + margin: 0px +} + +.tree-icon { + vertical-align: middle; + border: 0px; + margin-right: 3px +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + color: #014fbe; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + font-weight: bold; +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; +} + +.tutorial { + border-width: thin; + border-color: #0066ff; +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #999999; + background-color: #F8F8F8; +} + +.folder-title { + font-style: italic; + font-family: Verdana, Arial, Helvetica, sans-serif +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left +} + +.class-name { + color: #0000AA; + font-weight: bold; +} + +.method-summary { + color: #009000; + padding-left: 1em; + font-size: 8pt; +} + +.method-header { + +} + +.method-definition { + margin-bottom: .2em +} + +.method-title { + color: #009000; + font-weight: bold; +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + color: #014fbe; + margin-bottom: .3em +} + +.var-type { + font-style: italic; +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + color: #014fbe; +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + color: #FF6600; +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-code a:link { + padding: 1px; + text-decoration: underline; + color: #0000DD; +} + +.src-code a:visited { + text-decoration: underline; + color: #0000DD; +} + +.src-code a:active { + background-color: #FFFF66; + color: #008000; +} + +.src-code a:hover { + background-color: #FFFF66; + text-decoration: overline underline; + color: #008000; +} + +.src-comm { + color: #666666; +} + +.src-id { + color: #FF6600; + font-style: italic; +} + +.src-inc { + color: #0000AA; + font-weight: bold; +} + +.src-key { + color: #0000AA; + font-weight: bold; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #CC0000; +} + +.src-sym { + +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #666666; +} + +.src-doc-close-template { + color: #666666 +} + +.src-doc-coretag { + color: #008000; +} + +.src-doc-inlinetag { + +} + +.src-doc-internal { + +} + +.src-doc-tag { + color: #0080CC; +} + +.src-doc-template { + color: #666666 +} + +.src-doc-type { + font-style: italic; + color: #444444 +} + +.src-doc-var { + color: #444444 +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +*[class="example"] { + line-height: 0.5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +*[class="listing"] { + line-height: 0.5em; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border-bottom: 1px solid #999999; + color: #999999; +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/banner.css index 462d95ef09..04661af64a 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background: #EEEEEE url(bg_left.png) repeat;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #999999;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #EEEEEE;
- border: 1px solid black;
- color: #0000C0;
-}
+body { + background: #EEEEEE url(bg_left.png) repeat; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #999999; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #EEEEEE; + border: 1px solid black; + color: #0000C0; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/stylesheet.css index 97afd612a2..92d4554cb2 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/l0l33t/templates/media/stylesheet.css @@ -1,154 +1,517 @@ -a
-{
- color: #336699;
- text-decoration: underline;
-}
-
-a:hover, a:active, a:focus
-{
- text-decoration: underline;
- color: #6699CC
-}
-
-body { background: #FFFFFF; font-family: "Courier New", Courier, fixed; font-size: 10pt }
-table { font-size: 10pt }
-p, li { line-height: 140% }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 1px solid #336699; background-color: #EEEEEE }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F4F4F4; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.menu-body { background: #EEEEEE url(bg_left.css) repeat }
-.tree dl { margin: 0px }
-.tree a { text-decoration: none }
-.tree a:hover, .tree a:active, .tree a:focus { text-decoration: underline }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 1px solid #AAAAAA; background: #EEEEEE url(bg_left.png) repeat; }
-.nav-button-disabled { color: #AAAAAA; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #CCCCCC; outline: 1px solid #999999; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #CC0000; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left; background-color: DDDDFF }
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { margin-bottom: .3em }
-.var-type { font-style: italic; border: 1px dashed #336699 }
-.var-name { font-weight: bold; }
-.var-default { border: 1px dashed #336699 }
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #336699; padding: 1em;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px solid #336699; background-color: #F4F4F4; padding: .5em; }
-.listing { border: 1px solid #336699; background-color: #F4F4F4; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border-bottom: 1px solid #336699; padding: 2px }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #336699; + text-decoration: underline; +} + +a:hover,a:active,a:focus { + text-decoration: underline; + color: #6699CC +} + +body { + background: #FFFFFF; + font-family: "Courier New", Courier, fixed; + font-size: 10pt +} + +table { + font-size: 10pt +} + +p,li { + line-height: 140% +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 1px solid #336699; + background-color: #EEEEEE +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F4F4F4; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.menu-body { + background: #EEEEEE url(bg_left.css) repeat +} + +.tree dl { + margin: 0px +} + +.tree a { + text-decoration: none +} + +.tree a:hover,.tree a:active,.tree a:focus { + text-decoration: underline +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #AAAAAA; + background: #EEEEEE url(bg_left.png) repeat; +} + +.nav-button-disabled { + color: #AAAAAA; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #CCCCCC; + outline: 1px solid #999999; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #CC0000; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left; + background-color: DDDDFF +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + font-style: italic; + border: 1px dashed #336699 +} + +.var-name { + font-weight: bold; +} + +.var-default { + border: 1px dashed #336699 +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #336699; + padding: 1em; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px solid #336699; + background-color: #F4F4F4; + padding: .5em; +} + +.listing { + border: 1px solid #336699; + background-color: #F4F4F4; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border-bottom: 1px solid #336699; + padding: 2px +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/banner.css index ad63e90dea..cd842ec972 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background-color: #FFFFFF;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #999999;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #EEEEEE;
- border: 1px solid black;
- color: #0000C0;
-}
+body { + background-color: #FFFFFF; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #999999; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #EEEEEE; + border: 1px solid black; + color: #0000C0; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/stylesheet.css index 47e24c3c58..00de4dd22c 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpdoc.de/templates/media/stylesheet.css @@ -1,141 +1,508 @@ -a { color: #0000C0; text-decoration: underline; }
-a:hover { text-decoration: underline; background-color: #FFFFFF }
-a:active { text-decoration: underline; background-color: #FFFFFF }
-
-body, table { background-color: #EEEEEE; font-family: Verdana, Arial, sans-serif; font-size: 10pt }
-p, li { line-height: 140% }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 2px solid #999999; background-color: #FFFFFF }
-.info-box-body { border: 1px solid #999999; padding: .5em; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #F8F8F8; border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-.evenrow { border: 1px solid #AAAAAA; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree dl { margin: 0px }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 1px solid #AAAAAA; background-color: #DDDDFF; }
-.nav-button-disabled { color: #AAAAAA; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #CCCCCC; outline: 1px solid #999999; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left; background-color: DDDDFF }
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { background-color: #DDDDFF; padding: 1px; }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #666666; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { background-color: #DDDDFF; padding: 1px; }
-.var-title { margin-bottom: .3em }
-.var-type { font-style: italic; }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #999999; padding: 1em;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-comm { color: green; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; }
-.listing { border: 1px dashed #999999; background-color: #EEEEEE; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border: 2px solid #999999; background-color: #FFFFFF; padding: 2px }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #0000C0; + text-decoration: underline; +} + +a:hover { + text-decoration: underline; + background-color: #FFFFFF +} + +a:active { + text-decoration: underline; + background-color: #FFFFFF +} + +body,table { + background-color: #EEEEEE; + font-family: Verdana, Arial, sans-serif; + font-size: 10pt +} + +p,li { + line-height: 140% +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 2px solid #999999; + background-color: #FFFFFF +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #F8F8F8; + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + border: 1px solid #AAAAAA; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree dl { + margin: 0px +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 1px solid #AAAAAA; + background-color: #DDDDFF; +} + +.nav-button-disabled { + color: #AAAAAA; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #CCCCCC; + outline: 1px solid #999999; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left; + background-color: DDDDFF +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + background-color: #DDDDFF; + padding: 1px; +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #666666; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + background-color: #DDDDFF; + padding: 1px; +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + font-style: italic; +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #999999; + padding: 1em; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: green; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; +} + +.listing { + border: 1px dashed #999999; + background-color: #EEEEEE; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border: 2px solid #999999; + background-color: #FFFFFF; + padding: 2px +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/lib/tab.webfx.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/lib/tab.webfx.css index 337fd8a8e8..8acc16c580 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/lib/tab.webfx.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/lib/tab.webfx.css @@ -4,83 +4,77 @@ bright: rgb(234,242,255); normal: rgb(120,172,255);
dark: rgb(0,66,174);
-*/
-
-
-
-
-.dynamic-tab-pane-control.tab-pane {
- position: relative;
- width: 100%;
-}
-
-.dynamic-tab-pane-control .tab-row .tab {
- font-family: Verdana, Helvetica, Arial;
- font-size: 12px;
- cursor: Default;
- display: inline;
- margin: 1px -5px 1px 5px;
- float: left;
- padding: 3px 6px 3px 6px;
- background: rgb(234,242,255);
- border: 1px solid;
- border-color: rgb(120,172,255);
- border-left: 0;
- border-bottom: 0;
- border-top: 0;
-
- cursor: hand;
- cursor: pointer;
-
- z-index: 1;
- position: relative;
- top: 0;
-}
-
-.dynamic-tab-pane-control .tab-row .tab.selected {
- border: 1px solid rgb(120,172,255);
- border-bottom: 0;
- z-index: 3;
- padding: 2px 6px 5px 6px;
- margin: 1px -6px -2px 0px;
- top: -2px;
- background: white;
-}
-
-.dynamic-tab-pane-control .tab-row .tab a {
- font-family: Verdana, Helvetica, Arial;
- font-size: 13px;
- color: rgb(0,66,174);
- text-decoration: none;
- cursor: hand;
- cursor: pointer;
-}
-
-.dynamic-tab-pane-control .tab-row .hover a {
- color: rgb(0,66,174);
-}
-
-.dynamic-tab-pane-control .tab-row .tab.selected a {
- font-weight: bold;
-}
-
-.dynamic-tab-pane-control .tab-page {
- clear: both;
- border: 1px solid rgb(120,172,255);
- background: White;
- z-index: 2;
- position: relative;
- top: -2px;
- color: Black;
- font-family: Verdana, Helvetica, Arial;
- font-size: 13px;
- padding: 10px;
-}
-
-.dynamic-tab-pane-control .tab-row {
- z-index: 1;
- white-space: nowrap;
- background: rgb(234,242,255);
- height: 1.85em;
- width: 100%;
-}
+*/ +.dynamic-tab-pane-control.tab-pane { + position: relative; + width: 100%; +} + +.dynamic-tab-pane-control .tab-row .tab { + font-family: Verdana, Helvetica, Arial; + font-size: 12px; + cursor: Default; + display: inline; + margin: 1px -5px 1px 5px; + float: left; + padding: 3px 6px 3px 6px; + background: rgb(234, 242, 255); + border: 1px solid; + border-color: rgb(120, 172, 255); + border-left: 0; + border-bottom: 0; + border-top: 0; + cursor: hand; + cursor: pointer; + z-index: 1; + position: relative; + top: 0; +} + +.dynamic-tab-pane-control .tab-row .tab.selected { + border: 1px solid rgb(120, 172, 255); + border-bottom: 0; + z-index: 3; + padding: 2px 6px 5px 6px; + margin: 1px -6px -2px 0px; + top: -2px; + background: white; +} + +.dynamic-tab-pane-control .tab-row .tab a { + font-family: Verdana, Helvetica, Arial; + font-size: 13px; + color: rgb(0, 66, 174); + text-decoration: none; + cursor: hand; + cursor: pointer; +} + +.dynamic-tab-pane-control .tab-row .hover a { + color: rgb(0, 66, 174); +} + +.dynamic-tab-pane-control .tab-row .tab.selected a { + font-weight: bold; +} + +.dynamic-tab-pane-control .tab-page { + clear: both; + border: 1px solid rgb(120, 172, 255); + background: White; + z-index: 2; + position: relative; + top: -2px; + color: Black; + font-family: Verdana, Helvetica, Arial; + font-size: 13px; + padding: 10px; +} + +.dynamic-tab-pane-control .tab-row { + z-index: 1; + white-space: nowrap; + background: rgb(234, 242, 255); + height: 1.85em; + width: 100%; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/stylesheet.css index 8f0fe98661..ca89277266 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phpedit/templates/media/stylesheet.css @@ -1,230 +1,337 @@ -
-body { background: #FFFFFF; }
-body, table {
- font-family: Verdana, Arial, Helvetica, sans-serif;
- text-align: left;
- font-size: 11px;
-}
-
-table.none td.btCell { background-color: #fff; vertical-align: top; }
-table.none tr.highlight td.btCell { background-color: #f5f5f5; vertical-align: top; }
-table.none th.btHead { background-color: #e5e5e5; vertical-align: top; }
-table.btHeader, th.btHeader {
- background-color: #014f9d;
- color: #fff;
- text-align: left;
- vertical-align: top;
-}
-table.btHeaderProminent, th.btHeaderProminent {
- background-color: #9d0119;
- color: #fff;
- text-align: left;
- vertical-align: top;
-}
-div.showHideIndent { margin-left: 14px; }
-td.left, th.left, th.syntaxLanguage { vertical-align: top; text-align: left; border-right: 1px solid #ceced8; border-bottom: solid 1px #ceced8; }
-th.noborder { border: none; }
-th.border { border: 1px solid #ceced8; }
-td.border { border-bottom: 1px solid #ceced8; }
-th.syntaxLanguage { font-size: 11px; line-height: 13px; vertical-align: top; }
-.faq, .property { color: #000090; }
-.method { color: #009000; }
-.event { color: #900000; }
-
-table.default th.syntaxLanguage { font-size: 0.7em; vertical-align: baseline; }
-.small { font-size: 85%; line-height: 120%; }
-
-a {
- color: #000090;
-
-}
-
-div.maintutorial {
- border-width: thin;
- border-color: #0066ff;
-}
-
-.source, .src-code {
- border-width: thin;
- border-style: dashed;
- border-color: #8899dd;
- margin: 1em;
- padding: 0.5em;
- font-family: 'Courier New', Courier, monospace; font-weight: normal;
-}
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.var-type {
- font-style : italic;
-}
-
-.var-title {
- margin-left : 20px;
-}
-
-.method-summary {
- margin-left : 20px;
-}
-
+body { + background: #FFFFFF; +} + +body,table { + font-family: Verdana, Arial, Helvetica, sans-serif; + text-align: left; + font-size: 11px; +} + +table.none td.btCell { + background-color: #fff; + vertical-align: top; +} + +table.none tr.highlight td.btCell { + background-color: #f5f5f5; + vertical-align: top; +} + +table.none th.btHead { + background-color: #e5e5e5; + vertical-align: top; +} + +table.btHeader,th.btHeader { + background-color: #014f9d; + color: #fff; + text-align: left; + vertical-align: top; +} + +table.btHeaderProminent,th.btHeaderProminent { + background-color: #9d0119; + color: #fff; + text-align: left; + vertical-align: top; +} + +div.showHideIndent { + margin-left: 14px; +} + +td.left,th.left,th.syntaxLanguage { + vertical-align: top; + text-align: left; + border-right: 1px solid #ceced8; + border-bottom: solid 1px #ceced8; +} + +th.noborder { + border: none; +} + +th.border { + border: 1px solid #ceced8; +} + +td.border { + border-bottom: 1px solid #ceced8; +} + +th.syntaxLanguage { + font-size: 11px; + line-height: 13px; + vertical-align: top; +} + +.faq,.property { + color: #000090; +} + +.method { + color: #009000; +} + +.event { + color: #900000; +} + +table.default th.syntaxLanguage { + font-size: 0.7em; + vertical-align: baseline; +} + +.small { + font-size: 85%; + line-height: 120%; +} + +a { + color: #000090; +} + +div.maintutorial { + border-width: thin; + border-color: #0066ff; +} + +.source,.src-code { + border-width: thin; + border-style: dashed; + border-color: #8899dd; + margin: 1em; + padding: 0.5em; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.var-type { + font-style: italic; +} + +.var-title { + margin-left: 20px; +} + +.method-summary { + margin-left: 20px; +} + /*------------------------------------------------------------------------------
Show/Hide blocks
-------------------------------------------------------------------------------*/
-
-.shown { display: inline; }
-.hidden { display: none; }
-img.showHideImg, .showHideControl { cursor: hand; }
-img.showHideImg { margin-right: 3px; }
-
-.showHideActionText
-{
- font-size: 0.7em;
-}
-
-.showHideActionTextContent
-{
- font-weight: bold;
-}
-
-.showHideActionTextContentHover
-{
- text-decoration: underline;
- font-weight: bold;
- background-color: #ceced8;
-}
-ol {
- margin: 0.2em 0em 0.2em 24px;
- padding: 0em;
-}
-ul li {
- margin: 0.2em 0em 0.2em 0em; padding: 0em;
- list-style-position: outside;
- list-style-type: square;
-}
-span.li {
- color: #000000;
-}
-ul {
- color: #014fbe;
- margin: 3px 0em 3px 16px;
-}
-p {
- margin: 6px 0em 6px 0em;
-}
-h1 { margin: 1em 0em 1.2em 0em; font-size: 160%; line-height: 130%;}
-h2 { font-size: 125%; line-height: 120%;}
-h1, h2, h3, h4 {
- padding: 0em;
- margin: 1.5em 0em .25em 0em;
- text-align: left;
- font-weight: normal;
-}
-h3 { margin-top: 0.5em; font-size: 110%; }
-h4 { margin: 0.25em 0em .25em 0em;; font-size: 100%; }
-
-.Headline {
- color: #000000;
- font-family: Verdana,Arial,Helvetica,sans-serif;
- font-size: 9pt;
- font-weight: bold;
- font-style: normal;
-/* margin-left : -1.5em;*/
- text-align : left;
- margin-top : 1.0em;
- margin-bottom : 0.5em;
-}
-
-.HelpContent {
- margin-left : 1.5em;
-}
-
-table.HelpTable {
- border: 0px;
- padding: 0px;
- margin: 0px;
-}
-
-tr.HelpTable {
-}
-
-th.HelpTable {
- border: 1px dotted;
- background-color: #F0F0F0;
- margin: 1px;
- padding: 5px;
-}
-
-td.HelpTable {
- border: 1px dotted;
- background-color: #F9F9F9;
- margin: 1px;
- padding: 5px;
-}
-
-pre.depreciated {
- font-family: Verdana,Arial,Helvetica,sans-serif;
- font-size: 9pt;
- border: 1px dotted #909090;
- background-color: #F0F0F0;
- margin-left: 10px;
- margin-right: 10px;
- margin-top: 10px;
- margin-bottom: 10px;
- padding: 5px;
-}
-
+------------------------------------------------------------------------------*/ +.shown { + display: inline; +} + +.hidden { + display: none; +} + +img.showHideImg,.showHideControl { + cursor: hand; +} + +img.showHideImg { + margin-right: 3px; +} + +.showHideActionText { + font-size: 0.7em; +} + +.showHideActionTextContent { + font-weight: bold; +} + +.showHideActionTextContentHover { + text-decoration: underline; + font-weight: bold; + background-color: #ceced8; +} + +ol { + margin: 0.2em 0em 0.2em 24px; + padding: 0em; +} + +ul li { + margin: 0.2em 0em 0.2em 0em; + padding: 0em; + list-style-position: outside; + list-style-type: square; +} + +span.li { + color: #000000; +} + +ul { + color: #014fbe; + margin: 3px 0em 3px 16px; +} + +p { + margin: 6px 0em 6px 0em; +} + +h1 { + margin: 1em 0em 1.2em 0em; + font-size: 160%; + line-height: 130%; +} + +h2 { + font-size: 125%; + line-height: 120%; +} + +h1,h2,h3,h4 { + padding: 0em; + margin: 1.5em 0em .25em 0em; + text-align: left; + font-weight: normal; +} + +h3 { + margin-top: 0.5em; + font-size: 110%; +} + +h4 { + margin: 0.25em 0em .25em 0em;; + font-size: 100%; +} + +.Headline { + color: #000000; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 9pt; + font-weight: bold; + font-style: normal; + /* margin-left : -1.5em;*/ + text-align: left; + margin-top: 1.0em; + margin-bottom: 0.5em; +} + +.HelpContent { + margin-left: 1.5em; +} + +table.HelpTable { + border: 0px; + padding: 0px; + margin: 0px; +} + +tr.HelpTable { + +} + +th.HelpTable { + border: 1px dotted; + background-color: #F0F0F0; + margin: 1px; + padding: 5px; +} + +td.HelpTable { + border: 1px dotted; + background-color: #F9F9F9; + margin: 1px; + padding: 5px; +} + +pre.depreciated { + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 9pt; + border: 1px dotted #909090; + background-color: #F0F0F0; + margin-left: 10px; + margin-right: 10px; + margin-top: 10px; + margin-bottom: 10px; + padding: 5px; +} + /*------------------------------------------------------------------------------
webfx-tree
-------------------------------------------------------------------------------*/
-.webfx-tree-container {
- margin: 0px;
- padding: 0px;
- font: icon;
- white-space: nowrap;
-}
-
-.webfx-tree-item {
- padding: 0px;
- margin: 0px;
- font: icon;
- color: black;
- white-space: nowrap;
-}
-
-.webfx-tree-item a, .webfx-tree-item a:active, .webfx-tree-item a:hover {
- margin-left: 3px;
- padding: 1px 2px 1px 2px;
-}
-
-.webfx-tree-item a {
- color: black;
- text-decoration: none;
-}
-
-.webfx-tree-item a:hover {
- color: blue;
- text-decoration: underline;
-}
-
-.webfx-tree-item a:active {
- background: highlight;
- color: highlighttext;
- text-decoration: none;
-}
-
-.webfx-tree-item img {
- vertical-align: middle;
- border: 0px;
-}
-
-.webfx-tree-icon {
- width: 16px;
- height: 16px;
-}
-
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
+------------------------------------------------------------------------------*/ +.webfx-tree-container { + margin: 0px; + padding: 0px; + font: icon; + white-space: nowrap; +} + +.webfx-tree-item { + padding: 0px; + margin: 0px; + font: icon; + color: black; + white-space: nowrap; +} + +.webfx-tree-item a,.webfx-tree-item a:active,.webfx-tree-item a:hover { + margin-left: 3px; + padding: 1px 2px 1px 2px; +} + +.webfx-tree-item a { + color: black; + text-decoration: none; +} + +.webfx-tree-item a:hover { + color: blue; + text-decoration: underline; +} + +.webfx-tree-item a:active { + background: highlight; + color: highlighttext; + text-decoration: none; +} + +.webfx-tree-item img { + vertical-align: middle; + border: 0px; +} + +.webfx-tree-icon { + width: 16px; + height: 16px; +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/banner.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/banner.css index cd725a1d31..2382b17b16 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/banner.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/banner.css @@ -1,32 +1,29 @@ -body
-{
- background-color: #DDDDDD;
- margin: 0px;
- padding: 0px;
-}
-
-/* Banner (top bar) classes */
-
-.banner { }
-
-.banner-menu
-{
- clear: both;
- padding: .5em;
- border-top: 2px solid #999999;
-}
-
-.banner-title
-{
- text-align: right;
- font-size: 20pt;
- font-weight: bold;
- margin: .2em;
-}
-
-.package-selector
-{
- background-color: #CCCCCC;
- border: 1px solid black;
- color: blue;
-}
+body { + background-color: #DDDDDD; + margin: 0px; + padding: 0px; +} + +/* Banner (top bar) classes */ +.banner { + +} + +.banner-menu { + clear: both; + padding: .5em; + border-top: 2px solid #999999; +} + +.banner-title { + text-align: right; + font-size: 20pt; + font-weight: bold; + margin: .2em; +} + +.package-selector { + background-color: #CCCCCC; + border: 1px solid black; + color: blue; +}
\ No newline at end of file diff --git a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/stylesheet.css b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/stylesheet.css index eb73d45146..93dee46073 100755 --- a/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/stylesheet.css +++ b/libs/PhpDocumentor-1.3.2/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/media/stylesheet.css @@ -1,142 +1,507 @@ -a { color: #0000FF; text-decoration: none; }
-a:hover { color: #FF0000; text-decoration: underline; }
-a:active { color: #FF0000; text-decoration: underline; }
-
-body { background-color: #EEEEEE; font-family: Verdana, Arial, sans-serif }
-body, table { font-size: 10pt }
-a img { border: 0px; }
-dd { margin-left: 0px; padding-left: 1em; }
-
-/* Page layout/boxes */
-
-.info-box {}
-.info-box-title { margin: 1em 0em 0em 0em; padding: .25em; font-weight: normal; font-size: 14pt; border: 2px solid #999999; background-color: #DDDDDD }
-.info-box-body { border: 1px solid #999999; padding: .5em; background-color: #F8F8F8; }
-.nav-bar { font-size: 8pt; white-space: nowrap; text-align: right; padding: .2em; margin: 0em 0em 1em 0em; }
-
-.oddrow { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; margin-bottom: 1em}
-.evenrow { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; margin-bottom: 1em}
-
-.page-body { max-width: 800px; margin: auto; }
-.tree dl { margin: 0px }
-
-/* Index formatting classes */
-
-.index-item-body { margin-top: .5em; margin-bottom: .5em}
-.index-item-description { margin-top: .25em }
-.index-item-details { font-weight: normal; font-style: italic; font-size: 8pt }
-.index-letter-section { background-color: #EEEEEE; border: 1px dotted #999999; padding: .5em; margin-bottom: 1em}
-.index-letter-title { font-size: 12pt; font-weight: bold }
-.index-letter-menu { text-align: center; margin: 1em }
-.index-letter { font-size: 12pt }
-
-/* Docbook classes */
-
-.description {}
-.short-description { font-weight: bold; color: #666666; }
-.tags { padding-left: 0em; margin-left: 3em; color: #666666; list-style-type: square; }
-.parameters { padding-left: 0em; margin-left: 3em; font-style: italic; list-style-type: square; }
-.redefinitions { font-size: 8pt; padding-left: 0em; margin-left: 2em; }
-.package { }
-.package-title { font-weight: bold; font-size: 14pt; border-bottom: 1px solid black }
-.package-details { font-size: 85%; }
-.sub-package { font-weight: bold; font-size: 120% }
-.tutorial { border-width: thin; border-color: #0066ff }
-.tutorial-nav-box { width: 100%; border: 2px solid #999999; background-color: #DDDDDD }
-.nav-button-disabled { color: #999999; }
-.nav-button:active,
-.nav-button:focus,
-.nav-button:hover { background-color: #AAAAAA; outline: 1px solid #666666; text-decoration: none }
-.folder-title { font-style: italic }
-
-/* Generic formatting */
-
-.field { font-weight: bold; }
-.detail { font-size: 8pt; }
-.notes { font-style: italic; font-size: 8pt; }
-.separator { background-color: #999999; height: 2px; }
-.warning { color: #FF6600; }
-.disabled { font-style: italic; color: #999999; }
-
-/* Code elements */
-
-.line-number { }
-
-.class-table { width: 100%; }
-.class-table-header { border-bottom: 1px dotted #666666; text-align: left}
-.class-name { color: #000000; font-weight: bold; }
-
-.method-summary { padding-left: 1em; font-size: 8pt }
-.method-header { }
-.method-definition { margin-bottom: .3em }
-.method-title { font-weight: bold; }
-.method-name { font-weight: bold; }
-.method-signature { font-size: 85%; color: #0066BB; margin: .5em 0em }
-.method-result { font-style: italic; }
-
-.var-summary { padding-left: 1em; font-size: 8pt; }
-.var-header { }
-.var-title { margin-bottom: .3em }
-.var-type { color: red; font-weight: bold }
-.var-name { font-weight: bold; }
-.var-default {}
-.var-description { font-weight: normal; color: #000000; }
-
-.include-title { }
-.include-type { font-style: italic; }
-.include-name { font-weight: bold; }
-
-.const-title { }
-.const-name { font-weight: bold; }
-
-/* Syntax highlighting */
-
-.src-code { border: 1px solid #336699; padding: 1em; background-color: #EEEEEE;
- font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-.src-line { font-family: 'Courier New', Courier, monospace; font-weight: normal; }
-
-.src-comm { color: #666666; }
-.src-id { }
-.src-inc { color: #0000FF; }
-.src-key { color: #0000FF; }
-.src-num { color: #CC0000; }
-.src-str { color: #66cccc; }
-.src-sym { font-weight: bold; }
-.src-var { }
-
-.src-php { font-weight: bold; }
-
-.src-doc { color: #009999 }
-.src-doc-close-template { color: #0000FF }
-.src-doc-coretag { color: #0099FF; font-weight: bold }
-.src-doc-inlinetag { color: #0099FF }
-.src-doc-internal { color: #6699cc }
-.src-doc-tag { color: #0080CC }
-.src-doc-template { color: #0000FF }
-.src-doc-type { font-style: italic }
-.src-doc-var { font-style: italic }
-
-.tute-tag { color: #009999 }
-.tute-attribute-name { color: #0000FF }
-.tute-attribute-value { color: #0099FF }
-.tute-entity { font-weight: bold; }
-.tute-comment { font-style: italic }
-.tute-inline-tag { color: #636311; font-weight: bold }
-
-/* tutorial */
-
-.authors { }
-.author { font-style: italic; font-weight: bold }
-.author-blurb { margin: .5em 0em .5em 2em; font-size: 85%; font-weight: normal; font-style: normal }
-.example { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; }
-.listing { background-color: #DDDDDD; border: 1px solid #999999; padding: .5em; white-space: nowrap; }
-.release-info { font-size: 85%; font-style: italic; margin: 1em 0em }
-.ref-title-box { }
-.ref-title { }
-.ref-purpose { font-style: italic; color: #666666 }
-.ref-synopsis { }
-.title { font-weight: bold; border-bottom: 1px solid #888888; color: #888888; }
-.cmd-synopsis { margin: 1em 0em }
-.cmd-title { font-weight: bold }
-.toc { margin-left: 2em; padding-left: 0em }
-
+a { + color: #0000FF; + text-decoration: none; +} + +a:hover { + color: #FF0000; + text-decoration: underline; +} + +a:active { + color: #FF0000; + text-decoration: underline; +} + +body { + background-color: #EEEEEE; + font-family: Verdana, Arial, sans-serif +} + +body,table { + font-size: 10pt +} + +a img { + border: 0px; +} + +dd { + margin-left: 0px; + padding-left: 1em; +} + +/* Page layout/boxes */ +.info-box { + +} + +.info-box-title { + margin: 1em 0em 0em 0em; + padding: .25em; + font-weight: normal; + font-size: 14pt; + border: 2px solid #999999; + background-color: #DDDDDD +} + +.info-box-body { + border: 1px solid #999999; + padding: .5em; + background-color: #F8F8F8; +} + +.nav-bar { + font-size: 8pt; + white-space: nowrap; + text-align: right; + padding: .2em; + margin: 0em 0em 1em 0em; +} + +.oddrow { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; + margin-bottom: 1em +} + +.evenrow { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; + margin-bottom: 1em +} + +.page-body { + max-width: 800px; + margin: auto; +} + +.tree dl { + margin: 0px +} + +/* Index formatting classes */ +.index-item-body { + margin-top: .5em; + margin-bottom: .5em +} + +.index-item-description { + margin-top: .25em +} + +.index-item-details { + font-weight: normal; + font-style: italic; + font-size: 8pt +} + +.index-letter-section { + background-color: #EEEEEE; + border: 1px dotted #999999; + padding: .5em; + margin-bottom: 1em +} + +.index-letter-title { + font-size: 12pt; + font-weight: bold +} + +.index-letter-menu { + text-align: center; + margin: 1em +} + +.index-letter { + font-size: 12pt +} + +/* Docbook classes */ +.description { + +} + +.short-description { + font-weight: bold; + color: #666666; +} + +.tags { + padding-left: 0em; + margin-left: 3em; + color: #666666; + list-style-type: square; +} + +.parameters { + padding-left: 0em; + margin-left: 3em; + font-style: italic; + list-style-type: square; +} + +.redefinitions { + font-size: 8pt; + padding-left: 0em; + margin-left: 2em; +} + +.package { + +} + +.package-title { + font-weight: bold; + font-size: 14pt; + border-bottom: 1px solid black +} + +.package-details { + font-size: 85%; +} + +.sub-package { + font-weight: bold; + font-size: 120% +} + +.tutorial { + border-width: thin; + border-color: #0066ff +} + +.tutorial-nav-box { + width: 100%; + border: 2px solid #999999; + background-color: #DDDDDD +} + +.nav-button-disabled { + color: #999999; +} + +.nav-button:active,.nav-button:focus,.nav-button:hover { + background-color: #AAAAAA; + outline: 1px solid #666666; + text-decoration: none +} + +.folder-title { + font-style: italic +} + +/* Generic formatting */ +.field { + font-weight: bold; +} + +.detail { + font-size: 8pt; +} + +.notes { + font-style: italic; + font-size: 8pt; +} + +.separator { + background-color: #999999; + height: 2px; +} + +.warning { + color: #FF6600; +} + +.disabled { + font-style: italic; + color: #999999; +} + +/* Code elements */ +.line-number { + +} + +.class-table { + width: 100%; +} + +.class-table-header { + border-bottom: 1px dotted #666666; + text-align: left +} + +.class-name { + color: #000000; + font-weight: bold; +} + +.method-summary { + padding-left: 1em; + font-size: 8pt +} + +.method-header { + +} + +.method-definition { + margin-bottom: .3em +} + +.method-title { + font-weight: bold; +} + +.method-name { + font-weight: bold; +} + +.method-signature { + font-size: 85%; + color: #0066BB; + margin: .5em 0em +} + +.method-result { + font-style: italic; +} + +.var-summary { + padding-left: 1em; + font-size: 8pt; +} + +.var-header { + +} + +.var-title { + margin-bottom: .3em +} + +.var-type { + color: red; + font-weight: bold +} + +.var-name { + font-weight: bold; +} + +.var-default { + +} + +.var-description { + font-weight: normal; + color: #000000; +} + +.include-title { + +} + +.include-type { + font-style: italic; +} + +.include-name { + font-weight: bold; +} + +.const-title { + +} + +.const-name { + font-weight: bold; +} + +/* Syntax highlighting */ +.src-code { + border: 1px solid #336699; + padding: 1em; + background-color: #EEEEEE; + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-line { + font-family: 'Courier New', Courier, monospace; + font-weight: normal; +} + +.src-comm { + color: #666666; +} + +.src-id { + +} + +.src-inc { + color: #0000FF; +} + +.src-key { + color: #0000FF; +} + +.src-num { + color: #CC0000; +} + +.src-str { + color: #66cccc; +} + +.src-sym { + font-weight: bold; +} + +.src-var { + +} + +.src-php { + font-weight: bold; +} + +.src-doc { + color: #009999 +} + +.src-doc-close-template { + color: #0000FF +} + +.src-doc-coretag { + color: #0099FF; + font-weight: bold +} + +.src-doc-inlinetag { + color: #0099FF +} + +.src-doc-internal { + color: #6699cc +} + +.src-doc-tag { + color: #0080CC +} + +.src-doc-template { + color: #0000FF +} + +.src-doc-type { + font-style: italic +} + +.src-doc-var { + font-style: italic +} + +.tute-tag { + color: #009999 +} + +.tute-attribute-name { + color: #0000FF +} + +.tute-attribute-value { + color: #0099FF +} + +.tute-entity { + font-weight: bold; +} + +.tute-comment { + font-style: italic +} + +.tute-inline-tag { + color: #636311; + font-weight: bold +} + +/* tutorial */ +.authors { + +} + +.author { + font-style: italic; + font-weight: bold +} + +.author-blurb { + margin: .5em 0em .5em 2em; + font-size: 85%; + font-weight: normal; + font-style: normal +} + +.example { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; +} + +.listing { + background-color: #DDDDDD; + border: 1px solid #999999; + padding: .5em; + white-space: nowrap; +} + +.release-info { + font-size: 85%; + font-style: italic; + margin: 1em 0em +} + +.ref-title-box { + +} + +.ref-title { + +} + +.ref-purpose { + font-style: italic; + color: #666666 +} + +.ref-synopsis { + +} + +.title { + font-weight: bold; + border-bottom: 1px solid #888888; + color: #888888; +} + +.cmd-synopsis { + margin: 1em 0em +} + +.cmd-title { + font-weight: bold +} + +.toc { + margin-left: 2em; + padding-left: 0em +}
\ No newline at end of file diff --git a/libs/jquery/jquery-calendar.css b/libs/jquery/jquery-calendar.css index 239b4c10a2..9bb82cfca9 100644 --- a/libs/jquery/jquery-calendar.css +++ b/libs/jquery/jquery-calendar.css @@ -1,33 +1,41 @@ /* Main Style Sheet for jQuery Calendar */ -#calendar_div, .calendar_inline { +#calendar_div,.calendar_inline { font-size: 14px; padding: 0; margin: 0; } + #calendar_div { display: none; border: 1px solid #777; - z-index: 10; /*must have*/ + z-index: 10; /*must have*/ } -#calendar_div, .calendar_control, .calendar_links, .calendar_header, .calendar { + +#calendar_div,.calendar_control,.calendar_links,.calendar_header,.calendar + { width: 185px; } + .calendar_inline { float: left; display: block; border: 0; } + .calendar_dialog { padding: 5px !important; border: 4px ridge #ddd !important; } + button.calendar_trigger { width: 25px; } + img.calendar_trigger { margin: 2px; vertical-align: middle; } + .calendar_prompt { float: left; width: 181px; @@ -35,81 +43,101 @@ img.calendar_trigger { background: #ddd; color: #000; } + * html .calendar_prompt { width: 185px; } -.calendar_control, .calendar_links, .calendar_header, .calendar { + +.calendar_control,.calendar_links,.calendar_header,.calendar { clear: both; float: left; color: #fff; } + .calendar_control { background: #400; } + .calendar_links { background: #000; } -.calendar_control, .calendar_links { + +.calendar_control,.calendar_links { font-weight: bold; font-size: 80%; letter-spacing: 1px; } + .calendar_links label { /* disabled links */ padding: 2px 5px; color: #888; } -.calendar_clear, .calendar_prev { + +.calendar_clear,.calendar_prev { float: left; } + .calendar_current { float: left; width: 35%; text-align: center; } -.calendar_close, .calendar_next { + +.calendar_close,.calendar_next { float: right; } + .calendar_header { background: #333; text-align: center; font-weight: bold; } + .calendar_header select { background: #333; color: #fff; border: 0px; font-weight: bold; } + .calendar { background: #ccc; text-align: center; font-size: 100%; } + .calendar a { display: block; width: 100%; } + .calendar .calendar_titleRow { background: #777; } + .calendar .calendar_daysRow { background: #eee; color: #666; } + .calendar .calendar_daysCell { color: #000; border: 1px solid #ddd; } -#calendar .calendar_daysCell a{ + +#calendar .calendar_daysCell a { display: block; } + .calendar .calendar_weekEndCell { background: #ddd; } + .calendar .calendar_daysCellOver { background: #fff; border: 1px solid #777; } + .calendar .calendar_unselectable { color: #888; } @@ -117,42 +145,46 @@ img.calendar_trigger { /* ________ CALENDAR LINKS _______ ** Reset link properties and then override them with !important */ -#calendar_div a, .calendar_inline a { +#calendar_div a,.calendar_inline a { cursor: pointer; margin: 0; padding: 0; background: none; color: #000; } + .calendar_inline .calendar_links a { padding: 0 5px !important; } -.calendar_control a, .calendar_links a { + +.calendar_control a,.calendar_links a { padding: 2px 5px !important; color: #eee !important; } + .calendar_titleRow a { color: #eee !important; } + .calendar_control a:hover { background: #fdd !important; color: #333 !important; } -.calendar_links a:hover, .calendar_titleRow a:hover { + +.calendar_links a:hover,.calendar_titleRow a:hover { background: #ddd !important; color: #333 !important; } /* ___________ IE6 IFRAME FIX ________ */ - .calendar_cover { - display: none; /*sorry for IE5*/ - display/**/: block; /*sorry for IE5*/ - position: absolute; /*must have*/ - z-index: -1; /*must have*/ - filter: mask(); /*must have*/ - top: -4px; /*must have*/ - left: -4px; /*must have*/ - width: 193px; /*must have to match width and borders*/ - height: 200px; /*must have to match maximum height*/ + display: none; /*sorry for IE5*/ + display /**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 193px; /*must have to match width and borders*/ + height: 200px; /*must have to match maximum height*/ }
\ No newline at end of file diff --git a/libs/jquery/thickbox.css b/libs/jquery/thickbox.css index 9973d26f83..4b2f5a5e7b 100644 --- a/libs/jquery/thickbox.css +++ b/libs/jquery/thickbox.css @@ -1,11 +1,9 @@ /* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ - - -/* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ + /* ---------->>> global settings needed for thickbox <<<-----------------------------------------------------------*/ + /* ----------------------------------------------------------------------------------------------------------------*/ + /* ----------------------------------------------------------------------------------------------------------------*/ + /* ---------->>> thickbox specific link and font settings <<<------------------------------------------------------*/ + /* ----------------------------------------------------------------------------------------------------------------*/ #TB_window { font: 12px Arial, Helvetica, sans-serif; color: #333333; @@ -13,59 +11,84 @@ #TB_secondLine { font: 10px Arial, Helvetica, sans-serif; - color:#666666; + color: #666666; +} + +#TB_window a:link { + color: #666666; } -#TB_window a:link {color: #666666;} -#TB_window a:visited {color: #666666;} -#TB_window a:hover {color: #000;} -#TB_window a:active {color: #666666;} -#TB_window a:focus{color: #666666;} +#TB_window a:visited { + color: #666666; +} + +#TB_window a:hover { + color: #000; +} + +#TB_window a:active { + color: #666666; +} + +#TB_window a:focus { + color: #666666; +} /* ----------------------------------------------------------------------------------------------------------------*/ -/* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ -/* ----------------------------------------------------------------------------------------------------------------*/ + /* ---------->>> thickbox settings <<<-----------------------------------------------------------------------------*/ + /* ----------------------------------------------------------------------------------------------------------------*/ #TB_overlay { position: fixed; - z-index:100; + z-index: 100; top: 0px; left: 0px; - height:100%; - width:100%; + height: 100%; + width: 100%; +} + +.TB_overlayMacFFBGHack { + background: url(libs/jquery/macFFBgHack.png) repeat; } -.TB_overlayMacFFBGHack {background: url(libs/jquery/macFFBgHack.png) repeat;} .TB_overlayBG { - background-color:#000; - filter:alpha(opacity=75); + background-color: #000; + filter: alpha(opacity = 75); -moz-opacity: 0.75; opacity: 0.75; } * html #TB_overlay { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); + position: absolute; + height: expression(document . body . scrollHeight > document . body .
+ offsetHeight ? document . body . scrollHeight : document + . body .
+ offsetHeight + 'px'); } #TB_window { position: fixed; background: #ffffff; z-index: 102; - color:#000000; - display:none; + color: #000000; + display: none; border: 4px solid #525252; - text-align:left; - top:50%; - left:50%; + text-align: left; + top: 50%; + left: 50%; } * html #TB_window { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); + position: absolute; + margin-top: expression(0 - parseInt(this . offsetHeight/ 2) + + (
+ TBWindowMargin = document . documentElement && document .
+ documentElement . scrollTop || document . body . scrollTop + ) +
+ 'px' ); } #TB_window img#TB_Image { - display:block; + display: block; margin: 15px 0 0 15px; border-right: 1px solid #ccc; border-bottom: 1px solid #ccc; @@ -73,91 +96,99 @@ margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = d border-left: 1px solid #666; } -#TB_caption{ - height:25px; - padding:7px 30px 10px 25px; - float:left; +#TB_caption { + height: 25px; + padding: 7px 30px 10px 25px; + float: left; } -#TB_closeWindow{ - height:25px; - padding:11px 25px 10px 0; - float:right; +#TB_closeWindow { + height: 25px; + padding: 11px 25px 10px 0; + float: right; } -#TB_closeAjaxWindow{ - padding:7px 10px 5px 0; - margin-bottom:1px; - text-align:right; - float:right; +#TB_closeAjaxWindow { + padding: 7px 10px 5px 0; + margin-bottom: 1px; + text-align: right; + float: right; } -#TB_ajaxWindowTitle{ - float:left; - padding:7px 0 5px 10px; - margin-bottom:1px; +#TB_ajaxWindowTitle { + float: left; + padding: 7px 0 5px 10px; + margin-bottom: 1px; } -#TB_title{ - background-color:#e8e8e8; - height:27px; +#TB_title { + background-color: #e8e8e8; + height: 27px; } -#TB_ajaxContent{ - clear:both; - padding:2px 15px 15px 15px; - overflow:auto; - text-align:left; - line-height:1.4em; +#TB_ajaxContent { + clear: both; + padding: 2px 15px 15px 15px; + overflow: auto; + text-align: left; + line-height: 1.4em; } -#TB_ajaxContent.TB_modal{ - padding:15px; +#TB_ajaxContent.TB_modal { + padding: 15px; } -#TB_ajaxContent p{ - padding:5px 0px 5px 0px; +#TB_ajaxContent p { + padding: 5px 0px 5px 0px; } -#TB_load{ +#TB_load { position: fixed; - display:none; - height:13px; - width:208px; - z-index:103; + display: none; + height: 13px; + width: 208px; + z-index: 103; top: 50%; left: 50%; margin: -6px 0 0 -104px; /* -height/2 0 0 -width/2 */ } * html #TB_load { /* ie6 hack */ -position: absolute; -margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); + position: absolute; + margin-top: expression(0 - parseInt(this . offsetHeight/ 2) + + (
+ TBWindowMargin = document . documentElement && document .
+ documentElement . scrollTop || document . body . scrollTop + ) +
+ 'px' ); } -#TB_HideSelect{ - z-index:99; - position:fixed; +#TB_HideSelect { + z-index: 99; + position: fixed; top: 0; left: 0; - background-color:#fff; - border:none; - filter:alpha(opacity=0); + background-color: #fff; + border: none; + filter: alpha(opacity = 0); -moz-opacity: 0; opacity: 0; - height:100%; - width:100%; + height: 100%; + width: 100%; } * html #TB_HideSelect { /* ie6 hack */ - position: absolute; - height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); -} - -#TB_iframeContent{ - clear:both; - border:none; - margin-bottom:-1px; - margin-top:1px; - _margin-bottom:1px; -} + position: absolute; + height: expression(document . body . scrollHeight > document . body .
+ offsetHeight ? document . body . scrollHeight : document + . body .
+ offsetHeight + 'px'); +} + +#TB_iframeContent { + clear: both; + border: none; + margin-bottom: -1px; + margin-top: 1px; + _margin-bottom: 1px; +}
\ No newline at end of file diff --git a/libs/jquery/tooltip/index.html b/libs/jquery/tooltip/index.html index 132cef04c4..7f47df5be5 100644 --- a/libs/jquery/tooltip/index.html +++ b/libs/jquery/tooltip/index.html @@ -3,12 +3,12 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> <title>Tests for Tooltip</title> -
-<link rel="stylesheet" href="jquery.tooltip.css" />
-<script src="jquery.js" type="text/javascript"></script>
-<script src="jquery.bgiframe.js" type="text/javascript"></script>
-<script src="jquery.dimensions.js" type="text/javascript"></script>
-<script src="chili-1.7.pack.js" type="text/javascript"></script>
+ +<link rel="stylesheet" href="jquery.tooltip.css" /> +<script src="jquery.js" type="text/javascript"></script> +<script src="jquery.bgiframe.js" type="text/javascript"></script> +<script src="jquery.dimensions.js" type="text/javascript"></script> +<script src="chili-1.7.pack.js" type="text/javascript"></script> <script src="jquery.tooltip.js" type="text/javascript"></script> <script type="text/javascript"> $(function() { @@ -61,78 +61,98 @@ $('#right2 a').Tooltip({ showURL: false }); $("#block").click($.Tooltip.block); }); -</script>
-
+</script> + <style type="text/css">
-#extended { margin: 2em 0; }
-#extended label { text-decoration: underline; }
-#yahoo { width: 7em; }
-#right, #right2 { text-align: right; }
-#tooltip.right { width: 250px; }
+#extended {
+ margin: 2em 0;
+}
+
+#extended label {
+ text-decoration: underline;
+}
+
+#yahoo {
+ width: 7em;
+}
+
+#right,#right2 {
+ text-align: right;
+}
+
+#tooltip.right {
+ width: 250px;
+}
</style> </head> -<body>
-<h1 id="banner">jQuery Tooltip Plugin Examples</h1>
+<body> +<h1 id="banner">jQuery Tooltip Plugin Examples</h1> <div id="main"> - <fieldset id="set1"> - <legend>Three elements with tooltips, default settings</legend> - <a title="A tooltip with default settings, the href is displayed below the title" href="http://google.de">Link to google</a> - <br/> - <label title="A label with a title and default settings, no href here" for="text1">Input something please!</label> - <br/> - <input title="Note that the tooltip disappears when clicking the input element" type="text" value="Test" name="action" id="text1"/>
-
- <h3>Code</h3>
- <pre><code class="mix">$('#set1 *').Tooltip();</code></pre> - </fieldset>
- - -
- <fieldset>
- <legend>An image with a tooltip</legend> - <img src="image.png" height="80" title="No delay. The src value is displayed below the title" />
- <h3>Code</h3>
- <pre><code class="mix">$('img').Tooltip({
+<fieldset id="set1"><legend>Three elements with +tooltips, default settings</legend> <a + title="A tooltip with default settings, the href is displayed below the title" + href="http://google.de">Link to google</a> <br /> +<label title="A label with a title and default settings, no href here" + for="text1">Input something please!</label> <br /> +<input + title="Note that the tooltip disappears when clicking the input element" + type="text" value="Test" name="action" id="text1" /> + +<h3>Code</h3> +<pre><code class="mix">$('#set1 *').Tooltip();</code></pre></fieldset> + + + +<fieldset><legend>An image with a tooltip</legend> <img + src="image.png" height="80" + title="No delay. The src value is displayed below the title" /> +<h3>Code</h3> +<pre><code class="mix">$('img').Tooltip({
delay: 0
-});</code></pre>
- </fieldset>
-
- <fieldset>
- <legend>Blocking tooltips</legend>
- <button id="block">Click this button to block/unblock all tooltips</button>
- <pre><code class="mix">$("#block").click($.Tooltip.block);</code></pre>
- </fieldset> -
- <fieldset>
- <legend>The next four links have no delay with tracking, with extra content:</legend> - <div id="yahoo"> - <a title="Yahoo doo - more content" href="http://yahoo.com">Link to yahoo</a> - <a title="Yahoo doo2 - wohooo" href="http://yahoo.com">Link to yahoo1</a> - <a title="Yahoo doo3" href="http://yahoo.com">Link to yahoo2</a> - <a title="Yahoo doo4 - buga!" href="http://yahoo.com">Link to yahoo3</a> - </div>
- <select><option>bgiframe test</option></select>
- <h3>Code</h3>
- <pre><code class="mix">$('#yahoo a').Tooltip({
+});</code></pre></fieldset> + +<fieldset><legend>Blocking tooltips</legend> +<button id="block">Click this button to block/unblock all +tooltips</button> +<pre><code class="mix">$("#block").click($.Tooltip.block);</code></pre> +</fieldset> + +<fieldset><legend>The next four links have no delay +with tracking, with extra content:</legend> +<div id="yahoo"><a title="Yahoo doo - more content" + href="http://yahoo.com">Link to yahoo</a> <a + title="Yahoo doo2 - wohooo" href="http://yahoo.com">Link to yahoo1</a> +<a title="Yahoo doo3" href="http://yahoo.com">Link to yahoo2</a> <a + title="Yahoo doo4 - buga!" href="http://yahoo.com">Link to yahoo3</a></div> +<select> + <option>bgiframe test</option> +</select> +<h3>Code</h3> +<pre><code class="mix">$('#yahoo a').Tooltip({
track: true,
delay: 0,
showURL: false,
showBody: " - ",
opacity: 0.85
-});</code></pre>
- </fieldset>
-
- <fieldset>
- <legend>Two tooltips with extra classes. Useful for different tooltip styles on a single page.</legend>
- <span id="fancy" title="You are dead, this is hell. - Please note the custom positioning here!">A fancy tooltip, now with some custom positioning.</span>
- <p><span id="pretty" title="I am pretty! - I am a very pretty tooltip, I need lot's of attention from buggers like you! Yes!">And now, for the fancy stuff, a tooltip with an extra class for nice shadows, and some extra content</span></p>
- <br/>
- <br/>
- <br/>
- <select><option>bgiframe test</option></select>
- <h3>Code</h3>
- <pre><code class="mix">$("#fancy").Tooltip({
+});</code></pre></fieldset> + +<fieldset><legend>Two tooltips with extra classes. +Useful for different tooltip styles on a single page.</legend> <span id="fancy" + title="You are dead, this is hell. - Please note the custom positioning here!">A +fancy tooltip, now with some custom positioning.</span> +<p><span id="pretty" + title="I am pretty! - I am a very pretty tooltip, I need lot's of attention from buggers like you! Yes!">And +now, for the fancy stuff, a tooltip with an extra class for nice +shadows, and some extra content</span></p> +<br /> +<br /> +<br /> +<select> + <option>bgiframe test</option> +</select> +<h3>Code</h3> +<pre><code class="mix">$("#fancy").Tooltip({
track: true,
delay: 0,
showURL: false,
@@ -153,70 +173,67 @@ $('#pretty').Tooltip({ fixPNG: true,
opacity: 0.95,
left: -120
-});</code></pre>
- </fieldset> -
- <fieldset>
- <legend>Image map with tooltips.</legend>
- - <img id="map" src="karte.png" width="345" height="312" border="0" alt="Karte" usemap="#Landkarte"> - <map name="Landkarte"> - <area shape="rect" coords="11,10,59,29" - href="http://www.koblenz.de/" alt="Koblenz" title="Koblenz"> - <area shape="rect" coords="42,36,96,57" - href="http://www.wiesbaden.de/" alt="Wiesbaden" title="Wiesbaden"> - <area shape="rect" coords="42,59,78,80" - href="http://www.mainz.de/" alt="Mainz" title="Mainz"> - <area shape="rect" coords="100,26,152,58" - href="http://www.frankfurt.de/" alt="Frankfurt" title="Frankfurt"> - <area shape="rect" coords="27,113,93,134" - href="http://www.mannheim.de/" alt="Mannheim" title="Mannheim"> - <area shape="rect" coords="100,138,163,159" - href="http://www.heidelberg.de/" alt="Heidelberg" title="Heidelberg"> - <area shape="rect" coords="207,77,266,101" - href="http://www.wuerzburg.de/" alt="Würzburg" title="Würzburg"> - <area shape="rect" coords="282,62,344,85" - href="http://www.bamberg.de/" alt="Bamberg" title="Bamberg"> - <area shape="rect" coords="255,132,316,150" - href="http://www.nuernberg.de/" alt="Nürnberg" title="Nürnberg"> - <area shape="rect" coords="78,182,132,200" - href="http://www.karlsruhe.de/" alt="Karlsruhe" title="Karlsruhe"> - <area shape="rect" coords="142,169,200,193" - href="http://www.heilbronn.de/" alt="Heilbronn" title="Heilbronn"> - <area shape="rect" coords="140,209,198,230" - href="http://www.stuttgart.de/" alt="Stuttgart" title="Stuttgart"> - <area shape="rect" coords="187,263,222,281" - href="http://www.ulm.de/" alt="Ulm" title="Ulm"> - <area shape="rect" coords="249,278,304,297" - href="http://www.augsburg.de/" alt="Augsburg" title="Augsburg"> - <area shape="poly" coords="48,311,105,248,96,210,75,205,38,234,8,310" - href="http://www.baden-aktuell.de/" alt="Baden" title="Baden"> - </map>
- <h3>Code</h3>
- <pre><code class="mix">$("map *").Tooltip();</code></pre> - </fieldset> -
- <fieldset>
- <legend>Testing repositioning at viewport borders</legend> - <p id="right"> - Tooltip with fixed width<br/> - <a title="Short title" href="http://goggle">Google me!</a><br/> - <a title="Rather a very very long title with no meaning but yet quite long long long" href="http://goggle">Google me!</a> - </p> - <p id="right2"> - Tooltip width auto width<br/> - <a title="Short title" href="http://goggle">Google me!</a><br/> - <a title="Rather a very very long title with no meaning but yet quite long long long" href="http://goggle">Google me!</a> - </p>
- <h3>Code</h3>
- <pre><code class="mix">$('#right a').Tooltip({
+});</code></pre></fieldset> + +<fieldset><legend>Image map with tooltips.</legend> <img + id="map" src="karte.png" width="345" height="312" border="0" + alt="Karte" usemap="#Landkarte"><map name="Landkarte"> + <area shape="rect" coords="11,10,59,29" href="http://www.koblenz.de/" + alt="Koblenz" title="Koblenz"> + <area shape="rect" coords="42,36,96,57" href="http://www.wiesbaden.de/" + alt="Wiesbaden" title="Wiesbaden"> + <area shape="rect" coords="42,59,78,80" href="http://www.mainz.de/" + alt="Mainz" title="Mainz"> + <area shape="rect" coords="100,26,152,58" + href="http://www.frankfurt.de/" alt="Frankfurt" title="Frankfurt"> + <area shape="rect" coords="27,113,93,134" + href="http://www.mannheim.de/" alt="Mannheim" title="Mannheim"> + <area shape="rect" coords="100,138,163,159" + href="http://www.heidelberg.de/" alt="Heidelberg" title="Heidelberg"> + <area shape="rect" coords="207,77,266,101" + href="http://www.wuerzburg.de/" alt="Würzburg" + title="Würzburg"> + <area shape="rect" coords="282,62,344,85" href="http://www.bamberg.de/" + alt="Bamberg" title="Bamberg"> + <area shape="rect" coords="255,132,316,150" + href="http://www.nuernberg.de/" alt="Nürnberg" + title="Nürnberg"> + <area shape="rect" coords="78,182,132,200" + href="http://www.karlsruhe.de/" alt="Karlsruhe" title="Karlsruhe"> + <area shape="rect" coords="142,169,200,193" + href="http://www.heilbronn.de/" alt="Heilbronn" title="Heilbronn"> + <area shape="rect" coords="140,209,198,230" + href="http://www.stuttgart.de/" alt="Stuttgart" title="Stuttgart"> + <area shape="rect" coords="187,263,222,281" href="http://www.ulm.de/" + alt="Ulm" title="Ulm"> + <area shape="rect" coords="249,278,304,297" + href="http://www.augsburg.de/" alt="Augsburg" title="Augsburg"> + <area shape="poly" coords="48,311,105,248,96,210,75,205,38,234,8,310" + href="http://www.baden-aktuell.de/" alt="Baden" title="Baden"> +</map> +<h3>Code</h3> +<pre><code class="mix">$("map *").Tooltip();</code></pre></fieldset> + +<fieldset><legend>Testing repositioning at viewport +borders</legend> +<p id="right">Tooltip with fixed width<br /> +<a title="Short title" href="http://goggle">Google me!</a><br /> +<a + title="Rather a very very long title with no meaning but yet quite long long long" + href="http://goggle">Google me!</a></p> +<p id="right2">Tooltip width auto width<br /> +<a title="Short title" href="http://goggle">Google me!</a><br /> +<a + title="Rather a very very long title with no meaning but yet quite long long long" + href="http://goggle">Google me!</a></p> +<h3>Code</h3> +<pre><code class="mix">$('#right a').Tooltip({
track: true,
delay: 0,
showURL: false,
extraClass: "right"
});
-$('#right2 a').Tooltip({ showURL: false });</code></pre>
- </fieldset>
-</div>
+$('#right2 a').Tooltip({ showURL: false });</code></pre></fieldset> +</div> </body> </html>
\ No newline at end of file diff --git a/misc/db-schema.xml b/misc/db-schema.xml index 12945d4405..03d949f5a9 100755 --- a/misc/db-schema.xml +++ b/misc/db-schema.xml @@ -1,1011 +1,1620 @@ -<?xml version="1.0" standalone="yes" ?>
-<DBMODEL Version="4.0">
-<SETTINGS>
-<GLOBALSETTINGS ModelName="db-schema" IDModel="0" IDVersion="0" VersionStr="1.0.0.0" Comments="" UseVersionHistroy="1" AutoIncVersion="1" DatabaseType="MySQL" ZoomFac="80.00" XPos="0" YPos="0" DefaultDataType="5" DefaultTablePrefix="0" DefSaveDBConn="" DefSyncDBConn="" DefQueryDBConn="" Printer="" HPageCount="4.0" PageAspectRatio="1.440892512336408" PageOrientation="1" PageFormat="A4 (210x297 mm, 8.26x11.7 inches)" SelectedPages="" UsePositionGrid="0" PositionGridX="20" PositionGridY="20" TableNameInRefs="0" DefaultTableType="0" ActivateRefDefForNewRelations="1" FKPrefix="" FKPostfix="" CreateFKRefDefIndex="0" DBQuoteCharacter="`" CreateSQLforLinkedObjects="0" DefModelFont="Tahoma" CanvasWidth="4096" CanvasHeight="2842" />
-<DATATYPEGROUPS>
-<DATATYPEGROUP Name="Numeric Types" Icon="1" />
-<DATATYPEGROUP Name="Date and Time Types" Icon="2" />
-<DATATYPEGROUP Name="String Types" Icon="3" />
-<DATATYPEGROUP Name="Blob and Text Types" Icon="4" />
-<DATATYPEGROUP Name="User defined Types" Icon="5" />
-<DATATYPEGROUP Name="Geographic Types" Icon="6" />
-</DATATYPEGROUPS>
-<DATATYPES>
-<DATATYPE ID="1" IDGroup="0" TypeName="TINYINT" Description="A very small integer. The signed range is -128 to 127. The unsigned range is 0 to 255." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="2" IDGroup="0" TypeName="SMALLINT" Description="A small integer. The signed range is -32768 to 32767. The unsigned range is 0 to 65535." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="3" IDGroup="0" TypeName="MEDIUMINT" Description="A medium-size integer. The signed range is -8388608 to 8388607. The unsigned range is 0 to 16777215." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="4" IDGroup="0" TypeName="INT" Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="0" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="5" IDGroup="0" TypeName="INTEGER" Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="1" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="6" IDGroup="0" TypeName="BIGINT" Description="A large integer. The signed range is -9223372036854775808 to 9223372036854775807. The unsigned range is 0 to 18446744073709551615." ParamCount="1" OptionCount="2" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="UNSIGNED" Default="0" />
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="7" IDGroup="0" TypeName="FLOAT" Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38." ParamCount="1" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="precision" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="8" IDGroup="0" TypeName="FLOAT" Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="9" IDGroup="0" TypeName="DOUBLE" Description="A normal-size (double-precision) floating-point number. Cannot be unsigned. Allowable values are -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and 2.2250738585072014E-308 to 1.7976931348623157E+308." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="10" IDGroup="0" TypeName="DOUBLE PRECISION" Description="This is a synonym for DOUBLE." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="11" IDGroup="0" TypeName="REAL" Description="This is a synonym for DOUBLE." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="12" IDGroup="0" TypeName="DECIMAL" Description="An unpacked floating-point number. Cannot be unsigned. Behaves like a CHAR column." ParamCount="2" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="3" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="13" IDGroup="0" TypeName="NUMERIC" Description="This is a synonym for DECIMAL." ParamCount="2" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="3" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-<PARAM Name="decimals" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="ZEROFILL" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="14" IDGroup="1" TypeName="DATE" Description="A date. The supported range is \a1000-01-01\a to \a9999-12-31\a." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="15" IDGroup="1" TypeName="DATETIME" Description="A date and time combination. The supported range is \a1000-01-01 00:00:00\a to \a9999-12-31 23:59:59\a." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="16" IDGroup="1" TypeName="TIMESTAMP" Description="A timestamp. The range is \a1970-01-01 00:00:00\a to sometime in the year 2037. The length can be 14 (or missing), 12, 10, 8, 6, 4, or 2 representing YYYYMMDDHHMMSS, ... , YYYYMMDD, ... , YY formats." ParamCount="1" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="17" IDGroup="1" TypeName="TIME" Description="A time. The range is \a-838:59:59\a to \a838:59:59\a." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="18" IDGroup="1" TypeName="YEAR" Description="A year in 2- or 4-digit format (default is 4-digit)." ParamCount="1" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="19" IDGroup="2" TypeName="CHAR" Description="A fixed-length string (1 to 255 characters) that is always right-padded with spaces to the specified length when stored. values are sorted and compared in case-insensitive fashion according to the default character set unless the BINARY keyword is given." ParamCount="1" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="20" IDGroup="2" TypeName="VARCHAR" Description="A variable-length string (1 to 255 characters). Values are sorted and compared in case-sensitive fashion unless the BINARY keyword is given." ParamCount="1" OptionCount="1" ParamRequired="1" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="length" />
-</PARAMS>
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="21" IDGroup="2" TypeName="BIT" Description="This is a synonym for CHAR(1)." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="22" IDGroup="2" TypeName="BOOL" Description="This is a synonym for CHAR(1)." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="23" IDGroup="3" TypeName="TINYBLOB" Description="A column maximum length of 255 (2^8 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="24" IDGroup="3" TypeName="BLOB" Description="A column maximum length of 65535 (2^16 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="25" IDGroup="3" TypeName="MEDIUMBLOB" Description="A column maximum length of 16777215 (2^24 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="26" IDGroup="3" TypeName="LONGBLOB" Description="A column maximum length of 4294967295 (2^32 - 1) characters. Values are sorted and compared in case-sensitive fashion." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="27" IDGroup="3" TypeName="TINYTEXT" Description="A column maximum length of 255 (2^8 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="28" IDGroup="3" TypeName="TEXT" Description="A column maximum length of 65535 (2^16 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="29" IDGroup="3" TypeName="MEDIUMTEXT" Description="A column maximum length of 16777215 (2^24 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="30" IDGroup="3" TypeName="LONGTEXT" Description="A column maximum length of 4294967295 (2^32 - 1) characters." ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="31" IDGroup="3" TypeName="ENUM" Description="An enumeration. A string object that can have only one value, chosen from the list of values." ParamCount="1" OptionCount="0" ParamRequired="1" EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="values" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="32" IDGroup="3" TypeName="SET" Description="A set. A string object that can have zero or more values, each of which must be chosen from the list of values." ParamCount="1" OptionCount="0" ParamRequired="1" EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<PARAMS>
-<PARAM Name="values" />
-</PARAMS>
-</DATATYPE>
-<DATATYPE ID="33" IDGroup="4" TypeName="Varchar(20)" Description="" ParamCount="0" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="34" IDGroup="4" TypeName="Varchar(45)" Description="" ParamCount="0" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="35" IDGroup="4" TypeName="Varchar(255)" Description="" ParamCount="0" OptionCount="1" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-<OPTIONS>
-<OPTION Name="BINARY" Default="0" />
-</OPTIONS>
-</DATATYPE>
-<DATATYPE ID="36" IDGroup="5" TypeName="GEOMETRY" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="38" IDGroup="5" TypeName="LINESTRING" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="39" IDGroup="5" TypeName="POLYGON" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="40" IDGroup="5" TypeName="MULTIPOINT" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="41" IDGroup="5" TypeName="MULTILINESTRING" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="42" IDGroup="5" TypeName="MULTIPOLYGON" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-<DATATYPE ID="43" IDGroup="5" TypeName="GEOMETRYCOLLECTION" Description="Geographic Datatype" ParamCount="0" OptionCount="0" ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName="" >
-</DATATYPE>
-</DATATYPES>
-<COMMON_DATATYPES>
-<COMMON_DATATYPE ID="5" />
-<COMMON_DATATYPE ID="8" />
-<COMMON_DATATYPE ID="20" />
-<COMMON_DATATYPE ID="15" />
-<COMMON_DATATYPE ID="22" />
-<COMMON_DATATYPE ID="28" />
-<COMMON_DATATYPE ID="26" />
-<COMMON_DATATYPE ID="33" />
-<COMMON_DATATYPE ID="34" />
-<COMMON_DATATYPE ID="35" />
-</COMMON_DATATYPES>
-<TABLEPREFIXES>
-<TABLEPREFIX Name="Default (no prefix)" />
-</TABLEPREFIXES>
-<REGIONCOLORS>
-<REGIONCOLOR Color="Red=#FFEEEC" />
-<REGIONCOLOR Color="Yellow=#FEFDED" />
-<REGIONCOLOR Color="Green=#EAFFE5" />
-<REGIONCOLOR Color="Cyan=#ECFDFF" />
-<REGIONCOLOR Color="Blue=#F0F1FE" />
-<REGIONCOLOR Color="Magenta=#FFEBFA" />
-</REGIONCOLORS>
-<POSITIONMARKERS>
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-<POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" />
-</POSITIONMARKERS>
-</SETTINGS>
-<METADATA>
-<REGIONS>
-<REGION ID="2956" RegionName="Debug / Info log" XPos="23" YPos="601" Width="750" Height="280" RegionColor="0" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="21" />
-<REGION ID="2955" RegionName="Statistics logger" XPos="838" YPos="25" Width="582" Height="650" RegionColor="4" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="20" />
-<REGION ID="2954" RegionName="SQL query profiling" XPos="800" YPos="700" Width="233" Height="181" RegionColor="3" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="19" />
-<REGION ID="2953" RegionName="Users \+ Permissions" XPos="533" YPos="33" Width="264" Height="331" RegionColor="2" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="18" />
-<REGION ID="2952" RegionName="Archived data" XPos="25" YPos="28" Width="301" Height="484" RegionColor="1" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="17" />
-<REGION ID="2949" RegionName="Site" XPos="368" YPos="387" Width="451" Height="161" RegionColor="0" TablePrefix="0" TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="18" />
-</REGIONS>
-<TABLES>
-<TABLE ID="2797" Tablename="piwik_access" PrevTableName="" XPos="581" YPos="282" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="2" >
-<COLUMNS>
-<COLUMN ID="2813" ColName="login" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2814" ColName="idsite" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2815" ColName="access" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="2959" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="2816" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2813" LengthParam="0" />
-<INDEXCOLUMN idColumn="2814" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2799" Tablename="piwik_archive_blob_YEAR_MONTH" PrevTableName="piwik_archive_blob_2008_01" XPos="52" YPos="106" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="4" >
-<COLUMNS>
-<COLUMN ID="2826" ColName="idarchive" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2827" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2828" ColName="idsite" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2829" ColName="date1" PrevColName="" Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2830" ColName="date2" PrevColName="" Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2831" ColName="period" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2832" ColName="ts_archived" PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2833" ColName="value" PrevColName="" Pos="8" idDatatype="24" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="2834" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2826" LengthParam="0" />
-<INDEXCOLUMN idColumn="2827" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2801" Tablename="piwik_archive_numeric_YEAR_MONTH" PrevTableName="piwik_archive_numeric_2008_01" XPos="43" YPos="294" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="6" >
-<COLUMNS>
-<COLUMN ID="2844" ColName="idarchive" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2845" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2846" ColName="idsite" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2847" ColName="date1" PrevColName="" Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2848" ColName="date2" PrevColName="" Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2849" ColName="period" PrevColName="" Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2850" ColName="ts_archived" PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2851" ColName="value" PrevColName="" Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="2852" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2844" LengthParam="0" />
-<INDEXCOLUMN idColumn="2845" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2802" Tablename="piwik_log_action" PrevTableName="" XPos="946" YPos="296" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="7" >
-<COLUMNS>
-<COLUMN ID="2853" ColName="idaction" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2854" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2855" ColName="type" PrevColName="" Pos="3" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="2966" />
-<RELATION_START ID="2967" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="2856" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2853" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2803" Tablename="piwik_log_link_visit_action" PrevTableName="" XPos="862" YPos="442" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="\n" TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="8" >
-<COLUMNS>
-<COLUMN ID="2857" ColName="idlink_va" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2858" ColName="idvisit" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2859" ColName="idaction" PrevColName="" Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2860" ColName="idaction_ref" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2861" ColName="time_spent_ref_action" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="2962" />
-<RELATION_END ID="2966" />
-<RELATION_END ID="2967" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="2862" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2857" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2804" Tablename="piwik_log_profiling" PrevTableName="" XPos="843" YPos="754" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="9" >
-<COLUMNS>
-<COLUMN ID="2863" ColName="query" PrevColName="" Pos="1" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2864" ColName="count" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2865" ColName="sum_time_ms" PrevColName="" Pos="3" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="2866" IndexName="query" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2863" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2805" Tablename="piwik_log_visit" PrevTableName="" XPos="1146" YPos="43" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="10" >
-<COLUMNS>
-<COLUMN ID="2867" ColName="idvisit" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2868" ColName="idsite" PrevColName="" Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2869" ColName="visitor_localtime" PrevColName="" Pos="3" idDatatype="17" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2870" ColName="visitor_idcookie" PrevColName="" Pos="4" idDatatype="19" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2871" ColName="visitor_returning" PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2872" ColName="visit_first_action_time" PrevColName="" Pos="6" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2873" ColName="visit_last_action_time" PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2874" ColName="visit_server_date" PrevColName="" Pos="8" idDatatype="14" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2875" ColName="visit_exit_idaction" PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2876" ColName="visit_entry_idaction" PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2877" ColName="visit_total_actions" PrevColName="" Pos="11" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2878" ColName="visit_total_time" PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(5)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2879" ColName="referer_type" PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2880" ColName="referer_name" PrevColName="" Pos="14" idDatatype="20" DatatypeParams="(70)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2881" ColName="referer_url" PrevColName="" Pos="15" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2882" ColName="referer_keyword" PrevColName="" Pos="16" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2883" ColName="config_md5config" PrevColName="" Pos="17" idDatatype="19" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2884" ColName="config_os" PrevColName="" Pos="18" idDatatype="19" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2885" ColName="config_browser_name" PrevColName="" Pos="19" idDatatype="20" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2886" ColName="config_browser_version" PrevColName="" Pos="20" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2887" ColName="config_resolution" PrevColName="" Pos="21" idDatatype="20" DatatypeParams="(9)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2888" ColName="config_color_depth" PrevColName="" Pos="22" idDatatype="1" DatatypeParams="(2)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2889" ColName="config_pdf" PrevColName="" Pos="23" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2890" ColName="config_flash" PrevColName="" Pos="24" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2891" ColName="config_java" PrevColName="" Pos="25" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2892" ColName="config_director" PrevColName="" Pos="26" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2893" ColName="config_quicktime" PrevColName="" Pos="27" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2894" ColName="config_realplayer" PrevColName="" Pos="28" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2895" ColName="config_windowsmedia" PrevColName="" Pos="29" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2896" ColName="config_cookie" PrevColName="" Pos="30" idDatatype="1" DatatypeParams="(1)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2897" ColName="location_ip" PrevColName="" Pos="31" idDatatype="6" DatatypeParams="(11)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2898" ColName="location_browser_lang" PrevColName="" Pos="32" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2899" ColName="location_country" PrevColName="" Pos="33" idDatatype="19" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2900" ColName="location_continent" PrevColName="" Pos="34" idDatatype="19" DatatypeParams="(3)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2901" ColName="location_provider" PrevColName="" Pos="35" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="2962" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="2902" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2867" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2806" Tablename="piwik_logger_api_call" PrevTableName="" XPos="474" YPos="637" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="11" >
-<COLUMNS>
-<COLUMN ID="2903" ColName="idlogger_api_call" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2904" ColName="class_name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2905" ColName="method_name" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2906" ColName="parameter_names_default_values" PrevColName="" Pos="4" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2907" ColName="parameter_values" PrevColName="" Pos="5" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2908" ColName="execution_time" PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2909" ColName="caller_ip" PrevColName="" Pos="7" idDatatype="6" DatatypeParams="(20)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2910" ColName="timestamp" PrevColName="" Pos="8" idDatatype="16" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2911" ColName="returned_value" PrevColName="" Pos="9" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="2912" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2903" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2807" Tablename="piwik_logger_error" PrevTableName="" XPos="38" YPos="683" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="12" >
-<COLUMNS>
-<COLUMN ID="2913" ColName="idlogger_error" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2914" ColName="timestamp" PrevColName="" Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2915" ColName="message" PrevColName="" Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2916" ColName="errno" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2917" ColName="errline" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2918" ColName="errfile" PrevColName="" Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2919" ColName="backtrace" PrevColName="" Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="2920" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2913" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2808" Tablename="piwik_logger_exception" PrevTableName="" XPos="246" YPos="722" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="13" >
-<COLUMNS>
-<COLUMN ID="2921" ColName="idlogger_exception" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2922" ColName="timestamp" PrevColName="" Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2923" ColName="message" PrevColName="" Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2924" ColName="errno" PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2925" ColName="errline" PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2926" ColName="errfile" PrevColName="" Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2927" ColName="backtrace" PrevColName="" Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="2928" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2921" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2809" Tablename="piwik_logger_message" PrevTableName="" XPos="254" YPos="632" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="14" >
-<COLUMNS>
-<COLUMN ID="2929" ColName="idlogger_message" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2930" ColName="timestamp" PrevColName="" Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2931" ColName="message" PrevColName="" Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<INDICES>
-<INDEX ID="2932" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2929" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2810" Tablename="piwik_site" PrevTableName="" XPos="379" YPos="430" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="15" >
-<COLUMNS>
-<COLUMN ID="2933" ColName="idsite" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2934" ColName="name" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(90)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2935" ColName="main_url" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2936" ColName="ts_created" PrevColName="" Pos="4" idDatatype="16" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="CURRENT_TIMESTAMP" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="2958" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="2937" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2933" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2811" Tablename="piwik_site_url" PrevTableName="" XPos="622" YPos="433" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="16" >
-<COLUMNS>
-<COLUMN ID="2938" ColName="idsite" PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="1" />
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2939" ColName="url" PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_END>
-<RELATION_END ID="2958" />
-</RELATIONS_END>
-<INDICES>
-<INDEX ID="2940" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2938" LengthParam="0" />
-<INDEXCOLUMN idColumn="2939" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-<TABLE ID="2812" Tablename="piwik_user" PrevTableName="" XPos="572" YPos="67" TableType="0" TablePrefix="0" nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="17" >
-<COLUMNS>
-<COLUMN ID="2941" ColName="login" PrevColName="" Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2942" ColName="password" PrevColName="" Pos="2" idDatatype="19" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2943" ColName="alias" PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(45)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2944" ColName="email" PrevColName="" Pos="4" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2945" ColName="token_auth" PrevColName="" Pos="5" idDatatype="19" DatatypeParams="(32)" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="" Comments="">
-<OPTIONSELECTED>
-<OPTIONSELECT Value="0" />
-</OPTIONSELECTED>
-</COLUMN>
-<COLUMN ID="2946" ColName="date_registered" PrevColName="" Pos="6" idDatatype="16" DatatypeParams="" Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" DefaultValue="CURRENT_TIMESTAMP" Comments="">
-<OPTIONSELECTED>
-</OPTIONSELECTED>
-</COLUMN>
-</COLUMNS>
-<RELATIONS_START>
-<RELATION_START ID="2959" />
-</RELATIONS_START>
-<INDICES>
-<INDEX ID="2947" IndexName="PRIMARY" IndexKind="0" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2941" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-<INDEX ID="2948" IndexName="uniq_keytoken" IndexKind="1" FKRefDef_Obj_id="-1">
-<INDEXCOLUMNS>
-<INDEXCOLUMN idColumn="2945" LengthParam="0" />
-</INDEXCOLUMNS>
-</INDEX>
-</INDICES>
-</TABLE>
-</TABLES>
-<RELATIONS>
-<RELATION ID="2958" RelationName="Rel_01" Kind="2" SrcTable="2810" DestTable="2811" FKFields="idsite=idsite\n" FKFieldsComments="\n" relDirection="2" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="22" />
-<RELATION ID="2959" RelationName="Rel_02" Kind="2" SrcTable="2812" DestTable="2797" FKFields="login=login\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="23" />
-<RELATION ID="2962" RelationName="Rel_03" Kind="2" SrcTable="2805" DestTable="2803" FKFields="idvisit=idvisit\n" FKFieldsComments="\n" relDirection="4" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="24" />
-<RELATION ID="2966" RelationName="Rel_06" Kind="2" SrcTable="2802" DestTable="2803" FKFields="idaction=idaction\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="27" />
-<RELATION ID="2967" RelationName="Rel_07" Kind="2" SrcTable="2802" DestTable="2803" FKFields="idaction=idaction_ref\n" FKFieldsComments="\n" relDirection="3" MidOffset="0" OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="26" />
-</RELATIONS>
-<NOTES>
-</NOTES>
-<IMAGES>
-</IMAGES>
-</METADATA>
-<PLUGINDATA>
-<PLUGINDATARECORDS>
-</PLUGINDATARECORDS>
-</PLUGINDATA>
-<QUERYDATA>
-<QUERYRECORDS>
-</QUERYRECORDS>
-</QUERYDATA>
-<LINKEDMODELS>
-</LINKEDMODELS>
-</DBMODEL>
+<?xml version="1.0" standalone="yes" ?> +<DBMODEL Version="4.0"> + <SETTINGS> + <GLOBALSETTINGS ModelName="db-schema" IDModel="0" IDVersion="0" + VersionStr="1.0.0.0" Comments="" UseVersionHistroy="1" + AutoIncVersion="1" DatabaseType="MySQL" ZoomFac="80.00" XPos="0" + YPos="0" DefaultDataType="5" DefaultTablePrefix="0" DefSaveDBConn="" + DefSyncDBConn="" DefQueryDBConn="" Printer="" HPageCount="4.0" + PageAspectRatio="1.440892512336408" PageOrientation="1" + PageFormat="A4 (210x297 mm, 8.26x11.7 inches)" SelectedPages="" + UsePositionGrid="0" PositionGridX="20" PositionGridY="20" + TableNameInRefs="0" DefaultTableType="0" + ActivateRefDefForNewRelations="1" FKPrefix="" FKPostfix="" + CreateFKRefDefIndex="0" DBQuoteCharacter="`" + CreateSQLforLinkedObjects="0" DefModelFont="Tahoma" + CanvasWidth="4096" CanvasHeight="2842" /> + <DATATYPEGROUPS> + <DATATYPEGROUP Name="Numeric Types" Icon="1" /> + <DATATYPEGROUP Name="Date and Time Types" Icon="2" /> + <DATATYPEGROUP Name="String Types" Icon="3" /> + <DATATYPEGROUP Name="Blob and Text Types" Icon="4" /> + <DATATYPEGROUP Name="User defined Types" Icon="5" /> + <DATATYPEGROUP Name="Geographic Types" Icon="6" /> + </DATATYPEGROUPS> + <DATATYPES> + <DATATYPE ID="1" IDGroup="0" TypeName="TINYINT" + Description="A very small integer. The signed range is -128 to 127. The unsigned range is 0 to 255." + ParamCount="1" OptionCount="2" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="UNSIGNED" Default="1" /> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="2" IDGroup="0" TypeName="SMALLINT" + Description="A small integer. The signed range is -32768 to 32767. The unsigned range is 0 to 65535." + ParamCount="1" OptionCount="2" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="UNSIGNED" Default="1" /> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="3" IDGroup="0" TypeName="MEDIUMINT" + Description="A medium-size integer. The signed range is -8388608 to 8388607. The unsigned range is 0 to 16777215." + ParamCount="1" OptionCount="2" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="UNSIGNED" Default="1" /> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="4" IDGroup="0" TypeName="INT" + Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295." + ParamCount="1" OptionCount="2" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="UNSIGNED" Default="0" /> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="5" IDGroup="0" TypeName="INTEGER" + Description="A normal-size integer. The signed range is -2147483648 to 2147483647. The unsigned range is 0 to 4294967295." + ParamCount="1" OptionCount="2" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="1" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="UNSIGNED" Default="1" /> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="6" IDGroup="0" TypeName="BIGINT" + Description="A large integer. The signed range is -9223372036854775808 to 9223372036854775807. The unsigned range is 0 to 18446744073709551615." + ParamCount="1" OptionCount="2" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="UNSIGNED" Default="0" /> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="7" IDGroup="0" TypeName="FLOAT" + Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38." + ParamCount="1" OptionCount="1" ParamRequired="1" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="precision" /> + </PARAMS> + <OPTIONS> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="8" IDGroup="0" TypeName="FLOAT" + Description="A small (single-precision) floating-point number. Cannot be unsigned. Allowable values are -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to 3.402823466E+38." + ParamCount="2" OptionCount="1" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + <PARAM Name="decimals" /> + </PARAMS> + <OPTIONS> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="9" IDGroup="0" TypeName="DOUBLE" + Description="A normal-size (double-precision) floating-point number. Cannot be unsigned. Allowable values are -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and 2.2250738585072014E-308 to 1.7976931348623157E+308." + ParamCount="2" OptionCount="1" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="2" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + <PARAM Name="decimals" /> + </PARAMS> + <OPTIONS> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="10" IDGroup="0" TypeName="DOUBLE PRECISION" + Description="This is a synonym for DOUBLE." ParamCount="2" + OptionCount="1" ParamRequired="0" EditParamsAsString="0" + SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + <PARAM Name="decimals" /> + </PARAMS> + <OPTIONS> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="11" IDGroup="0" TypeName="REAL" + Description="This is a synonym for DOUBLE." ParamCount="2" + OptionCount="1" ParamRequired="0" EditParamsAsString="0" + SynonymGroup="2" PhysicalMapping="0" PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + <PARAM Name="decimals" /> + </PARAMS> + <OPTIONS> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="12" IDGroup="0" TypeName="DECIMAL" + Description="An unpacked floating-point number. Cannot be unsigned. Behaves like a CHAR column." + ParamCount="2" OptionCount="1" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="3" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + <PARAM Name="decimals" /> + </PARAMS> + <OPTIONS> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="13" IDGroup="0" TypeName="NUMERIC" + Description="This is a synonym for DECIMAL." ParamCount="2" + OptionCount="1" ParamRequired="1" EditParamsAsString="0" + SynonymGroup="3" PhysicalMapping="0" PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + <PARAM Name="decimals" /> + </PARAMS> + <OPTIONS> + <OPTION Name="ZEROFILL" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="14" IDGroup="1" TypeName="DATE" + Description="A date. The supported range is \a1000-01-01\a to \a9999-12-31\a." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="15" IDGroup="1" TypeName="DATETIME" + Description="A date and time combination. The supported range is \a1000-01-01 00:00:00\a to \a9999-12-31 23:59:59\a." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="16" IDGroup="1" TypeName="TIMESTAMP" + Description="A timestamp. The range is \a1970-01-01 00:00:00\a to sometime in the year 2037. The length can be 14 (or missing), 12, 10, 8, 6, 4, or 2 representing YYYYMMDDHHMMSS, ... , YYYYMMDD, ... , YY formats." + ParamCount="1" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + </DATATYPE> + <DATATYPE ID="17" IDGroup="1" TypeName="TIME" + Description="A time. The range is \a-838:59:59\a to \a838:59:59\a." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="18" IDGroup="1" TypeName="YEAR" + Description="A year in 2- or 4-digit format (default is 4-digit)." + ParamCount="1" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + </DATATYPE> + <DATATYPE ID="19" IDGroup="2" TypeName="CHAR" + Description="A fixed-length string (1 to 255 characters) that is always right-padded with spaces to the specified length when stored. values are sorted and compared in case-insensitive fashion according to the default character set unless the BINARY keyword is given." + ParamCount="1" OptionCount="1" ParamRequired="1" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="BINARY" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="20" IDGroup="2" TypeName="VARCHAR" + Description="A variable-length string (1 to 255 characters). Values are sorted and compared in case-sensitive fashion unless the BINARY keyword is given." + ParamCount="1" OptionCount="1" ParamRequired="1" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="length" /> + </PARAMS> + <OPTIONS> + <OPTION Name="BINARY" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="21" IDGroup="2" TypeName="BIT" + Description="This is a synonym for CHAR(1)." ParamCount="0" + OptionCount="0" ParamRequired="0" EditParamsAsString="0" + SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="22" IDGroup="2" TypeName="BOOL" + Description="This is a synonym for CHAR(1)." ParamCount="0" + OptionCount="0" ParamRequired="0" EditParamsAsString="0" + SynonymGroup="0" PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="23" IDGroup="3" TypeName="TINYBLOB" + Description="A column maximum length of 255 (2^8 - 1) characters. Values are sorted and compared in case-sensitive fashion." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="24" IDGroup="3" TypeName="BLOB" + Description="A column maximum length of 65535 (2^16 - 1) characters. Values are sorted and compared in case-sensitive fashion." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="25" IDGroup="3" TypeName="MEDIUMBLOB" + Description="A column maximum length of 16777215 (2^24 - 1) characters. Values are sorted and compared in case-sensitive fashion." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="26" IDGroup="3" TypeName="LONGBLOB" + Description="A column maximum length of 4294967295 (2^32 - 1) characters. Values are sorted and compared in case-sensitive fashion." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="27" IDGroup="3" TypeName="TINYTEXT" + Description="A column maximum length of 255 (2^8 - 1) characters." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="28" IDGroup="3" TypeName="TEXT" + Description="A column maximum length of 65535 (2^16 - 1) characters." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="29" IDGroup="3" TypeName="MEDIUMTEXT" + Description="A column maximum length of 16777215 (2^24 - 1) characters." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="30" IDGroup="3" TypeName="LONGTEXT" + Description="A column maximum length of 4294967295 (2^32 - 1) characters." + ParamCount="0" OptionCount="0" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="31" IDGroup="3" TypeName="ENUM" + Description="An enumeration. A string object that can have only one value, chosen from the list of values." + ParamCount="1" OptionCount="0" ParamRequired="1" + EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="values" /> + </PARAMS> + </DATATYPE> + <DATATYPE ID="32" IDGroup="3" TypeName="SET" + Description="A set. A string object that can have zero or more values, each of which must be chosen from the list of values." + ParamCount="1" OptionCount="0" ParamRequired="1" + EditParamsAsString="1" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <PARAMS> + <PARAM Name="values" /> + </PARAMS> + </DATATYPE> + <DATATYPE ID="33" IDGroup="4" TypeName="Varchar(20)" + Description="" ParamCount="0" OptionCount="1" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <OPTIONS> + <OPTION Name="BINARY" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="34" IDGroup="4" TypeName="Varchar(45)" + Description="" ParamCount="0" OptionCount="1" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <OPTIONS> + <OPTION Name="BINARY" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="35" IDGroup="4" TypeName="Varchar(255)" + Description="" ParamCount="0" OptionCount="1" ParamRequired="0" + EditParamsAsString="0" SynonymGroup="0" PhysicalMapping="0" + PhysicalTypeName=""> + <OPTIONS> + <OPTION Name="BINARY" Default="0" /> + </OPTIONS> + </DATATYPE> + <DATATYPE ID="36" IDGroup="5" TypeName="GEOMETRY" + Description="Geographic Datatype" ParamCount="0" OptionCount="0" + ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" + PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="38" IDGroup="5" TypeName="LINESTRING" + Description="Geographic Datatype" ParamCount="0" OptionCount="0" + ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" + PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="39" IDGroup="5" TypeName="POLYGON" + Description="Geographic Datatype" ParamCount="0" OptionCount="0" + ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" + PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="40" IDGroup="5" TypeName="MULTIPOINT" + Description="Geographic Datatype" ParamCount="0" OptionCount="0" + ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" + PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="41" IDGroup="5" TypeName="MULTILINESTRING" + Description="Geographic Datatype" ParamCount="0" OptionCount="0" + ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" + PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="42" IDGroup="5" TypeName="MULTIPOLYGON" + Description="Geographic Datatype" ParamCount="0" OptionCount="0" + ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" + PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + <DATATYPE ID="43" IDGroup="5" TypeName="GEOMETRYCOLLECTION" + Description="Geographic Datatype" ParamCount="0" OptionCount="0" + ParamRequired="0" EditParamsAsString="0" SynonymGroup="0" + PhysicalMapping="0" PhysicalTypeName=""> + </DATATYPE> + </DATATYPES> + <COMMON_DATATYPES> + <COMMON_DATATYPE ID="5" /> + <COMMON_DATATYPE ID="8" /> + <COMMON_DATATYPE ID="20" /> + <COMMON_DATATYPE ID="15" /> + <COMMON_DATATYPE ID="22" /> + <COMMON_DATATYPE ID="28" /> + <COMMON_DATATYPE ID="26" /> + <COMMON_DATATYPE ID="33" /> + <COMMON_DATATYPE ID="34" /> + <COMMON_DATATYPE ID="35" /> + </COMMON_DATATYPES> + <TABLEPREFIXES> + <TABLEPREFIX Name="Default (no prefix)" /> + </TABLEPREFIXES> + <REGIONCOLORS> + <REGIONCOLOR Color="Red=#FFEEEC" /> + <REGIONCOLOR Color="Yellow=#FEFDED" /> + <REGIONCOLOR Color="Green=#EAFFE5" /> + <REGIONCOLOR Color="Cyan=#ECFDFF" /> + <REGIONCOLOR Color="Blue=#F0F1FE" /> + <REGIONCOLOR Color="Magenta=#FFEBFA" /> + </REGIONCOLORS> + <POSITIONMARKERS> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + <POSITIONMARKER ZoomFac="-1.0" X="0" Y="0" /> + </POSITIONMARKERS> + </SETTINGS> + <METADATA> + <REGIONS> + <REGION ID="2956" RegionName="Debug / Info log" XPos="23" + YPos="601" Width="750" Height="280" RegionColor="0" TablePrefix="0" + TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" + Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="21" /> + <REGION ID="2955" RegionName="Statistics logger" XPos="838" + YPos="25" Width="582" Height="650" RegionColor="4" TablePrefix="0" + TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" + Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="20" /> + <REGION ID="2954" RegionName="SQL query profiling" + XPos="800" YPos="700" Width="233" Height="181" RegionColor="3" + TablePrefix="0" TableType="0" OverwriteTablePrefix="0" + OverwriteTableType="0" Comments="" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="19" /> + <REGION ID="2953" RegionName="Users \+ Permissions" + XPos="533" YPos="33" Width="264" Height="331" RegionColor="2" + TablePrefix="0" TableType="0" OverwriteTablePrefix="0" + OverwriteTableType="0" Comments="" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="18" /> + <REGION ID="2952" RegionName="Archived data" XPos="25" + YPos="28" Width="301" Height="484" RegionColor="1" TablePrefix="0" + TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" + Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="17" /> + <REGION ID="2949" RegionName="Site" XPos="368" YPos="387" + Width="451" Height="161" RegionColor="0" TablePrefix="0" + TableType="0" OverwriteTablePrefix="0" OverwriteTableType="0" + Comments="" IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="18" /> + </REGIONS> + <TABLES> + <TABLE ID="2797" Tablename="piwik_access" PrevTableName="" + XPos="581" YPos="282" TableType="0" TablePrefix="0" nmTable="0" + Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="2"> + <COLUMNS> + <COLUMN ID="2813" ColName="login" PrevColName="" + Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2814" ColName="idsite" PrevColName="" + Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2815" ColName="access" PrevColName="" + Pos="3" idDatatype="20" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <RELATIONS_END> + <RELATION_END ID="2959" /> + </RELATIONS_END> + <INDICES> + <INDEX ID="2816" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2813" + LengthParam="0" /> + <INDEXCOLUMN idColumn="2814" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2799" Tablename="piwik_archive_blob_YEAR_MONTH" + PrevTableName="piwik_archive_blob_2008_01" XPos="52" YPos="106" + TableType="0" TablePrefix="0" nmTable="0" Temporary="0" + UseStandardInserts="0" StandardInserts="\n" + TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" + Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" + Obj_id_Linked="-1" OrderPos="4"> + <COLUMNS> + <COLUMN ID="2826" ColName="idarchive" PrevColName="" + Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2827" ColName="name" PrevColName="" + Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2828" ColName="idsite" PrevColName="" + Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2829" ColName="date1" PrevColName="" + Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2830" ColName="date2" PrevColName="" + Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2831" ColName="period" PrevColName="" + Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2832" ColName="ts_archived" + PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2833" ColName="value" PrevColName="" + Pos="8" idDatatype="24" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <INDICES> + <INDEX ID="2834" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2826" + LengthParam="0" /> + <INDEXCOLUMN idColumn="2827" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2801" + Tablename="piwik_archive_numeric_YEAR_MONTH" + PrevTableName="piwik_archive_numeric_2008_01" XPos="43" YPos="294" + TableType="0" TablePrefix="0" nmTable="0" Temporary="0" + UseStandardInserts="0" StandardInserts="\n" + TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" + Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" + Obj_id_Linked="-1" OrderPos="6"> + <COLUMNS> + <COLUMN ID="2844" ColName="idarchive" PrevColName="" + Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2845" ColName="name" PrevColName="" + Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2846" ColName="idsite" PrevColName="" + Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2847" ColName="date1" PrevColName="" + Pos="4" idDatatype="14" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2848" ColName="date2" PrevColName="" + Pos="5" idDatatype="14" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2849" ColName="period" PrevColName="" + Pos="6" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2850" ColName="ts_archived" + PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2851" ColName="value" PrevColName="" + Pos="8" idDatatype="7" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <INDICES> + <INDEX ID="2852" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2844" + LengthParam="0" /> + <INDEXCOLUMN idColumn="2845" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2802" Tablename="piwik_log_action" + PrevTableName="" XPos="946" YPos="296" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="7"> + <COLUMNS> + <COLUMN ID="2853" ColName="idaction" PrevColName="" + Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2854" ColName="name" PrevColName="" + Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2855" ColName="type" PrevColName="" + Pos="3" idDatatype="1" DatatypeParams="(3)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <RELATIONS_START> + <RELATION_START ID="2966" /> + <RELATION_START ID="2967" /> + </RELATIONS_START> + <INDICES> + <INDEX ID="2856" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2853" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2803" Tablename="piwik_log_link_visit_action" + PrevTableName="" XPos="862" YPos="442" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" + StandardInserts="\n" + TableOptions="DelayKeyTblUpdates=0\nPackKeys=0\nRowChecksum=0\nRowFormat=0\nUseRaid=0\nRaidType=0\n" + Comments="" Collapsed="0" IsLinkedObject="0" IDLinkedModel="-1" + Obj_id_Linked="-1" OrderPos="8"> + <COLUMNS> + <COLUMN ID="2857" ColName="idlink_va" PrevColName="" + Pos="1" idDatatype="5" DatatypeParams="(11)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2858" ColName="idvisit" PrevColName="" + Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2859" ColName="idaction" PrevColName="" + Pos="3" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="1" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2860" ColName="idaction_ref" + PrevColName="" Pos="4" idDatatype="5" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="1" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2861" ColName="time_spent_ref_action" + PrevColName="" Pos="5" idDatatype="5" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <RELATIONS_END> + <RELATION_END ID="2962" /> + <RELATION_END ID="2966" /> + <RELATION_END ID="2967" /> + </RELATIONS_END> + <INDICES> + <INDEX ID="2862" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2857" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2804" Tablename="piwik_log_profiling" + PrevTableName="" XPos="843" YPos="754" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="9"> + <COLUMNS> + <COLUMN ID="2863" ColName="query" PrevColName="" + Pos="1" idDatatype="28" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2864" ColName="count" PrevColName="" + Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2865" ColName="sum_time_ms" + PrevColName="" Pos="3" idDatatype="7" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <INDICES> + <INDEX ID="2866" IndexName="query" IndexKind="1" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2863" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2805" Tablename="piwik_log_visit" + PrevTableName="" XPos="1146" YPos="43" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="10"> + <COLUMNS> + <COLUMN ID="2867" ColName="idvisit" PrevColName="" + Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2868" ColName="idsite" PrevColName="" + Pos="2" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2869" ColName="visitor_localtime" + PrevColName="" Pos="3" idDatatype="17" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2870" ColName="visitor_idcookie" + PrevColName="" Pos="4" idDatatype="19" DatatypeParams="(32)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2871" ColName="visitor_returning" + PrevColName="" Pos="5" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2872" ColName="visit_first_action_time" + PrevColName="" Pos="6" idDatatype="15" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2873" ColName="visit_last_action_time" + PrevColName="" Pos="7" idDatatype="15" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2874" ColName="visit_server_date" + PrevColName="" Pos="8" idDatatype="14" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2875" ColName="visit_exit_idaction" + PrevColName="" Pos="9" idDatatype="5" DatatypeParams="(11)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2876" ColName="visit_entry_idaction" + PrevColName="" Pos="10" idDatatype="5" DatatypeParams="(11)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2877" ColName="visit_total_actions" + PrevColName="" Pos="11" idDatatype="2" DatatypeParams="(5)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2878" ColName="visit_total_time" + PrevColName="" Pos="12" idDatatype="2" DatatypeParams="(5)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2879" ColName="referer_type" + PrevColName="" Pos="13" idDatatype="5" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2880" ColName="referer_name" + PrevColName="" Pos="14" idDatatype="20" DatatypeParams="(70)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2881" ColName="referer_url" + PrevColName="" Pos="15" idDatatype="28" DatatypeParams="" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2882" ColName="referer_keyword" + PrevColName="" Pos="16" idDatatype="20" DatatypeParams="(255)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2883" ColName="config_md5config" + PrevColName="" Pos="17" idDatatype="19" DatatypeParams="(32)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2884" ColName="config_os" PrevColName="" + Pos="18" idDatatype="19" DatatypeParams="(3)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2885" ColName="config_browser_name" + PrevColName="" Pos="19" idDatatype="20" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2886" ColName="config_browser_version" + PrevColName="" Pos="20" idDatatype="20" DatatypeParams="(20)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2887" ColName="config_resolution" + PrevColName="" Pos="21" idDatatype="20" DatatypeParams="(9)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2888" ColName="config_color_depth" + PrevColName="" Pos="22" idDatatype="1" DatatypeParams="(2)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2889" ColName="config_pdf" + PrevColName="" Pos="23" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2890" ColName="config_flash" + PrevColName="" Pos="24" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2891" ColName="config_java" + PrevColName="" Pos="25" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2892" ColName="config_director" + PrevColName="" Pos="26" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2893" ColName="config_quicktime" + PrevColName="" Pos="27" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2894" ColName="config_realplayer" + PrevColName="" Pos="28" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2895" ColName="config_windowsmedia" + PrevColName="" Pos="29" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2896" ColName="config_cookie" + PrevColName="" Pos="30" idDatatype="1" DatatypeParams="(1)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2897" ColName="location_ip" + PrevColName="" Pos="31" idDatatype="6" DatatypeParams="(11)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2898" ColName="location_browser_lang" + PrevColName="" Pos="32" idDatatype="20" DatatypeParams="(20)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2899" ColName="location_country" + PrevColName="" Pos="33" idDatatype="19" DatatypeParams="(3)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2900" ColName="location_continent" + PrevColName="" Pos="34" idDatatype="19" DatatypeParams="(3)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2901" ColName="location_provider" + PrevColName="" Pos="35" idDatatype="20" DatatypeParams="(100)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <RELATIONS_START> + <RELATION_START ID="2962" /> + </RELATIONS_START> + <INDICES> + <INDEX ID="2902" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2867" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2806" Tablename="piwik_logger_api_call" + PrevTableName="" XPos="474" YPos="637" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="11"> + <COLUMNS> + <COLUMN ID="2903" ColName="idlogger_api_call" + PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2904" ColName="class_name" + PrevColName="" Pos="2" idDatatype="20" DatatypeParams="(255)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2905" ColName="method_name" + PrevColName="" Pos="3" idDatatype="20" DatatypeParams="(255)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2906" + ColName="parameter_names_default_values" PrevColName="" Pos="4" + idDatatype="27" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2907" ColName="parameter_values" + PrevColName="" Pos="5" idDatatype="27" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2908" ColName="execution_time" + PrevColName="" Pos="6" idDatatype="7" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2909" ColName="caller_ip" PrevColName="" + Pos="7" idDatatype="6" DatatypeParams="(20)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2910" ColName="timestamp" PrevColName="" + Pos="8" idDatatype="16" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2911" ColName="returned_value" + PrevColName="" Pos="9" idDatatype="27" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <INDICES> + <INDEX ID="2912" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2903" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2807" Tablename="piwik_logger_error" + PrevTableName="" XPos="38" YPos="683" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="12"> + <COLUMNS> + <COLUMN ID="2913" ColName="idlogger_error" + PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2914" ColName="timestamp" PrevColName="" + Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2915" ColName="message" PrevColName="" + Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2916" ColName="errno" PrevColName="" + Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2917" ColName="errline" PrevColName="" + Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2918" ColName="errfile" PrevColName="" + Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2919" ColName="backtrace" PrevColName="" + Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <INDICES> + <INDEX ID="2920" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2913" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2808" Tablename="piwik_logger_exception" + PrevTableName="" XPos="246" YPos="722" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="13"> + <COLUMNS> + <COLUMN ID="2921" ColName="idlogger_exception" + PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2922" ColName="timestamp" PrevColName="" + Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2923" ColName="message" PrevColName="" + Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2924" ColName="errno" PrevColName="" + Pos="4" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2925" ColName="errline" PrevColName="" + Pos="5" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2926" ColName="errfile" PrevColName="" + Pos="6" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2927" ColName="backtrace" PrevColName="" + Pos="7" idDatatype="28" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <INDICES> + <INDEX ID="2928" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2921" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2809" Tablename="piwik_logger_message" + PrevTableName="" XPos="254" YPos="632" TableType="0" TablePrefix="0" + nmTable="0" Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="14"> + <COLUMNS> + <COLUMN ID="2929" ColName="idlogger_message" + PrevColName="" Pos="1" idDatatype="5" DatatypeParams="(10)" + Width="0" Prec="0" PrimaryKey="1" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2930" ColName="timestamp" PrevColName="" + Pos="2" idDatatype="16" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2931" ColName="message" PrevColName="" + Pos="3" idDatatype="27" DatatypeParams="" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <INDICES> + <INDEX ID="2932" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2929" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2810" Tablename="piwik_site" PrevTableName="" + XPos="379" YPos="430" TableType="0" TablePrefix="0" nmTable="0" + Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="15"> + <COLUMNS> + <COLUMN ID="2933" ColName="idsite" PrevColName="" + Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2934" ColName="name" PrevColName="" + Pos="2" idDatatype="20" DatatypeParams="(90)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2935" ColName="main_url" PrevColName="" + Pos="3" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2936" ColName="ts_created" + PrevColName="" Pos="4" idDatatype="16" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="CURRENT_TIMESTAMP" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <RELATIONS_START> + <RELATION_START ID="2958" /> + </RELATIONS_START> + <INDICES> + <INDEX ID="2937" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2933" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2811" Tablename="piwik_site_url" PrevTableName="" + XPos="622" YPos="433" TableType="0" TablePrefix="0" nmTable="0" + Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="16"> + <COLUMNS> + <COLUMN ID="2938" ColName="idsite" PrevColName="" + Pos="1" idDatatype="5" DatatypeParams="(10)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="1" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="1" /> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2939" ColName="url" PrevColName="" + Pos="2" idDatatype="20" DatatypeParams="(255)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <RELATIONS_END> + <RELATION_END ID="2958" /> + </RELATIONS_END> + <INDICES> + <INDEX ID="2940" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2938" + LengthParam="0" /> + <INDEXCOLUMN idColumn="2939" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + <TABLE ID="2812" Tablename="piwik_user" PrevTableName="" + XPos="572" YPos="67" TableType="0" TablePrefix="0" nmTable="0" + Temporary="0" UseStandardInserts="0" StandardInserts="" + TableOptions="" Comments="" Collapsed="0" IsLinkedObject="0" + IDLinkedModel="-1" Obj_id_Linked="-1" OrderPos="17"> + <COLUMNS> + <COLUMN ID="2941" ColName="login" PrevColName="" + Pos="1" idDatatype="20" DatatypeParams="(20)" Width="0" Prec="0" + PrimaryKey="1" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2942" ColName="password" PrevColName="" + Pos="2" idDatatype="19" DatatypeParams="(32)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2943" ColName="alias" PrevColName="" + Pos="3" idDatatype="20" DatatypeParams="(45)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2944" ColName="email" PrevColName="" + Pos="4" idDatatype="20" DatatypeParams="(100)" Width="0" Prec="0" + PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2945" ColName="token_auth" + PrevColName="" Pos="5" idDatatype="19" DatatypeParams="(32)" + Width="0" Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" + IsForeignKey="0" DefaultValue="" Comments=""> + <OPTIONSELECTED> + <OPTIONSELECT Value="0" /> + </OPTIONSELECTED> + </COLUMN> + <COLUMN ID="2946" ColName="date_registered" + PrevColName="" Pos="6" idDatatype="16" DatatypeParams="" Width="0" + Prec="0" PrimaryKey="0" NotNull="1" AutoInc="0" IsForeignKey="0" + DefaultValue="CURRENT_TIMESTAMP" Comments=""> + <OPTIONSELECTED></OPTIONSELECTED> + </COLUMN> + </COLUMNS> + <RELATIONS_START> + <RELATION_START ID="2959" /> + </RELATIONS_START> + <INDICES> + <INDEX ID="2947" IndexName="PRIMARY" IndexKind="0" + FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2941" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + <INDEX ID="2948" IndexName="uniq_keytoken" + IndexKind="1" FKRefDef_Obj_id="-1"> + <INDEXCOLUMNS> + <INDEXCOLUMN idColumn="2945" + LengthParam="0" /> + </INDEXCOLUMNS> + </INDEX> + </INDICES> + </TABLE> + </TABLES> + <RELATIONS> + <RELATION ID="2958" RelationName="Rel_01" Kind="2" + SrcTable="2810" DestTable="2811" FKFields="idsite=idsite\n" + FKFieldsComments="\n" relDirection="2" MidOffset="0" + OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" + CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" + EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" + Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" + Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" + IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="22" /> + <RELATION ID="2959" RelationName="Rel_02" Kind="2" + SrcTable="2812" DestTable="2797" FKFields="login=login\n" + FKFieldsComments="\n" relDirection="3" MidOffset="0" + OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" + CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" + EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" + Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" + Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" + IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="23" /> + <RELATION ID="2962" RelationName="Rel_03" Kind="2" + SrcTable="2805" DestTable="2803" FKFields="idvisit=idvisit\n" + FKFieldsComments="\n" relDirection="4" MidOffset="0" + OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" + CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" + EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" + Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" + Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" + IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="24" /> + <RELATION ID="2966" RelationName="Rel_06" Kind="2" + SrcTable="2802" DestTable="2803" FKFields="idaction=idaction\n" + FKFieldsComments="\n" relDirection="3" MidOffset="0" + OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" + CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" + EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" + Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" + Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" + IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="27" /> + <RELATION ID="2967" RelationName="Rel_07" Kind="2" + SrcTable="2802" DestTable="2803" FKFields="idaction=idaction_ref\n" + FKFieldsComments="\n" relDirection="3" MidOffset="0" + OptionalStart="0" OptionalEnd="0" CaptionOffsetX="0" + CaptionOffsetY="0" StartIntervalOffsetX="0" StartIntervalOffsetY="0" + EndIntervalOffsetX="0" EndIntervalOffsetY="0" CreateRefDef="1" + Invisible="0" RefDef="Matching=0\nOnDelete=3\nOnUpdate=3\n" + Comments="" FKRefDefIndex_Obj_id="-1" Splitted="0" + IsLinkedObject="0" IDLinkedModel="-1" Obj_id_Linked="-1" + OrderPos="26" /> + </RELATIONS> + <NOTES></NOTES> + <IMAGES></IMAGES> + </METADATA> + <PLUGINDATA> + <PLUGINDATARECORDS></PLUGINDATARECORDS> + </PLUGINDATA> + <QUERYDATA> + <QUERYRECORDS></QUERYRECORDS> + </QUERYDATA> + <LINKEDMODELS></LINKEDMODELS> +</DBMODEL> diff --git a/modules/Access.php b/modules/Access.php index 87b497f96f..52029477c6 100755 --- a/modules/Access.php +++ b/modules/Access.php @@ -1,16 +1,16 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik
- *
- */
-
-require_once 'SitesManager/API.php';
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik + * + */ + +require_once 'SitesManager/API.php'; /** * Class to handle User Access. * In Piwik there are mainly 4 access levels @@ -18,18 +18,18 @@ require_once 'SitesManager/API.php'; * - VIEW access * - ADMIN access * - Super admin access - * - * An access level is on a per website basis. + * + * An access level is on a per website basis. * A given user has a given access level for a given website. * For example: - * User Noemie has - * - VIEW access on the website 1, - * - ADMIN on the website 2 and 4, and + * User Noemie has + * - VIEW access on the website 1, + * - ADMIN on the website 2 and 4, and * - NO access on the website 3 and 5 - * - * There is only one Super User ; he has ADMIN access to all the websites + * + * There is only one Super User ; he has ADMIN access to all the websites * and he only can change the main configuration settings. - * + * * TODO This class should be in the Login plugin * This class should instead be an interface to be implemented by a Login plugin for other types of authentication (ldpa,openid,etc.) * @package Piwik @@ -41,52 +41,52 @@ class Piwik_Access private $idsitesByAccess = null; private $identity = null; //login private $isSuperUser = false; - + public function isSuperUser() { return $this->isSuperUser; } - + static private $availableAccess = array('noaccess', 'view', 'admin', 'superuser'); - + /** * Returns the list of the existing Access level. - * Useful when a given API method requests a given acccess Level. + * Useful when a given API method requests a given acccess Level. * We first check that the required access level exists. */ static public function getListAccess() { return self::$availableAccess; } - + /** * @param Piwik_Auth The authentification object */ public function __construct( $auth ) { $this->auth = $auth; - } - + } + /** * Load the access levels for the current user. - * + * * First call the authentication method to try to log the user in the system. * If the user credentials are not correct we don't load anything. - * If the login/password is correct the user is either the SuperUser or a normal user. + * If the login/password is correct the user is either the SuperUser or a normal user. * We load the access levels for this user for all the websites. */ public function loadAccess() { $accessByIdsite = array(); $idsitesByAccess = array( 'view' => array(), 'admin' => array(), 'superuser' => array()); - + // access = array ( idsite => accessIdSite, idsite2 => accessIdSite2) - $result = $this->auth->authenticate();
- + $result = $this->auth->authenticate(); + if($result->isValid()) { $this->identity = $result->getIdentity(); - + // case the superUser is logged in if($result->getCode() == Piwik_Auth::SUCCESS_SUPERUSER_AUTH_CODE) { @@ -100,16 +100,16 @@ class Piwik_Access } // valid authentification (normal user logged in) else - { + { $db = Zend_Registry::get('db'); - + // we join with site in case there are rows in access for an idsite that doesn't exist anymore // (backward compatibility ; before we deleted the site without deleting rows in _access table) - $accessRaw = $db->fetchAll("SELECT access, t2.idsite + $accessRaw = $db->fetchAll("SELECT access, t2.idsite FROM ".Piwik::prefixTable('access'). " as t1 JOIN ".Piwik::prefixTable('site')." as t2 USING (idsite) ". " WHERE login=?", $this->identity); - + foreach($accessRaw as $access) { $accessByIdsite[$access['idsite']] = $access['access']; @@ -117,54 +117,54 @@ class Piwik_Access } } } - + $this->accessByIdsite = $accessByIdsite; $this->idsitesByAccess = $idsitesByAccess; } - + /** * Returns the user login - * @return string + * @return string */ public function getIdentity() { return $this->identity; } - + /** * Returns an array of ID sites for which the user has at least a VIEW access. * Which means VIEW or ADMIN or SUPERUSER. - * - * @return array Example if the user is ADMIN for 4 + * + * @return array Example if the user is ADMIN for 4 * and has VIEW access for 1 and 7, it returns array(1, 4, 7); */ public function getSitesIdWithAtLeastViewAccess() { return array_unique(array_merge( - $this->idsitesByAccess['view'], - $this->idsitesByAccess['admin'], - $this->idsitesByAccess['superuser'])); + $this->idsitesByAccess['view'], + $this->idsitesByAccess['admin'], + $this->idsitesByAccess['superuser'])); } - - + + /** * Returns an array of ID sites for which the user has an ADMIN access. - * + * * @return array Example if the user is ADMIN for 4 and 8 * and has VIEW access for 1 and 7, it returns array(4, 8); */ public function getSitesIdWithAdminAccess() { return array_unique(array_merge( - $this->idsitesByAccess['admin'], - $this->idsitesByAccess['superuser'])); + $this->idsitesByAccess['admin'], + $this->idsitesByAccess['superuser'])); } - - + + /** * Returns an array of ID sites for which the user has a VIEW access only. - * - * @return array Example if the user is ADMIN for 4 + * + * @return array Example if the user is ADMIN for 4 * and has VIEW access for 1 and 7, it returns array(1, 7); * @see getSitesIdWithAtLeastViewAccess() */ @@ -172,7 +172,7 @@ class Piwik_Access { return $this->idsitesByAccess['view']; } - + /** * Throws an exception if the user is not the SuperUser * @throws Exception @@ -184,20 +184,20 @@ class Piwik_Access throw new Piwik_Access_NoAccessException("You can't access this resource as it requires a 'superuser' access."); } } - + /** * If the user doesn't have an ADMIN access for at least one website, throws an exception * @throws Exception */ public function checkUserHasSomeAdminAccess() - { + { $idSitesAccessible = $this->getSitesIdWithAdminAccess(); if(count($idSitesAccessible) == 0) { throw new Piwik_Access_NoAccessException("You can't access this resource as it requires an 'admin' access for at least one website."); } } - + /** * This method checks that the user has ADMIN access for the given list of websites. * If the user doesn't have ADMIN access for at least one website of the list, we throw an exception. @@ -205,7 +205,7 @@ class Piwik_Access * @throws Exception If for any of the websites the user doesn't have an ADMIN access */ public function checkUserHasAdminAccess( $idSites ) - { + { if(!is_array($idSites)) { $idSites = array($idSites); @@ -219,8 +219,8 @@ class Piwik_Access } } } - - + + /** * This method checks that the user has VIEW or ADMIN access for the given list of websites. * If the user doesn't have VIEW or ADMIN access for at least one website of the list, we throw an exception. @@ -233,7 +233,7 @@ class Piwik_Access { $idSites = array($idSites); } - $idSitesAccessible = $this->getSitesIdWithAtLeastViewAccess();
+ $idSitesAccessible = $this->getSitesIdWithAtLeastViewAccess(); foreach($idSites as $idsite) { @@ -244,10 +244,10 @@ class Piwik_Access } } } -
-/**
- *
- * @package Piwik
+ +/** + * + * @package Piwik */ class Piwik_Access_NoAccessException extends Exception {}
\ No newline at end of file diff --git a/modules/AdminMenu.php b/modules/AdminMenu.php new file mode 100644 index 0000000000..b450eb04f4 --- /dev/null +++ b/modules/AdminMenu.php @@ -0,0 +1,33 @@ +<?php +static $adminMenu = array(); + +function Piwik_GetAdminMenu() +{ + global $adminMenu; + foreach($adminMenu as $key => &$element) + { + if(is_null($element)) + { + unset($adminMenu[$key]); + } + } + return $adminMenu; +} + +function Piwik_AddAdminMenu( $adminMenuName, $url ) +{ + global $adminMenu; + + if(!isset($adminMenu[$adminMenuName])) + { + $adminMenu[$adminMenuName] = $url; + } +} + +function Piwik_RenameAdminMenuEntry($adminMenuOriginal, $adminMenuRenamed) +{ + global $adminMenu; + $save = $adminMenu[$adminMenuOriginal]; + unset($adminMenu[$adminMenuOriginal]); + $adminMenu[$adminMenuRenamed] = $save; +} diff --git a/modules/Archive.php b/modules/Archive.php index 90297bb209..eed4d6e54c 100644 --- a/modules/Archive.php +++ b/modules/Archive.php @@ -1,20 +1,20 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik
- */
-
-
-require_once 'Period.php';
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik + */ + + +require_once 'Period.php'; require_once 'Date.php'; require_once 'ArchiveProcessing.php'; -require_once 'Archive/Single.php';
-
+require_once 'Archive/Single.php'; + /** * Architecture * - *ArchiveProcessing* entity : handle all the computation on an archive / create & delete archive @@ -46,14 +46,14 @@ abstract class Piwik_Archive protected $site = null; static protected $alreadyBuilt = array(); -
- /**
- * Builds an Archive object or returns the same archive if previously built.
- *
- * @param int $idSite
- * @param string|Piwik_Date $date 'YYYY-MM-DD' or magic keywords 'today' See Piwik_Date::factory
- * @param string $period 'week' 'day' etc.
- * @return Piwik_Archive
+ + /** + * Builds an Archive object or returns the same archive if previously built. + * + * @param int $idSite + * @param string|Piwik_Date $date 'YYYY-MM-DD' or magic keywords 'today' See Piwik_Date::factory + * @param string $period 'week' 'day' etc. + * @return Piwik_Archive */ static public function build($idSite, $period, $strDate ) { @@ -97,68 +97,68 @@ abstract class Piwik_Archive return $archive; } -
- /**
- * Returns the value of the element $name from the current archive
- * The value to be returned is a numeric value and is stored in the archive_numeric_* tables
- *
- * @param string $name For example Referers_distinctKeywords
- * @return float|int|false False if no value with the given name
- */
- abstract public function getNumeric( $name );
-
- /**
- * Returns the value of the element $name from the current archive
- *
- * The value to be returned is a blob value and is stored in the archive_numeric_* tables
- *
- * It can return anything from strings, to serialized PHP arrays or PHP objects, etc.
- *
- * @param string $name For example Referers_distinctKeywords
- * @return mixed False if no value with the given name
- */
- abstract public function getBlob( $name );
-
- /**
- * Given a list of fields defining numeric values, it will return a Piwik_DataTable_Simple
- * containing one row per value.
- *
- * For example $fields = array( 'max_actions',
- * 'nb_uniq_visitors',
- * 'nb_visits',
- * 'nb_actions',
- * 'sum_visit_length',
- * 'bounce_count',
- * );
- *
- * @param array $fields array( fieldName1, fieldName2, ...)
- * @return Piwik_DataTable_Simple
- */
- abstract public function getDataTableFromNumeric( $fields );
-
- /**
- * This method will build a dataTable from the blob value $name in the current archive.
- *
- * For example $name = 'Referers_searchEngineByKeyword' will return a Piwik_DataTable containing all the keywords
- * If a idSubTable is given, the method will return the subTable of $name
- *
- * @param string $name
- * @param int $idSubTable
- * @return Piwik_DataTable
- * @throws exception If the value cannot be found
- */
- abstract public function getDataTable( $name, $idSubTable = null );
-
- /**
- * Same as getDataTable() except that it will also load in memory
- * all the subtables for the DataTable $name.
- * You can then access the subtables by using the Piwik_DataTable_Manager getTable()
- *
- * @param string $name
- * @param int $idSubTable
- * @return Piwik_DataTable
- */
- abstract public function getDataTableExpanded($name, $idSubTable = null);
+ + /** + * Returns the value of the element $name from the current archive + * The value to be returned is a numeric value and is stored in the archive_numeric_* tables + * + * @param string $name For example Referers_distinctKeywords + * @return float|int|false False if no value with the given name + */ + abstract public function getNumeric( $name ); + + /** + * Returns the value of the element $name from the current archive + * + * The value to be returned is a blob value and is stored in the archive_numeric_* tables + * + * It can return anything from strings, to serialized PHP arrays or PHP objects, etc. + * + * @param string $name For example Referers_distinctKeywords + * @return mixed False if no value with the given name + */ + abstract public function getBlob( $name ); + + /** + * Given a list of fields defining numeric values, it will return a Piwik_DataTable_Simple + * containing one row per value. + * + * For example $fields = array( 'max_actions', + * 'nb_uniq_visitors', + * 'nb_visits', + * 'nb_actions', + * 'sum_visit_length', + * 'bounce_count', + * ); + * + * @param array $fields array( fieldName1, fieldName2, ...) + * @return Piwik_DataTable_Simple + */ + abstract public function getDataTableFromNumeric( $fields ); + + /** + * This method will build a dataTable from the blob value $name in the current archive. + * + * For example $name = 'Referers_searchEngineByKeyword' will return a Piwik_DataTable containing all the keywords + * If a idSubTable is given, the method will return the subTable of $name + * + * @param string $name + * @param int $idSubTable + * @return Piwik_DataTable + * @throws exception If the value cannot be found + */ + abstract public function getDataTable( $name, $idSubTable = null ); + + /** + * Same as getDataTable() except that it will also load in memory + * all the subtables for the DataTable $name. + * You can then access the subtables by using the Piwik_DataTable_Manager getTable() + * + * @param string $name + * @param int $idSubTable + * @return Piwik_DataTable + */ + abstract public function getDataTableExpanded($name, $idSubTable = null); /** * Set the site @@ -179,12 +179,12 @@ abstract class Piwik_Archive { return $this->site; } -
- /**
- * Returns the Id site associated with this archive
- *
- * @return int
- */
+ + /** + * Returns the Id site associated with this archive + * + * @return int + */ public function getIdSite() { return $this->site->getId(); diff --git a/modules/Auth.php b/modules/Auth.php index 8b5967d085..a6377ecef8 100644 --- a/modules/Auth.php +++ b/modules/Auth.php @@ -1,46 +1,46 @@ <?php
/**
* Piwik - Open source web analytics
- *
+ *
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
* @version $Id$
- *
+ *
* @package Piwik
*/
/** - * + * * @package Piwik */ class Piwik_Auth extends Zend_Auth_Adapter_DbTable { const SUCCESS_SUPERUSER_AUTH_CODE = 42; - + public function __construct() { $db = Zend_Registry::get('db'); parent::__construct($db); } - + public function authenticate() { // we first try if the user is the super user $rootLogin = Zend_Registry::get('config')->superuser->login; $rootPassword = Zend_Registry::get('config')->superuser->password; $rootToken = Piwik_UsersManager_API::getTokenAuth($rootLogin,$rootPassword); -
-// echo $rootToken;
-// echo "<br>". $this->_credential;exit; - if($this->_identity == $rootLogin - && $this->_credential == $rootToken) +
+ // echo $rootToken;
+ // echo "<br>". $this->_credential;exit; + if($this->_identity == $rootLogin + && $this->_credential == $rootToken) { - return new Piwik_Auth_Result(Piwik_Auth::SUCCESS_SUPERUSER_AUTH_CODE, - $this->_identity, - array() // message empty - ); + return new Piwik_Auth_Result(Piwik_Auth::SUCCESS_SUPERUSER_AUTH_CODE, + $this->_identity, + array() // message empty + ); } - + // we then look if the user is API authenticated // API authentication works without login name, but only with the token // TODO the logic (sql select) should be in the Login plugin, not here @@ -49,39 +49,39 @@ class Piwik_Auth extends Zend_Auth_Adapter_DbTable if(is_null($this->_identity)) { $authenticated = false;
- + if($this->_credential === $rootToken) { - return new Piwik_Auth_Result(Piwik_Auth::SUCCESS_SUPERUSER_AUTH_CODE, - $rootLogin, - array() // message empty - ); + return new Piwik_Auth_Result(Piwik_Auth::SUCCESS_SUPERUSER_AUTH_CODE, + $rootLogin, + array() // message empty + ); } - + $login = Zend_Registry::get('db')->fetchOne( 'SELECT login FROM '.Piwik::prefixTable('user').' WHERE token_auth = ?', array($this->_credential) - ); + ); if($login !== false) { - return new Piwik_Auth_Result(Zend_Auth_Result::SUCCESS, - $login, - array() // message empty - ); + return new Piwik_Auth_Result(Zend_Auth_Result::SUCCESS, + $login, + array() // message empty + ); } else { return new Piwik_Auth_Result( Zend_Auth_Result::FAILURE, - $this->_identity, - array() - ); + $this->_identity, + array() + ); } } - + // if not then we return the result of the database authentification provided by zend return parent::authenticate(); } - + public function getTokenAuth() { return $this->_credential; @@ -91,15 +91,15 @@ class Piwik_Auth extends Zend_Auth_Adapter_DbTable /** - * + * * @package Piwik */ class Piwik_Auth_Result extends Zend_Auth_Result { public function __construct($code, $identity, array $messages = array()) - { - $this->_code = (int)$code; - $this->_identity = $identity; - $this->_messages = $messages; - } + { + $this->_code = (int)$code; + $this->_identity = $identity; + $this->_messages = $messages; + } } diff --git a/modules/Common.php b/modules/Common.php index 30c09b3a47..ea66bda7e1 100644 --- a/modules/Common.php +++ b/modules/Common.php @@ -1,25 +1,25 @@ <?php
/**
* Piwik - Open source web analytics
- *
+ *
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
* @version $Id$
- *
+ *
* @package Piwik_Helper
*/
/** * Static class providing functions used by both the CORE of Piwik and the - * visitor logging engine. - * + * visitor logging engine. + * * This is the only external class loaded by the Piwik.php file. - * This class should contain only the functions that are used in + * This class should contain only the functions that are used in * both the CORE and the piwik.php statistics logging engine. - *
+ *
* @package Piwik_Helper */ -class Piwik_Common +class Piwik_Common { const REFERER_TYPE_DIRECT_ENTRY = 1; const REFERER_TYPE_SEARCH_ENGINE = 2; @@ -27,32 +27,32 @@ class Piwik_Common const REFERER_TYPE_PARTNER = 4; const REFERER_TYPE_NEWSLETTER = 5; const REFERER_TYPE_CAMPAIGN = 6; - + const HTML_ENCODING_QUOTE_STYLE = ENT_COMPAT; - - + + static function getPathAndQueryFromUrl($url) { $parsedUrl = parse_url( $url ); - + $result = ''; - + if(isset($parsedUrl['path'])) { $result .= substr($parsedUrl['path'], 1); } - + if(isset($parsedUrl['query'])) { $result .= '?'.$parsedUrl['query']; } - + return $result; } - + /** * Returns true if the string passed may be a URL. - * We don't need a precise test here as the value comes from the website + * We don't need a precise test here as the value comes from the website * tracked source code and the URLs may look very strange. * * @param string $url @@ -62,21 +62,21 @@ class Piwik_Common { return ereg('^(ftp|news|http|https)?://[A-Za-z0-9\/_.-?&]*', $url); } - + /** * Returns the variable after cleaning operations. * NB: The variable still has to be escaped before going into a SQL Query! - * + * * If an array is passed the cleaning is done recursively on all the sub-arrays. \ * The keys of the array are filtered as well! - * + * * How this method works: * - The variable returned has been htmlspecialchars to avoid the XSS security problem. * - The single quotes are not protected so "Piwik's amazing" will still be "Piwik's amazing". - * + * * - Transformations are: * - '&' (ampersand) becomes '&' - * - '"'(double quote) becomes '"' + * - '"'(double quote) becomes '"' * - '<' (less than) becomes '<' * - '>' (greater than) becomes '>' * - It handles the magic_quotes setting. @@ -85,7 +85,7 @@ class Piwik_Common * @param mixed The variable to be cleaned * @return mixed The variable after cleaning */ - static public function sanitizeInputValues($value) + static public function sanitizeInputValues($value) { if(is_numeric($value)) { @@ -96,47 +96,47 @@ class Piwik_Common $value = htmlspecialchars($value, Piwik_Common::HTML_ENCODING_QUOTE_STYLE, 'UTF-8'); /* Undo the damage caused by magic_quotes */ - if (get_magic_quotes_gpc()) + if (get_magic_quotes_gpc()) { - $value = stripslashes($value); + $value = stripslashes($value); } } - elseif (is_array($value)) + elseif (is_array($value)) { - foreach (array_keys($value) as $key) + foreach (array_keys($value) as $key) { $newKey = $key; $newKey = Piwik_Common::sanitizeInputValues($newKey); - if ($key != $newKey) + if ($key != $newKey) { - $value[$newKey] = $value[$key]; - unset($value[$key]); + $value[$newKey] = $value[$key]; + unset($value[$key]); } - + $value[$newKey] = Piwik_Common::sanitizeInputValues($value[$newKey]); } } elseif( !is_null($value) - && !is_bool($value) + && !is_bool($value) ) { throw new Exception("The value to escape has not a supported type. Value = ".var_export($value, true)); } return $value; - } + } /** * Returns a variable from the $_REQUEST superglobal. * If the variable doesn't have a value or an empty value, returns the defaultValue if specified. * If the variable doesn't have neither a value nor a default value provided, an exception is raised. - * + * * @param string $varName name of the variable * @param string $varDefault default value. If '', and if the type doesn't match, exit() ! * @param string $varType Expected type, the value must be one of the following: array, numeric, int, integer, string - * + * * @exception if the variable type is not known * @exception if the variable we want to read doesn't have neither a value nor a default value specified - * + * * @return mixed The variable after cleaning */ static public function getRequestVar($varName, $varDefault = null, $varType = null, $requestArrayToUse = null) @@ -145,22 +145,22 @@ class Piwik_Common { $requestArrayToUse = $_REQUEST; } - + $varDefault = self::sanitizeInputValues( $varDefault ); - + if($varType == 'int') { // settype accepts only integer // 'int' is simply a shortcut for 'integer' $varType = 'integer'; } - - // there is no value $varName in the REQUEST so we try to use the default value + + // there is no value $varName in the REQUEST so we try to use the default value if(empty($varName) - || !isset($requestArrayToUse[$varName]) - || ( !is_array($requestArrayToUse[$varName]) - && strlen($requestArrayToUse[$varName]) === 0 - ) + || !isset($requestArrayToUse[$varName]) + || ( !is_array($requestArrayToUse[$varName]) + && strlen($requestArrayToUse[$varName]) === 0 + ) ) { if( is_null($varDefault)) @@ -170,8 +170,8 @@ class Piwik_Common } else { - if( !is_null($varType) - && in_array($varType, array('string', 'integer', 'array')) + if( !is_null($varType) + && in_array($varType, array('string', 'integer', 'array')) ) { settype($varDefault, $varType); @@ -179,44 +179,44 @@ class Piwik_Common return $varDefault; } } - + // Normal case, there is a value available in REQUEST for the requested varName $value = self::sanitizeInputValues( $requestArrayToUse[$varName] ); - + if( !is_null($varType)) - { + { $ok = false; - + if($varType == 'string') { if(is_string($value)) $ok = true; - } + } elseif($varType == 'numeric') { - if(is_numeric($value) || $value==(int)$value || $value==(float)$value) $ok = true; + if(is_numeric($value) || $value==(int)$value || $value==(float)$value) $ok = true; } elseif($varType == 'integer') { - if(is_int($value) || $value==(int)$value) $ok = true; + if(is_int($value) || $value==(int)$value) $ok = true; } elseif($varType == 'float') { - if(is_float($value) || $value==(float)$value) $ok = true; + if(is_float($value) || $value==(float)$value) $ok = true; } elseif($varType == 'array') { - if(is_array($value)) $ok = true; + if(is_array($value)) $ok = true; } else { throw new Exception("\$varType specified is not known. It should be one of the following: array, numeric, int, integer, float, string"); } - + // The type is not correct if($ok === false) { - if($varDefault === null) - { + if($varDefault === null) + { throw new Exception("\$varName '$varName' doesn't have a correct type in \$_REQUEST and doesn't " . "have a \$varDefault value"); } @@ -228,30 +228,30 @@ class Piwik_Common } } } - + return $value; } - - + + static public function generateUniqId() { return md5(uniqid(rand(), true)); } - + /** - * get the visitor os - * - * @param string $userAgent - * @param array $osList - * - * @return string - */ + * get the visitor os + * + * @param string $userAgent + * @param array $osList + * + * @return string + */ static public function getOs($userAgent) { - + require_once PIWIK_DATAFILES_INCLUDE_PATH . "/OS.php"; $osNameToId = $GLOBALS['Piwik_Oslist']; - + foreach($osNameToId as $key => $value) { if ($ok = ereg($key, $userAgent)) @@ -261,102 +261,102 @@ class Piwik_Common } return 'UNK'; } - + /** - * get visitor browser - * - * @param string $userAgent - * @return array array( 'name' => '', - 'major_number' => '', - 'minor_number' => '', - 'version' => '' // major_number.minor_number - ); - */ + * get visitor browser + * + * @param string $userAgent + * @return array array( 'name' => '', + 'major_number' => '', + 'minor_number' => '', + 'version' => '' // major_number.minor_number + ); + */ static public function getBrowserInfo($userAgent) { - + require_once PIWIK_DATAFILES_INCLUDE_PATH . "/Browsers.php"; - + $browsers = $GLOBALS['Piwik_BrowserList']; - + $info = array( 'name' => 'UNK', 'major_number' => '', 'minor_number' => '', 'version' => '' - ); - - $browser = ''; - foreach($browsers as $key => $value) - { - if(!empty($browser)) $browser .= "|"; - $browser .= $key; - } - - $results = array(); - - // added fix for Mozilla Suite detection - if ((preg_match_all("/(mozilla)[\/\sa-z;.0-9-(]+rv:([0-9]+)([.0-9a-z]+)\) gecko\/[0-9]{8}$/i", $userAgent, $results)) - || (preg_match_all("/($browser)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $results)) - ) - { - $count = count($results[0])-1; - - // browser code - $info['name'] = $browsers[strtolower($results[1][$count])]; - - // majeur version number (7 in mozilla 1.7 - $info['major_number'] = $results[2][$count]; - - // is an minor version number ? If not, 0 - $match = array(); - - preg_match('/([.\0-9]+)?([\.a-z0-9]+)?/i', $results[3][$count], $match); - - if(isset($match[1])) - { - // find minor version number (7 in mozilla 1.7, 9 in firefox 0.9.3) - $info['minor_number'] = substr($match[1], 0, 2); - } - else + ); + + $browser = ''; + foreach($browsers as $key => $value) { - $info['minor_number'] = '.0'; + if(!empty($browser)) $browser .= "|"; + $browser .= $key; } - - $info['version'] = $info['major_number'] . $info['minor_number']; - } - return $info; + + $results = array(); + + // added fix for Mozilla Suite detection + if ((preg_match_all("/(mozilla)[\/\sa-z;.0-9-(]+rv:([0-9]+)([.0-9a-z]+)\) gecko\/[0-9]{8}$/i", $userAgent, $results)) + || (preg_match_all("/($browser)[\/\sa-z(]*([0-9]+)([\.0-9a-z]+)?/i", $userAgent, $results)) + ) + { + $count = count($results[0])-1; + + // browser code + $info['name'] = $browsers[strtolower($results[1][$count])]; + + // majeur version number (7 in mozilla 1.7 + $info['major_number'] = $results[2][$count]; + + // is an minor version number ? If not, 0 + $match = array(); + + preg_match('/([.\0-9]+)?([\.a-z0-9]+)?/i', $results[3][$count], $match); + + if(isset($match[1])) + { + // find minor version number (7 in mozilla 1.7, 9 in firefox 0.9.3) + $info['minor_number'] = substr($match[1], 0, 2); + } + else + { + $info['minor_number'] = '.0'; + } + + $info['version'] = $info['major_number'] . $info['minor_number']; + } + return $info; } - + /** - * Returns the best possible IP in the format A.B.C.D - * - * @return string ip - */ - static public function getIp() + * Returns the best possible IP in the format A.B.C.D + * + * @return string ip + */ + static public function getIp() { - if(isset($_SERVER['HTTP_CLIENT_IP']) - && ($ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP'])) - && strpos($ip, "unknown") === false) + if(isset($_SERVER['HTTP_CLIENT_IP']) + && ($ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP'])) + && strpos($ip, "unknown") === false) { return $ip; } - elseif(isset($_SERVER['HTTP_X_FORWARDED_FOR']) - && $ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_X_FORWARDED_FOR']) - && isset($ip) - && !empty($ip) - && strpos($ip, "unknown")===false ) + elseif(isset($_SERVER['HTTP_X_FORWARDED_FOR']) + && $ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_X_FORWARDED_FOR']) + && isset($ip) + && !empty($ip) + && strpos($ip, "unknown")===false ) { return $ip; } elseif( isset($_SERVER['HTTP_CLIENT_IP']) - && strlen( Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP']) ) != 0 ) + && strlen( Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP']) ) != 0 ) { return Piwik_Common::getFirstIpFromList($_SERVER['HTTP_CLIENT_IP']); } - else if( isset($_SERVER['HTTP_X_FORWARDED_FOR']) - && strlen ($ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_X_FORWARDED_FOR'])) != 0) + else if( isset($_SERVER['HTTP_X_FORWARDED_FOR']) + && strlen ($ip = Piwik_Common::getFirstIpFromList($_SERVER['HTTP_X_FORWARDED_FOR'])) != 0) { return $ip; } @@ -365,15 +365,15 @@ class Piwik_Common return Piwik_Common::getFirstIpFromList($_SERVER['REMOTE_ADDR']); } } - - + + /** - * Returns the first element of a comma separated list of IPs - * - * @param string $ip - * - * @return string first element before ',' - */ + * Returns the first element of a comma separated list of IPs + * + * @param string $ip + * + * @return string first element before ',' + */ static private function getFirstIpFromList($ip) { $p = strpos($ip, ','); @@ -383,21 +383,21 @@ class Piwik_Common } return trim(Piwik_Common::sanitizeInputValues($ip)); } - - + + /** - * Returns the continent of a given country - * - * @param string Country 2 letters isocode - * - * @return string Continent (3 letters code : afr, asi, eur, amn, ams, oce) - */ + * Returns the continent of a given country + * + * @param string Country 2 letters isocode + * + * @return string Continent (3 letters code : afr, asi, eur, amn, ams, oce) + */ static function getContinent($country) { require_once PIWIK_DATAFILES_INCLUDE_PATH . "/Countries.php"; - + $countryList = $GLOBALS['Piwik_CountryList']; - + if(isset($countryList[$country][0])) { return $countryList[$country][0]; @@ -407,51 +407,51 @@ class Piwik_Common return 'unk'; } } - + /** - * Returns the visitor country based only on the Browser Lang information - * - * @param string $lang browser lang - * - * @return string - */ + * Returns the visitor country based only on the Browser Lang information + * + * @param string $lang browser lang + * + * @return string + */ static function getCountry( $lang ) { require_once PIWIK_DATAFILES_INCLUDE_PATH . "/Countries.php"; - + $countryList = $GLOBALS['Piwik_CountryList']; - + $replaceLangCodeByCountryCode = array( - // replace cs language (Serbia Montenegro country code) with czech country code + // replace cs language (Serbia Montenegro country code) with czech country code 'cs' => 'cz', - // replace sv language (El Salvador country code) with sweden country code + // replace sv language (El Salvador country code) with sweden country code 'sv' => 'se', - // replace fa language (Unknown country code) with Iran country code + // replace fa language (Unknown country code) with Iran country code 'fa' => 'ir', - // replace ja language (Unknown country code) with japan country code + // replace ja language (Unknown country code) with japan country code 'ja' => 'jp', - // replace ko language (Unknown country code) with corée country code + // replace ko language (Unknown country code) with corée country code 'ko' => 'kr', - // replace he language (Unknown country code) with Israel country code + // replace he language (Unknown country code) with Israel country code 'he' => 'il', - // replace da language (Unknown country code) with Danemark country code + // replace da language (Unknown country code) with Danemark country code 'da' => 'dk', - // replace gb code with UK country code + // replace gb code with UK country code 'gb' => 'uk', - ); - - + ); + + if(empty($lang) || strlen($lang) < 2) { return 'xx'; } - - $lang = str_replace( array_keys($replaceLangCodeByCountryCode), - array_values($replaceLangCodeByCountryCode), - $lang - ); - // Ex: "fr" + $lang = str_replace( array_keys($replaceLangCodeByCountryCode), + array_values($replaceLangCodeByCountryCode), + $lang + ); + + // Ex: "fr" if(strlen($lang) == 2) { if(isset($countryList[$lang])) @@ -485,13 +485,13 @@ class Piwik_Common if($off!==false) { $domain = substr($lang, $off+1, 2); - + if(isset($countryList[$domain])) { return $domain; } } - + // catch the second language Ex: "fr" in "en;q=1.0,fr;q=0.9" if(preg_match("/^[a-z]{2};q=[01]\.[0-9],(?P<domain>[a-z]{2});/", $lang, $parts)) { @@ -502,41 +502,41 @@ class Piwik_Common return $domain; } } - + // finally try with the first ever langage code $domain = substr($lang, 0, 2); if(isset($countryList[$domain])) { return $domain; } - + // at this point we really can't guess the country return 'xx'; } - + /** - * Returns the value of a GET parameter $parameter in an URL query $urlQuery - * - * @param string $urlQuery result of parse_url()['query'] and htmlentitied (& is &) - * @param string $param - * - * @return string|bool Parameter value if found (can be the empty string!), false if not found - */ + * Returns the value of a GET parameter $parameter in an URL query $urlQuery + * + * @param string $urlQuery result of parse_url()['query'] and htmlentitied (& is &) + * @param string $param + * + * @return string|bool Parameter value if found (can be the empty string!), false if not found + */ static public function getParameterFromQueryString( $urlQuery, $parameter) - { + { $nameToValue = self::getArrayFromQueryString($urlQuery); - + if(isset($nameToValue[$parameter])) { return $nameToValue[$parameter]; } return false; } - + /** * Returns an URL query string in an array format * The input query string should be htmlspecialchar - * + * * @param string urlQuery * @return array array( param1=> value1, param2=>value2) */ @@ -550,17 +550,17 @@ class Piwik_Common { $urlQuery = substr($urlQuery, 1); } - + $separator = '&'; - + $urlQuery = $separator . $urlQuery; -// $urlQuery = str_replace(array('%20'), ' ', $urlQuery); + // $urlQuery = str_replace(array('%20'), ' ', $urlQuery); $refererQuery = trim($urlQuery); - + $values = explode($separator, $refererQuery); - + $nameToValue = array(); - + foreach($values as $value) { if( false !== strpos($value, '=')) @@ -572,20 +572,20 @@ class Piwik_Common return $nameToValue; } - /**
- * Returns true if the string is a valid filename
- * File names that start with a-Z or 0-9 and contain a-Z, 0-9, underscore(_), dash(-), and dot(.) will be accepted.
- * File names beginning with anything but a-Z or 0-9 will be rejected (including .htaccess for example).
- * File names containing anything other than above mentioned will also be rejected (file names with spaces won't be accepted).
- *
- * @param string filename
- * @return bool
- *
- */
- static public function isValidFilename($filename)
- {
+ /**
+ * Returns true if the string is a valid filename
+ * File names that start with a-Z or 0-9 and contain a-Z, 0-9, underscore(_), dash(-), and dot(.) will be accepted.
+ * File names beginning with anything but a-Z or 0-9 will be rejected (including .htaccess for example).
+ * File names containing anything other than above mentioned will also be rejected (file names with spaces won't be accepted).
+ *
+ * @param string filename
+ * @return bool
+ *
+ */
+ static public function isValidFilename($filename)
+ {
return (false !== ereg("(^[a-zA-Z0-9]+([a-zA-Z\_0-9\.-]*))$" , $filename));
- } + } } diff --git a/modules/Config.php b/modules/Config.php index 498f8ca75d..a125c90691 100755 --- a/modules/Config.php +++ b/modules/Config.php @@ -152,21 +152,21 @@ class Piwik_Config } public function __get($name) - { - if( !is_null($this->userConfig) - && null !== ($valueInUserConfig = $this->userConfig->$name)) - { - return $valueInUserConfig; - } - if(null !== ($valueInDefaultConfig = $this->defaultConfig->$name)) - { - return $valueInDefaultConfig; - } - - throw new Exception("The configuration parameter $name couldn't be found in your configuration file. + { + if( !is_null($this->userConfig) + && null !== ($valueInUserConfig = $this->userConfig->$name)) + { + return $valueInUserConfig; + } + if(null !== ($valueInDefaultConfig = $this->defaultConfig->$name)) + { + return $valueInDefaultConfig; + } + + throw new Exception("The configuration parameter $name couldn't be found in your configuration file. <br>Try to replace your default configuration file ({$this->pathIniFileDefaultConfig}) with the <a href='".$this->urlToPiwikHelpMissingValueInConfigurationFile."'>default piwik configuration file</a> "); - } + } } diff --git a/modules/ErrorHandler.php b/modules/ErrorHandler.php index d8b52f060d..8643720a18 100755 --- a/modules/ErrorHandler.php +++ b/modules/ErrorHandler.php @@ -17,25 +17,25 @@ require_once "Zend/Registry.php"; function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline) { - // if the error has been suppressed by the @ we don't handle the error - if( error_reporting() == 0 ) - { - return; - } + // if the error has been suppressed by the @ we don't handle the error + if( error_reporting() == 0 ) + { + return; + } + + ob_start(); + debug_print_backtrace(); + $backtrace = ob_get_contents(); + ob_end_clean(); + - ob_start(); - debug_print_backtrace(); - $backtrace = ob_get_contents(); - ob_end_clean(); - - - try { - Zend_Registry::get('logger_error')->log($errno, $errstr, $errfile, $errline, $backtrace); - }catch(Exception $e){ - // in case the error occurs before the logger creation, we simply display it - print("<pre>$errstr \nin '$errfile' at the line $errline\n\n$backtrace\n</pre>"); - exit; - } + try { + Zend_Registry::get('logger_error')->log($errno, $errstr, $errfile, $errline, $backtrace); + }catch(Exception $e){ + // in case the error occurs before the logger creation, we simply display it + print("<pre>$errstr \nin '$errfile' at the line $errline\n\n$backtrace\n</pre>"); + exit; + } switch($errno) { case E_ERROR: @@ -58,6 +58,6 @@ function Piwik_ErrorHandler($errno, $errstr, $errfile, $errline) default: // do not exit break; - } + } } diff --git a/modules/FrontController.php b/modules/FrontController.php index bb86409c15..f77d8ae978 100644 --- a/modules/FrontController.php +++ b/modules/FrontController.php @@ -1,14 +1,14 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik + */ + /** * Zend classes @@ -33,16 +33,17 @@ require_once "Url.php"; require_once "Controller.php"; require_once "Menu.php"; +require_once "AdminMenu.php"; require_once "Widget.php"; -
-/**
- *
- *
- * @package Piwik
+ +/** + * + * + * @package Piwik */ class Piwik_FrontController -{
- static public $enableDispatch = true;
+{ + static public $enableDispatch = true; static private $instance = null; static public function getInstance() @@ -56,10 +57,10 @@ class Piwik_FrontController } function dispatch( $module = null, $action = null, $parameters = null) - {
- if( self::$enableDispatch === false)
- {
- return;
+ { + if( self::$enableDispatch === false) + { + return; } if(is_null($module)) @@ -109,8 +110,8 @@ class Piwik_FrontController { $action = $controller->getDefaultAction(); } -
- if( !is_callable(array($controller, $action)))
+ + if( !is_callable(array($controller, $action))) { throw new Exception("Action $action not found in the controller $controllerClassName."); } @@ -261,7 +262,7 @@ class Piwik_FrontController Piwik::install(); -// Piwik::printMemoryUsage('Start program');
+// Piwik::printMemoryUsage('Start program'); // can be used for debug purpose $doNotDrop = array( @@ -307,6 +308,6 @@ class Exception_PluginDeactivated extends Exception { function __construct($module) { - parent::__construct("The plugin '$module' is not enabled. You can activate the plugin on the <a href='?module=PluginsAdmin'>Plugins admin page</a>."); + parent::__construct("The plugin '$module' is not enabled. You can activate the plugin on the <a href='?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin'>Plugins admin page</a>."); } -}
\ No newline at end of file +} diff --git a/modules/Log.php b/modules/Log.php index 9e421ffbee..f5ebd037e3 100755 --- a/modules/Log.php +++ b/modules/Log.php @@ -85,36 +85,36 @@ abstract class Piwik_Log extends Zend_Log { return count($this->_writers); } - - /** - * Log an event - * Overload Zend_log::log cos its too weak for our requirements - */ - public function log($event) - { - // sanity checks - if (empty($this->_writers)) { - throw new Zend_Log_Exception('No writers were added'); - } - + + /** + * Log an event + * Overload Zend_log::log cos its too weak for our requirements + */ + public function log($event) + { + // sanity checks + if (empty($this->_writers)) { + throw new Zend_Log_Exception('No writers were added'); + } + $event['timestamp'] = date('c'); - - // pack into event required by filters and writers - $event = array_merge( $event, $this->_extras); - // abort if rejected by the global filters - foreach ($this->_filters as $filter) { - if (! $filter->accept($event)) { - return; - } - } + // pack into event required by filters and writers + $event = array_merge( $event, $this->_extras); + + // abort if rejected by the global filters + foreach ($this->_filters as $filter) { + if (! $filter->accept($event)) { + return; + } + } + + // send to each writer + foreach ($this->_writers as $writer) { + $writer->write($event); + } + } - // send to each writer - foreach ($this->_writers as $writer) { - $writer->write($event); - } - } - } /**
@@ -125,24 +125,21 @@ abstract class Piwik_Log extends Zend_Log class Piwik_Log_Formatter_FileFormatter implements Zend_Log_Formatter_Interface { /** - * Formats data into a single line to be written by the writer. - * - * @param array $event event data - * @return string formatted line to write to the log - */ - public function format($event) - { - foreach($event as &$value) - { - $value = str_replace("\n", '\n', $value); - $value = '"'.$value.'"'; - } - $str = implode(" ", $event) . "\n"; - return $str; - } + * Formats data into a single line to be written by the writer. + * + * @param array $event event data + * @return string formatted line to write to the log + */ + public function format($event) + { + foreach($event as &$value) + { + $value = str_replace("\n", '\n', $value); + $value = '"'.$value.'"'; + } + $str = implode(" ", $event) . "\n"; + return $str; + } } - - - diff --git a/modules/LogStats/Action.php b/modules/LogStats/Action.php index 431b149d26..9f72043c30 100644 --- a/modules/LogStats/Action.php +++ b/modules/LogStats/Action.php @@ -1,14 +1,14 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_LogStats
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_LogStats + */ + /** * Handles an action by the visitor. @@ -114,7 +114,8 @@ class Piwik_LogStats_Action { $this->actionType = self::TYPE_DOWNLOAD; $url = $this->downloadUrl; - $actionName = $this->nameDownloadOutlink; + //$actionName = $this->nameDownloadOutlink; + $actionName = $url; } elseif(!empty($this->outlinkUrl)) { @@ -256,4 +257,3 @@ class Piwik_LogStats_Action } } - diff --git a/modules/LogStats/Db.php b/modules/LogStats/Db.php index 2604fc1923..76959055a3 100644 --- a/modules/LogStats/Db.php +++ b/modules/LogStats/Db.php @@ -1,13 +1,13 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_LogStats
- */
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_LogStats + */ /** * Simple database PDO wrapper. @@ -22,7 +22,7 @@ class Piwik_LogStats_Db private $username; private $password; - static private $profiling = false;
+ static private $profiling = false; protected $queriesProfiling; @@ -35,18 +35,18 @@ class Piwik_LogStats_Db $this->username = $username; $this->password = $password; } -
-
- /**
- * Returns true if the profiler is enabled
- * Only used by the unit test that tests that the profiler is off on a production server
- *
- * @return bool
- */
- static public function isProfilingEnabled()
- {
- return self::$profiling;
- }
+ + + /** + * Returns true if the profiler is enabled + * Only used by the unit test that tests that the profiler is off on a production server + * + * @return bool + */ + static public function isProfilingEnabled() + { + return self::$profiling; + } /** * Enables the profiling. @@ -174,10 +174,10 @@ class Piwik_LogStats_Db public function __destruct() { if(self::$profiling) - {
+ { // turn off the profiler so we don't profile the following queries self::$profiling = false; -
+ foreach($this->queriesProfiling as $query => $info) { $time = $info['sum_time_ms']; @@ -188,8 +188,8 @@ class Piwik_LogStats_Db ON DUPLICATE KEY UPDATE count=count+$count,sum_time_ms=sum_time_ms+$time"; $this->query($queryProfiling,array($query)); - }
-
+ } + // turn back on profiling self::$profiling = true; } diff --git a/modules/SmartyPlugins/modifier.urlRewriteAdminView.php b/modules/SmartyPlugins/modifier.urlRewriteAdminView.php new file mode 100644 index 0000000000..a8b7d460f7 --- /dev/null +++ b/modules/SmartyPlugins/modifier.urlRewriteAdminView.php @@ -0,0 +1,42 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id: modifier.sumtime.php 168 2008-01-14 05:26:43Z matt $ + * + * @package Piwik_Visualization + */ + +/** + */ +function smarty_modifier_urlRewriteAdminView($parameters) +{ + // replace module=X by moduleToLoad=X + // replace action=Y by actionToLoad=Y + + if( !is_array($parameters) ) { + // if parameters is not an array, parse URL parameteres + $parameters = Piwik_Common::getArrayFromQueryString(htmlspecialchars($parameters)); + } + + $parameters['moduleToLoad'] = $parameters['module']; + unset($parameters['module']); + + if(isset( $parameters['action'])) + { + $parameters['actionToLoad'] = $parameters['action']; + unset($parameters['action']); + } + else + { + $parameters['actionToLoad'] = null; + } + $url = Piwik_Url::getCurrentQueryStringWithParametersModified($parameters); + + // add module=Home&action=showInContext + $url = $url . '&module=AdminHome&action=showInContext'; + return $url; +} + diff --git a/modules/TablePartitioning.php b/modules/TablePartitioning.php index a7a15bd805..3c715518d7 100644 --- a/modules/TablePartitioning.php +++ b/modules/TablePartitioning.php @@ -1,18 +1,18 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik
- */
-
+<?php /** - *
- * NB: When a new table is partitionned using this class, we have to update the method
- * Piwik::getTablesInstalled() to add the new table to the list of tablename_* to fetch
+ * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik + */ + +/** + * + * NB: When a new table is partitionned using this class, we have to update the method + * Piwik::getTablesInstalled() to add the new table to the list of tablename_* to fetch * * @package Piwik */ @@ -86,10 +86,10 @@ abstract class Piwik_TablePartitioning return $this->getTableName(); } } -
-/**
- *
- * @package Piwik
+ +/** + * + * @package Piwik */ class Piwik_TablePartitioning_Monthly extends Piwik_TablePartitioning { @@ -107,10 +107,10 @@ class Piwik_TablePartitioning_Monthly extends Piwik_TablePartitioning return $prefixTables . $this->tableName . "_" . $date; } -}
-/**
- *
- * @package Piwik
+} +/** + * + * @package Piwik */ class Piwik_TablePartitioning_Daily extends Piwik_TablePartitioning { diff --git a/modules/Timer.php b/modules/Timer.php index 03339b3acd..fa0ad4d044 100644 --- a/modules/Timer.php +++ b/modules/Timer.php @@ -15,36 +15,36 @@ */ class Piwik_Timer { - private $m_Start; + private $m_Start; - public function __construct() - { - $this->m_Start = 0.0; - $this->init(); - } + public function __construct() + { + $this->m_Start = 0.0; + $this->init(); + } - private function getMicrotime() - { - list($micro_seconds, $seconds) = explode(" ", microtime()); - return ((float)$micro_seconds + (float)$seconds); - } + private function getMicrotime() + { + list($micro_seconds, $seconds) = explode(" ", microtime()); + return ((float)$micro_seconds + (float)$seconds); + } - public function init() - { - $this->m_Start = $this->getMicrotime(); - } + public function init() + { + $this->m_Start = $this->getMicrotime(); + } - public function getTime($decimals = 2) - { - return number_format($this->getMicrotime() - $this->m_Start, $decimals, '.', ''); - } - public function getTimeMs($decimals = 2) - { - return number_format(1000*($this->getMicrotime() - $this->m_Start), $decimals, '.', ''); - } - - public function __toString() - { - return "Time elapsed: ". $this->getTime() ."s"; - } + public function getTime($decimals = 2) + { + return number_format($this->getMicrotime() - $this->m_Start, $decimals, '.', ''); + } + public function getTimeMs($decimals = 2) + { + return number_format(1000*($this->getMicrotime() - $this->m_Start), $decimals, '.', ''); + } + + public function __toString() + { + return "Time elapsed: ". $this->getTime() ."s"; + } } diff --git a/modules/Url.php b/modules/Url.php index dceacff2fd..0fe28761ac 100644 --- a/modules/Url.php +++ b/modules/Url.php @@ -61,7 +61,7 @@ class Piwik_Url static public function getCurrentUrl() { - return self::getCurrentHost() + return self::getCurrentHost() . self::getCurrentScriptName() . self::getCurrentQueryString(); } @@ -69,7 +69,7 @@ class Piwik_Url static public function getCurrentUrlWithoutQueryString() { - return self::getCurrentHost() + return self::getCurrentHost() . self::getCurrentScriptName() ; } diff --git a/modules/ViewDataTable.php b/modules/ViewDataTable.php index 2a24c76f60..83cb5e91fc 100644 --- a/modules/ViewDataTable.php +++ b/modules/ViewDataTable.php @@ -1,56 +1,56 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_ViewDataTable
- */
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_ViewDataTable + */ -require_once "API/Request.php";
-/**
- *
- * @package Piwik_Visualization
- *
+require_once "API/Request.php"; +/** + * + * @package Piwik_Visualization + * */ -
+ abstract class Piwik_ViewDataTable { protected $dataTableTemplate = null; - protected $mainAlreadyExecuted = false;
-
- protected $JSsearchBox = true;
- protected $JSoffsetInformation = true;
- protected $JSexcludeLowPopulation = true;
- protected $JSsortEnabled = true;
+ protected $mainAlreadyExecuted = false; + + protected $JSsearchBox = true; + protected $JSoffsetInformation = true; + protected $JSexcludeLowPopulation = true; + protected $JSsortEnabled = true; protected $showFooter = true; -
+ protected $currentControllerAction; - protected $currentControllerName;
-
- protected $actionToLoadTheSubTable = null;
+ protected $currentControllerName; + + protected $actionToLoadTheSubTable = null; /** * @var Piwik_DataTable - */
- public $dataTable; // data table
-
- protected $moduleNameAndMethod;
-
- // do we need all the children of the datatables?
- protected $recursiveDataTableLoad = false;
- - protected $variablesDefault = array();
- - protected $idSubtable = false;
-
- /**
- *
- * @return Piwik_ViewDataTable Data table
+ */ + public $dataTable; // data table + + protected $moduleNameAndMethod; + + // do we need all the children of the datatables? + protected $recursiveDataTableLoad = false; + + protected $variablesDefault = array(); + + protected $idSubtable = false; + + /** + * + * @return Piwik_ViewDataTable Data table */ static public function factory( $type = null, $defaultType = null) { @@ -88,31 +88,31 @@ abstract class Piwik_ViewDataTable case 'sparkline': require_once "ViewDataTable/Sparkline.php"; return new Piwik_ViewDataTable_Sparkline(); - break;
+ break; case 'generateDataChartVerticalBar': require_once "ViewDataTable/GenerateGraphData.php"; return new Piwik_ViewDataTable_GenerateGraphData_ChartVerticalBar(); break; -
- case 'generateDataChartPie':
- require_once "ViewDataTable/GenerateGraphData.php";
- return new Piwik_ViewDataTable_GenerateGraphData_ChartPie();
+ + case 'generateDataChartPie': + require_once "ViewDataTable/GenerateGraphData.php"; + return new Piwik_ViewDataTable_GenerateGraphData_ChartPie(); break; case 'generateDataChartEvolution': require_once "ViewDataTable/GenerateGraphData.php"; return new Piwik_ViewDataTable_GenerateGraphData_ChartEvolution(); - break;
+ break; case 'table': - default:
+ default: require_once "ViewDataTable/Html.php"; return new Piwik_ViewDataTable_Html(); break; } - }
+ } //TODO comment function init( $currentControllerName, @@ -127,7 +127,7 @@ abstract class Piwik_ViewDataTable $this->idSubtable = Piwik_Common::getRequestVar('idSubtable', false, 'int'); - $this->method = $moduleNameAndMethod;
+ $this->method = $moduleNameAndMethod; $this->JSsearchBox = Piwik_Common::getRequestVar('show_search', true); $this->showFooter = Piwik_Common::getRequestVar('showDataTableFooter', true); @@ -142,20 +142,20 @@ abstract class Piwik_ViewDataTable { return $this->getView()->render(); } -
- /**
- * For convenience, the client code can call methods that are defined in a specific children class
- * without testing the children class type, which would trigger an error with a different children class.
- * For example, ViewDataTable/Html.php defines a setColumnsToDisplay(). The client code calls this methods even if
- * the ViewDataTable object is a ViewDataTable_Cloud instance. But ViewDataTable_Cloud doesn't define the
- * setColumnsToDisplay() method. Because we don't want to force users to test for the object type we simply catch these
- * calls when they are not defined in the child and do nothing.
- *
- * @param string $function
- * @param array $args
- */
- public function __call($function, $args)
- {
+ + /** + * For convenience, the client code can call methods that are defined in a specific children class + * without testing the children class type, which would trigger an error with a different children class. + * For example, ViewDataTable/Html.php defines a setColumnsToDisplay(). The client code calls this methods even if + * the ViewDataTable object is a ViewDataTable_Cloud instance. But ViewDataTable_Cloud doesn't define the + * setColumnsToDisplay() method. Because we don't want to force users to test for the object type we simply catch these + * calls when they are not defined in the child and do nothing. + * + * @param string $function + * @param array $args + */ + public function __call($function, $args) + { } @@ -205,15 +205,15 @@ abstract class Piwik_ViewDataTable ); } return $data; - }
+ } public function getView() { return $this->view; } -
- protected function getUniqIdTable()
- {
+ + protected function getUniqIdTable() + { // if we request a subDataTable the $this->currentControllerAction DIV ID is already there in the page // we make the DIV ID really unique by appending the ID of the subtable requested if( $this->idSubtable != false) @@ -222,11 +222,11 @@ abstract class Piwik_ViewDataTable } else { - // the $uniqIdTable variable is used as the DIV ID in the rendered HTML
- // we use the current Controller action name as it is supposed to be unique in the rendered page
+ // the $uniqIdTable variable is used as the DIV ID in the rendered HTML + // we use the current Controller action name as it is supposed to be unique in the rendered page $uniqIdTable = $this->currentControllerName . $this->currentControllerAction; - }
- return $uniqIdTable;
+ } + return $uniqIdTable; } protected function getJavascriptVariablesToSet() @@ -356,7 +356,7 @@ abstract class Piwik_ViewDataTable { $requestString .= '&'.$varToSet.'='.$value; } - }
+ } // echo $requestString;exit; // We finally make the request to the API $request = new Piwik_API_Request($requestString); @@ -368,64 +368,64 @@ abstract class Piwik_ViewDataTable $this->dataTable = $dataTable; } -
- public function setTemplate( $tpl )
- {
- $this->dataTableTemplate = $tpl;
- }
-
- protected function getDefaultOrCurrent( $nameVar )
- {
- if(isset($_REQUEST[$nameVar]))
- {
- return $_REQUEST[$nameVar];
- }
- $default = $this->getDefault($nameVar);
- return $default;
- }
-
-
- protected function getDefault($nameVar)
- {
- if(!isset($this->variablesDefault[$nameVar]))
- {
- return false;
- }
- return $this->variablesDefault[$nameVar];
- }
-
- public function disableSort()
- {
- $this->JSsortEnabled = 'false';
- }
-
- public function getSort()
- {
- return $this->JSsortEnabled;
- }
+ + public function setTemplate( $tpl ) + { + $this->dataTableTemplate = $tpl; + } + + protected function getDefaultOrCurrent( $nameVar ) + { + if(isset($_REQUEST[$nameVar])) + { + return $_REQUEST[$nameVar]; + } + $default = $this->getDefault($nameVar); + return $default; + } + + + protected function getDefault($nameVar) + { + if(!isset($this->variablesDefault[$nameVar])) + { + return false; + } + return $this->variablesDefault[$nameVar]; + } + + public function disableSort() + { + $this->JSsortEnabled = 'false'; + } + + public function getSort() + { + return $this->JSsortEnabled; + } public function disableGenericFilters() { $this->variablesDefault['disable_generic_filters'] = true; - }
- public function disableOffsetInformation()
- {
- $this->JSoffsetInformation = 'false';
- }
- public function getOffsetInformation()
- {
- return $this->JSoffsetInformation;
- }
-
- public function disableSearchBox()
- {
- $this->JSsearchBox = 'false';
- }
-
- public function getSearchBox()
- {
- return $this->JSsearchBox;
- }
+ } + public function disableOffsetInformation() + { + $this->JSoffsetInformation = 'false'; + } + public function getOffsetInformation() + { + return $this->JSoffsetInformation; + } + + public function disableSearchBox() + { + $this->JSsearchBox = 'false'; + } + + public function getSearchBox() + { + return $this->JSsearchBox; + } /** * When this method is called, the output will not contain the template datatable_footer.tpl @@ -436,57 +436,57 @@ abstract class Piwik_ViewDataTable { $this->showFooter = false; } -
- public function disableExcludeLowPopulation()
- {
- $this->JSexcludeLowPopulation = 'false';
- }
-
- public function getExcludeLowPopulation()
- {
- return $this->JSexcludeLowPopulation;
- }
-
-
- public function setExcludeLowPopulation( $value = null, $columnId = null )
- {
- if( is_null( $value) )
- {
- throw new Exception("setExcludeLowPopulation() value shouldn't be null");
- }
+ + public function disableExcludeLowPopulation() + { + $this->JSexcludeLowPopulation = 'false'; + } + + public function getExcludeLowPopulation() + { + return $this->JSexcludeLowPopulation; + } + + + public function setExcludeLowPopulation( $value = null, $columnId = null ) + { + if( is_null( $value) ) + { + throw new Exception("setExcludeLowPopulation() value shouldn't be null"); + } if(is_null($columnId)) { $columnId = Piwik_Archive::INDEX_NB_VISITS; } -
- // column to use to enable low population exclusion if != false
- $this->variablesDefault['filter_excludelowpop_default']
- = $this->variablesDefault['filter_excludelowpop']
- = $columnId;
-
- // the minimum value a row must have to be returned
- $this->variablesDefault['filter_excludelowpop_value_default']
- = $this->variablesDefault['filter_excludelowpop_value']
- = $value;
+ + // column to use to enable low population exclusion if != false + $this->variablesDefault['filter_excludelowpop_default'] + = $this->variablesDefault['filter_excludelowpop'] + = $columnId; + + // the minimum value a row must have to be returned + $this->variablesDefault['filter_excludelowpop_value_default'] + = $this->variablesDefault['filter_excludelowpop_value'] + = $value; } public function setSearchPattern($pattern, $column) { $this->variablesDefault['filter_pattern'] = $pattern; $this->variablesDefault['filter_column'] = $column; - }
-
- public function setLimit( $limit )
- {
- if($limit != 0)
- {
- $this->variablesDefault['filter_limit'] = $limit;
- }
- }
- public function setSortedColumn( $columnId, $order = 'desc')
- {
- $this->variablesDefault['filter_sort_column']= $columnId;
- $this->variablesDefault['filter_sort_order']= $order;
- }
+ } + + public function setLimit( $limit ) + { + if($limit != 0) + { + $this->variablesDefault['filter_limit'] = $limit; + } + } + public function setSortedColumn( $columnId, $order = 'desc') + { + $this->variablesDefault['filter_sort_column']= $columnId; + $this->variablesDefault['filter_sort_order']= $order; + } }
\ No newline at end of file diff --git a/modules/ViewDataTable/Html.php b/modules/ViewDataTable/Html.php index 4d933a5c0f..6f75361d5c 100644 --- a/modules/ViewDataTable/Html.php +++ b/modules/ViewDataTable/Html.php @@ -1,160 +1,160 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_ViewDataTable
- */
-
-/**
- *
- * @package Piwik_ViewDataTable
- *
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_ViewDataTable */ -class Piwik_ViewDataTable_Html extends Piwik_ViewDataTable
-{
- protected $columnsToDisplay = array();
-
- public $arrayDataTable; // phpArray
-
+ +/** + * + * @package Piwik_ViewDataTable + * + */ +class Piwik_ViewDataTable_Html extends Piwik_ViewDataTable +{ + protected $columnsToDisplay = array(); + + public $arrayDataTable; // phpArray + function init($currentControllerName, - $currentControllerAction,
- $moduleNameAndMethod,
- $actionToLoadTheSubTable = null )
- {
+ $currentControllerAction, + $moduleNameAndMethod, + $actionToLoadTheSubTable = null ) + { parent::init($currentControllerName, - $currentControllerAction,
- $moduleNameAndMethod,
- $actionToLoadTheSubTable);
- $this->dataTableTemplate = 'Home/templates/datatable.tpl';
- }
-
- public function main()
- {
- if($this->mainAlreadyExecuted)
- {
- return;
- }
- $this->mainAlreadyExecuted = true;
-
-// $i=0;while($i<1500000){ $j=$i*$i;$i++;}
-
- $this->loadDataTableFromAPI();
-
- // We apply a filter to the DataTable, decoding the label column (useful for keywords for example)
- $filter = new Piwik_DataTable_Filter_ColumnCallbackReplace(
- $this->dataTable,
- 'label',
- 'urldecode'
- );
-
-
- $view = new Piwik_View($this->dataTableTemplate);
-
- $view->id = $this->getUniqIdTable();
-
- // We get the PHP array converted from the DataTable
- $phpArray = $this->getPHPArrayFromDataTable();
-
- $view->arrayDataTable = $phpArray;
- $view->method = $this->method;
-
- $columns = $this->getColumnsToDisplay($phpArray);
- $view->dataTableColumns = $columns;
-
- $nbColumns = count($columns);
- // case no data in the array we use the number of columns set to be displayed
- if($nbColumns == 0)
- {
- $nbColumns = count($this->columnsToDisplay);
- }
-
- $view->nbColumns = $nbColumns;
-
- $view->javascriptVariablesToSet = $this->getJavascriptVariablesToSet();
+ $currentControllerAction, + $moduleNameAndMethod, + $actionToLoadTheSubTable); + $this->dataTableTemplate = 'Home/templates/datatable.tpl'; + } + + public function main() + { + if($this->mainAlreadyExecuted) + { + return; + } + $this->mainAlreadyExecuted = true; + +// $i=0;while($i<1500000){ $j=$i*$i;$i++;} + + $this->loadDataTableFromAPI(); + + // We apply a filter to the DataTable, decoding the label column (useful for keywords for example) + $filter = new Piwik_DataTable_Filter_ColumnCallbackReplace( + $this->dataTable, + 'label', + 'urldecode' + ); + + + $view = new Piwik_View($this->dataTableTemplate); + + $view->id = $this->getUniqIdTable(); + + // We get the PHP array converted from the DataTable + $phpArray = $this->getPHPArrayFromDataTable(); + + $view->arrayDataTable = $phpArray; + $view->method = $this->method; + + $columns = $this->getColumnsToDisplay($phpArray); + $view->dataTableColumns = $columns; - $view->showFooter = $this->showFooter;
+ $nbColumns = count($columns); + // case no data in the array we use the number of columns set to be displayed + if($nbColumns == 0) + { + $nbColumns = count($this->columnsToDisplay); + } - $this->view = $view;
- }
-
- protected function getPHPArrayFromDataTable( )
+ $view->nbColumns = $nbColumns; + + $view->javascriptVariablesToSet = $this->getJavascriptVariablesToSet(); + + $view->showFooter = $this->showFooter; + + $this->view = $view; + } + + protected function getPHPArrayFromDataTable( ) + { + + $renderer = Piwik_DataTable_Renderer::factory('php'); + $renderer->setTable($this->dataTable); + $renderer->setSerialize( false ); + // we get the php array from the datatable + // but conserving the original datatable format, which means rows 'columns', 'details' and 'idsubdatatable' + $phpArray = $renderer->originalRender(); + return $phpArray; + } + + + + public function setColumnsToDisplay( $arrayIds) + { + $this->columnsToDisplay = $arrayIds; + } + + protected function getColumnsToDisplay($phpArray) + { + + $dataTableColumns = array(); + if(count($phpArray) > 0) + { + // build column information + $id = 0; + foreach($phpArray[0]['columns'] as $columnName => $row) + { + if( $this->isColumnToDisplay( $id, $columnName) ) + { + $dataTableColumns[] = array('id' => $id, 'name' => $columnName); + } + $id++; + } + } + return $dataTableColumns; + } + + protected function isColumnToDisplay( $idColumn ) + { + // we return true + // - we didn't set any column to display (means we display all the columns) + // - the column has been set as to display + if( count($this->columnsToDisplay) == 0 + || in_array($idColumn, $this->columnsToDisplay)) + { + return true; + } + return false; + } + + + + public function setSearchRecursive() + { + $this->variablesDefault['search_recursive'] = true; + } + + + public function setRecursiveLoadDataTableIfSearchingForPattern() { -
- $renderer = Piwik_DataTable_Renderer::factory('php');
- $renderer->setTable($this->dataTable);
- $renderer->setSerialize( false );
- // we get the php array from the datatable
- // but conserving the original datatable format, which means rows 'columns', 'details' and 'idsubdatatable'
- $phpArray = $renderer->originalRender();
- return $phpArray;
- }
-
-
-
- public function setColumnsToDisplay( $arrayIds)
- {
- $this->columnsToDisplay = $arrayIds;
- }
-
- protected function getColumnsToDisplay($phpArray)
- {
-
- $dataTableColumns = array();
- if(count($phpArray) > 0)
- {
- // build column information
- $id = 0;
- foreach($phpArray[0]['columns'] as $columnName => $row)
- {
- if( $this->isColumnToDisplay( $id, $columnName) )
- {
- $dataTableColumns[] = array('id' => $id, 'name' => $columnName);
- }
- $id++;
- }
- }
- return $dataTableColumns;
- }
-
- protected function isColumnToDisplay( $idColumn )
- {
- // we return true
- // - we didn't set any column to display (means we display all the columns)
- // - the column has been set as to display
- if( count($this->columnsToDisplay) == 0
- || in_array($idColumn, $this->columnsToDisplay))
- {
- return true;
- }
- return false;
- }
-
-
-
- public function setSearchRecursive()
- {
- $this->variablesDefault['search_recursive'] = true;
- }
-
-
- public function setRecursiveLoadDataTableIfSearchingForPattern()
- {
- try{
- $requestValue = Piwik_Common::getRequestVar('filter_column_recursive');
- $requestValue = Piwik_Common::getRequestVar('filter_pattern_recursive');
- // if the 2 variables are set we are searching for something.
- // we have to load all the children subtables in this case
-
- $this->recursiveDataTableLoad = true;
- return true;
- }
- catch(Exception $e) {
- $this->recursiveDataTableLoad = false;
- return false;
- }
- }
+ try{ + $requestValue = Piwik_Common::getRequestVar('filter_column_recursive'); + $requestValue = Piwik_Common::getRequestVar('filter_pattern_recursive'); + // if the 2 variables are set we are searching for something. + // we have to load all the children subtables in this case + + $this->recursiveDataTableLoad = true; + return true; + } + catch(Exception $e) { + $this->recursiveDataTableLoad = false; + return false; + } + } }
\ No newline at end of file diff --git a/modules/Visualization/ChartPie.php b/modules/Visualization/ChartPie.php index df748b0d61..8d5edc7700 100644 --- a/modules/Visualization/ChartPie.php +++ b/modules/Visualization/ChartPie.php @@ -1,18 +1,18 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Visualization
- */
-require_once "Visualization/Chart.php";
-
-/**
- *
- * @package Piwik_Visualization
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Visualization + */ +require_once "Visualization/Chart.php"; + +/** + * + * @package Piwik_Visualization */ class Piwik_Visualization_ChartPie extends Piwik_Visualization_Chart { diff --git a/modules/Visualization/ChartVerticalBar.php b/modules/Visualization/ChartVerticalBar.php index e4e8b1bf86..6007054fa1 100644 --- a/modules/Visualization/ChartVerticalBar.php +++ b/modules/Visualization/ChartVerticalBar.php @@ -1,24 +1,24 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Visualization
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Visualization + */ + require_once "Visualization/Chart.php"; -
-/**
- *
- * @package Piwik_Visualization
- *
- */
+ +/** + * + * @package Piwik_Visualization + * + */ class Piwik_Visualization_ChartVerticalBar extends Piwik_Visualization_Chart -{
- protected $limit = 10;
+{ + protected $limit = 10; function customizeGraph() { diff --git a/modules/Visualization/Cloud.php b/modules/Visualization/Cloud.php index dff6719c74..117f27394d 100644 --- a/modules/Visualization/Cloud.php +++ b/modules/Visualization/Cloud.php @@ -1,165 +1,165 @@ <?php
/**
* Piwik - Open source web analytics
- *
+ *
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
* @version $Id$
- *
+ *
* @package Piwik_Visualization
*/
// inspired from Derek Harvey (www.derekharvey.co.uk)
/**
- *
+ *
* @package Piwik_Visualization
*/ -class Piwik_Visualization_Cloud +class Piwik_Visualization_Cloud { protected $wordsArray = array(); - public $truncatingLimit = 30; - /** - * @param array array( word => 10, word2 => 50, word3 => 1) - */ - function __construct($words = false) - { - if ($words !== false && is_array($words)) - { - foreach ($words as $word => $value) - { - $this->addWord($word, $value); - } - } - } - - /* - * Assign word to array - * - * @param string $word - * @return string - */ - function addWord($word, $value = 1) - { -// $word = strtolower($word); - if (isset($this->wordsArray[$word])) - { - $this->wordsArray[$word] += $value; - } - else - { - $this->wordsArray[$word] = $value; - } - } - - /* - * Shuffle associated names in array - */ - function shuffleCloud() - { - $keys = array_keys($this->wordsArray); - - shuffle($keys); - - if (count($keys) && is_array($keys)) - { - $tmpArray = $this->wordsArray; - $this->wordsArray = array(); - foreach ($keys as $key => $value) - $this->wordsArray[$value] = $tmpArray[$value]; - } - } - - /* - * Calculate size of words array - */ - - function getCloudSize() - { - return array_sum($this->wordsArray); - } - - /* - * Get the class range using a percentage - * - * @returns int $class - */ - - function getClassFromPercent($percent) - { - $mapping = array( - 95, - 70, - 50, - 30, - 15, - 5, - 0 - ); - foreach($mapping as $key => $value) - { - if($percent >= $value) - { - return $key; - } - } - } - - /* - * Create the HTML code for each word and apply font size. - * - * @returns string $spans - */ - - function render($returnType = "html") - { - $this->shuffleCloud(); - - if($returnType == "html") - { - $return = ''; - } - else - { - $return = array(); - } - - if (count($this->wordsArray) > 0) - { - $this->max = max($this->wordsArray); - - $return = ($returnType == "html" ? "" : ($returnType == "array" ? array() : "")); - foreach ($this->wordsArray as $word => $popularity) - { - - // truncating the word - $wordTruncated = $word; - if(strlen($word) > $this->truncatingLimit) - { - $wordTruncated = substr($word, 0, $this->truncatingLimit - 3).'...'; - } - - // computing the percentage - $percent = ($popularity / $this->max) * 100; - - // and the CSS style value - $sizeRange = $this->getClassFromPercent($percent); - - if ($returnType == "array") - { - $return[$word]['word'] = $word; - $return[$word]['wordTruncated'] = $wordTruncated; - $return[$word]['size'] = $sizeRange; - $return[$word]['percent'] = $percent; - } - else if ($returnType == "html") - { - $return .= "\n<span title='".$word."' class='word size{$sizeRange}'> {$wordTruncated} </span>"; - } -// print( $word ."=".$percent."<br>"); - } - } - return $return; - } + public $truncatingLimit = 30; + /** + * @param array array( word => 10, word2 => 50, word3 => 1) + */ + function __construct($words = false) + { + if ($words !== false && is_array($words)) + { + foreach ($words as $word => $value) + { + $this->addWord($word, $value); + } + } + } + + /* + * Assign word to array + * + * @param string $word + * @return string + */ + function addWord($word, $value = 1) + { + // $word = strtolower($word); + if (isset($this->wordsArray[$word])) + { + $this->wordsArray[$word] += $value; + } + else + { + $this->wordsArray[$word] = $value; + } + } + + /* + * Shuffle associated names in array + */ + function shuffleCloud() + { + $keys = array_keys($this->wordsArray); + + shuffle($keys); + + if (count($keys) && is_array($keys)) + { + $tmpArray = $this->wordsArray; + $this->wordsArray = array(); + foreach ($keys as $key => $value) + $this->wordsArray[$value] = $tmpArray[$value]; + } + } + + /* + * Calculate size of words array + */ + + function getCloudSize() + { + return array_sum($this->wordsArray); + } + + /* + * Get the class range using a percentage + * + * @returns int $class + */ + + function getClassFromPercent($percent) + { + $mapping = array( + 95, + 70, + 50, + 30, + 15, + 5, + 0 + ); + foreach($mapping as $key => $value) + { + if($percent >= $value) + { + return $key; + } + } + } + + /* + * Create the HTML code for each word and apply font size. + * + * @returns string $spans + */ + + function render($returnType = "html") + { + $this->shuffleCloud(); + + if($returnType == "html") + { + $return = ''; + } + else + { + $return = array(); + } + + if (count($this->wordsArray) > 0) + { + $this->max = max($this->wordsArray); + + $return = ($returnType == "html" ? "" : ($returnType == "array" ? array() : "")); + foreach ($this->wordsArray as $word => $popularity) + { + + // truncating the word + $wordTruncated = $word; + if(strlen($word) > $this->truncatingLimit) + { + $wordTruncated = substr($word, 0, $this->truncatingLimit - 3).'...'; + } + + // computing the percentage + $percent = ($popularity / $this->max) * 100; + + // and the CSS style value + $sizeRange = $this->getClassFromPercent($percent); + + if ($returnType == "array") + { + $return[$word]['word'] = $word; + $return[$word]['wordTruncated'] = $wordTruncated; + $return[$word]['size'] = $sizeRange; + $return[$word]['percent'] = $percent; + } + else if ($returnType == "html") + { + $return .= "\n<span title='".$word."' class='word size{$sizeRange}'> {$wordTruncated} </span>"; + } + // print( $word ."=".$percent."<br>"); + } + } + return $return; + } } diff --git a/modules/Visualization/OpenFlashChart.php b/modules/Visualization/OpenFlashChart.php index cd044c5ff8..bda63f9471 100644 --- a/modules/Visualization/OpenFlashChart.php +++ b/modules/Visualization/OpenFlashChart.php @@ -1,11 +1,11 @@ <?php
/**
* Piwik - Open source web analytics
- *
+ *
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
* @version $Id$
- *
+ *
* @package Piwik_Visualization
*/
@@ -13,17 +13,17 @@ require_once "iView.php"; /**
* Original class provided by Open Flash Chart
- *
+ *
* @package Piwik_Visualization
*/
abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView
-{
- function __construct()
- {
+{
+ function __construct()
+ {
$this->data_sets = array(); - - + + $this->data = array(); $this->links = array(); $this->width = 250; @@ -38,7 +38,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $this->title = ''; $this->title_style = ''; $this->occurence = 0; - + $this->x_offset = ''; $this->x_tick_size = -1; @@ -54,54 +54,54 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $this->y_axis_colour = ''; $this->y_grid_colour = ''; $this->y2_axis_colour = ''; - - // AXIS LABEL styles: + + // AXIS LABEL styles: $this->x_label_style = ''; $this->y_label_style = ''; $this->y_label_style_right = ''; - - + + // AXIS LEGEND styles: $this->x_legend = ''; $this->x_legend_size = 20; $this->x_legend_colour = '#000000'; - + $this->y_legend = ''; $this->y_legend_right = ''; //$this->y_legend_size = 20; //$this->y_legend_colour = '#000000'; - + $this->lines = array(); $this->line_default['type'] = 'line'; $this->line_default['values'] = '3,#87421F'; $this->js_line_default = 'so.addVariable("line","3,#87421F");'; - + $this->bg_colour = ''; $this->bg_image = ''; - + $this->inner_bg_colour = ''; $this->inner_bg_colour_2 = ''; $this->inner_bg_angle = ''; - + // PIE chart ------------ $this->pie = ''; $this->pie_values = ''; $this->pie_colours = ''; $this->pie_labels = ''; - + $this->tool_tip = ''; - + // which data lines are attached to the // right Y axis? $this->y2_lines = array(); - + // Number formatting: $this->y_format=''; $this->num_decimals=''; $this->is_fixed_num_decimals_forced=''; $this->is_decimal_separator_comma=''; $this->is_thousand_separator_disabled=''; - + // // set some default value incase the user forgets // to set them, so at least they see *something* @@ -114,54 +114,54 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } /** - * Set the unique_id to use for the flash object id. - */ + * Set the unique_id to use for the flash object id. + */ function set_unique_id() { $this->unique_id = uniqid(); } - + /** - * Get the flash object ID for the last rendered object. - */ + * Get the flash object ID for the last rendered object. + */ function get_unique_id() { return ($this->unique_id); } - + /** - * Set the base path for the swfobject.js - * - * @param base_path a string argument. - * The path to the swfobject.js file - */ + * Set the base path for the swfobject.js + * + * @param base_path a string argument. + * The path to the swfobject.js file + */ function set_js_path($path) { $this->js_path = $path; } - + /** - * Set the base path for the open-flash-chart.swf - * - * @param path a string argument. - * The path to the open-flash-chart.swf file - */ + * Set the base path for the open-flash-chart.swf + * + * @param path a string argument. + * The path to the open-flash-chart.swf file + */ function set_swf_path($path) { $this->swf_path = $path; } /** - * Set the type of output data. - * - * @param type a string argument. - * The type of data. Currently only type is js, or nothing. - */ + * Set the type of output data. + * + * @param type a string argument. + * The type of data. Currently only type is js, or nothing. + */ function set_output_type($type) { $this->output_type = $type; } - + // is this needed now? function increment_occurence() { @@ -169,17 +169,17 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } /** - * returns the next line label for multiple lines. - */ + * returns the next line label for multiple lines. + */ function next_line() { $line_num = ''; if( count( $this->lines ) > 0 ) - $line_num = '_'. (count( $this->lines )+1); + $line_num = '_'. (count( $this->lines )+1); return $line_num; } - + // escape commas (,) function esc( $text ) { @@ -193,8 +193,8 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } /** - * Format the text to the type of output. - */ + * Format the text to the type of output. + */ function format_output($output_type,$function,$values) { if($output_type == 'js') @@ -210,18 +210,18 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } /** - * Set the text and style of the title. - * - * @param title a string argument. - * The text of the title. - * @param style a string. - * CSS styling of the title. - */ + * Set the text and style of the title. + * + * @param title a string argument. + * The text of the title. + * @param style a string. + * CSS styling of the title. + */ function set_title( $title, $style='' ) { $this->title = $title; if( strlen( $style ) > 0 ) - $this->title_style = $style; + $this->title_style = $style; } /** @@ -234,7 +234,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView { $this->width = $width; } - + /** * Set the height of the chart. * @@ -256,28 +256,28 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView { $this->base = $base; } - + // Number formatting: function set_y_format( $val ) { - $this->y_format = $val; + $this->y_format = $val; } - + function set_num_decimals( $val ) { $this->num_decimals = $val; } - + function set_is_fixed_num_decimals_forced( $val ) { $this->is_fixed_num_decimals_forced = $val?'true':'false'; } - + function set_is_decimal_separator_comma( $val ) { $this->is_decimal_separator_comma = $val?'true':'false'; } - + function set_is_thousand_separator_disabled( $val ) { $this->is_thousand_separator_disabled = $val?'true':'false'; @@ -292,13 +292,13 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView { $this->data[] = implode(',',$a); } - + // UGH, these evil functions are making me fell ill function set_links( $a ) { $this->links[] = implode(',',$a); } - + // $val is a boolean function set_x_offset( $val ) { @@ -315,7 +315,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView * #x_label# - The X label string. \n * #x_legend# - The X axis legend text. \n * Default string is: "#x_label#<br>#val#" \n - * + * * @param tip a string argument. * A formatted string to show as the tooltip. */ @@ -354,18 +354,18 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView function set_x_label_style( $size, $colour='', $orientation=0, $step=-1, $grid_colour='' ) { $this->x_label_style = $size; - + if( strlen( $colour ) > 0 ) - $this->x_label_style .= ','. $colour; + $this->x_label_style .= ','. $colour; if( $orientation > -1 ) - $this->x_label_style .= ','. $orientation; + $this->x_label_style .= ','. $orientation; if( $step > 0 ) - $this->x_label_style .= ','. $step; + $this->x_label_style .= ','. $step; if( strlen( $grid_colour ) > 0 ) - $this->x_label_style .= ','. $grid_colour; + $this->x_label_style .= ','. $grid_colour; } /** @@ -405,7 +405,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } /** - * Set the background colour of the grid portion of the chart. + * Set the background colour of the grid portion of the chart. * @param col a string argument. * The hex colour value of the background. * @param col2 a string argument. @@ -416,12 +416,12 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView function set_inner_background( $col, $col2='', $angle=-1 ) { $this->inner_bg_colour = $col; - + if( strlen($col2) > 0 ) - $this->inner_bg_colour_2 = $col2; - + $this->inner_bg_colour_2 = $col2; + if( $angle != -1 ) - $this->inner_bg_angle = $angle; + $this->inner_bg_angle = $angle; } /** @@ -430,9 +430,9 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView function _set_y_label_style( $size, $colour ) { $tmp = $size; - + if( strlen( $colour ) > 0 ) - $tmp .= ','. $colour; + $tmp .= ','. $colour; return $tmp; } @@ -499,7 +499,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView * * @param max an int argument. * The maximum value. - */ + */ function set_y_right_max( $max ) { $this->y2_max = intval($max); @@ -524,14 +524,14 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView */ function y_label_steps( $val ) { - $this->y_steps = intval( $val ); + $this->y_steps = intval( $val ); } - + function title( $title, $style='' ) { - $this->title = $this->esc( $title ); - if( strlen( $style ) > 0 ) - $this->title_style = $style; + $this->title = $this->esc( $title ); + if( strlen( $style ) > 0 ) + $this->title_style = $style; } /** @@ -542,16 +542,16 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView * @param font_size an int argument. * The font size of the x legend text. * @param colour a string argument - * The hex value of the font colour. + * The hex value of the font colour. */ function set_x_legend( $text, $size=-1, $colour='' ) { $this->x_legend = $this->esc( $text ); if( $size > -1 ) - $this->x_legend_size = $size; - + $this->x_legend_size = $size; + if( strlen( $colour )>0 ) - $this->x_legend_colour = $colour; + $this->x_legend_colour = $colour; } /** @@ -563,7 +563,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView function set_x_tick_size( $size ) { if( $size > 0 ) - $this->x_tick_size = $size; + $this->x_tick_size = $size; } /** @@ -575,7 +575,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView function set_x_axis_steps( $steps ) { if ( $steps > 0 ) - $this->x_axis_steps = $steps; + $this->x_axis_steps = $steps; } /** @@ -587,24 +587,24 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView function set_x_axis_3d( $size ) { if( $size > 0 ) - $this->x_axis_3d = intval($size); + $this->x_axis_3d = intval($size); } - + /** * The private method of building the y legend output. */ function _set_y_legend( $text, $size, $colour ) { $tmp = $text; - + if( $size > -1 ) - $tmp .= ','. $size; + $tmp .= ','. $size; if( strlen( $colour )>0 ) - $tmp .= ','. $colour; + $tmp .= ','. $colour; return $tmp; - } + } /** * Set the parameters of the y legend. @@ -614,7 +614,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView * @param font_size an int argument. * The font size of the y legend text. * @param colour a string argument - * The hex colour value of the font colour. + * The hex colour value of the font colour. */ function set_y_legend( $text, $size=-1, $colour='' ) { @@ -629,20 +629,20 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView * @param font_size an int argument. * The font size of the right y legend text. * @param colour a string argument - * The hex value of the font colour. + * The hex value of the font colour. */ function set_y_right_legend( $text, $size=-1, $colour='' ) { $this->y_legend_right = $this->_set_y_legend( $text, $size, $colour ); } - + /** * Set the colour of the x axis line and grid. * * @param axis a string argument. * The hex colour value of the x axis line. * @param grid a string argument. - * The hex colour value of the x axis grid. + * The hex colour value of the x axis grid. */ function x_axis_colour( $axis, $grid='' ) { @@ -656,14 +656,14 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView * @param axis a string argument. * The hex colour value of the y axis line. * @param grid a string argument. - * The hex colour value of the y axis grid. + * The hex colour value of the y axis grid. */ function y_axis_colour( $axis, $grid='' ) { $this->y_axis_colour = $axis; if( strlen( $grid ) > 0 ) - $this->y_grid_colour = $grid; + $this->y_grid_colour = $grid; } /** @@ -674,7 +674,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView */ function y_right_axis_colour( $colour ) { - $this->y2_axis_colour = $colour; + $this->y2_axis_colour = $colour; } /** @@ -708,8 +708,8 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $description .= ','. $size; } - if( $circles > 0 ) - $description .= ','. $circles; + if( $circles > 0 ) + $description .= ','. $circles; $this->lines[$type] = $description; } @@ -735,7 +735,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $description = "$width,$colour,$text"; if( strlen( $font_size ) > 0 ) - $description .= ",$font_size,$dot_size"; + $description .= ",$font_size,$dot_size"; $this->lines[$type] = $description; } @@ -761,7 +761,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $description = "$width,$colour,$text"; if( strlen( $font_size ) > 0 ) - $description .= ",$font_size,$dot_size"; + $description .= ",$font_size,$dot_size"; $this->lines[$type] = $description; } @@ -791,10 +791,10 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $description = "$width,$dot_size,$colour,$alpha"; if( strlen( $text ) > 0 ) - $description .= ",$text,$font_size"; - + $description .= ",$text,$font_size"; + if( strlen( $fill_colour ) > 0 ) - $description .= ','. $fill_colour; + $description .= ','. $fill_colour; $this->lines[$type] = $description; } @@ -916,7 +916,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $this->lines[$type] = $description; } - + function candle( $data, $alpha, $line_width, $colour, $text='', $size=-1 ) { $type = 'candle'. $this->next_line(); @@ -924,14 +924,14 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $description = $alpha .','. $line_width .','. $colour .','. $text .','. $size; $this->lines[$type] = $description; - + $a = array(); foreach( $data as $can ) - $a[] = $can->toString(); + $a[] = $can->toString(); $this->data[] = implode(',',$a); } - + function hlc( $data, $alpha, $line_width, $colour, $text='', $size=-1 ) { $type = 'hlc'. $this->next_line(); @@ -939,10 +939,10 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $description = $alpha .','. $line_width .','. $colour .','. $text .','. $size; $this->lines[$type] = $description; - + $a = array(); foreach( $data as $can ) - $a[] = $can->toString(); + $a[] = $can->toString(); $this->data[] = implode(',',$a); } @@ -954,10 +954,10 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $description = $line_width .','. $colour .','. $text .','. $size; $this->lines[$type] = $description; - + $a = array(); foreach( $data as $can ) - $a[] = $can->toString(); + $a[] = $can->toString(); $this->data[] = implode(',',$a); } @@ -967,19 +967,19 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView // Patch by, Jeremy Miller (14th Nov, 2007) // /** - * Draw a pie chart. - * - * @param alpha an int argument. - * The percentage of transparency of the pie colour. - * @param line_colour a string argument. - * The hex colour value of the outline. - * @param label_colour a string argument. - * The hex colour value of the label. - * @param gradient a boolean argument. - * Use a gradient true or false. - * @param border_size an int argument. - * Size of the border in pixels. - */ + * Draw a pie chart. + * + * @param alpha an int argument. + * The percentage of transparency of the pie colour. + * @param line_colour a string argument. + * The hex colour value of the outline. + * @param label_colour a string argument. + * The hex colour value of the label. + * @param gradient a boolean argument. + * Use a gradient true or false. + * @param border_size an int argument. + * Size of the border in pixels. + */ function pie( $alpha, $line_colour, $label_colour, $gradient = true, $border_size = false ) { $this->pie = $alpha.','.$line_colour.','.$label_colour; @@ -1006,7 +1006,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView * An array of the labels for the pie pieces. * @param links an array argument. * An array of the links to the pie pieces. - */ + */ function pie_values( $values, $labels=array(), $links=array() ) { $this->pie_values = implode(',',$values); @@ -1024,7 +1024,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView { $this->pie_colours = implode(',',$colours); } - + /** * Render the output. @@ -1036,7 +1036,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView if($output_type == 'js') { $this->increment_occurence(); - + $tmp[] = '<div id="my_chart' . $this->occurence . '"></div>'; $tmp[] = '<script type="text/javascript" src="' . $this->base . 'swfobject.js"></script>'; $tmp[] = '<script type="text/javascript">'; @@ -1058,41 +1058,41 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $values .= ','. $this->x_legend_colour; $tmp[] = $this->format_output($output_type,'x_legend',$values); } - + if( strlen( $this->x_label_style ) > 0 ) - $tmp[] = $this->format_output($output_type,'x_label_style',$this->x_label_style); - + $tmp[] = $this->format_output($output_type,'x_label_style',$this->x_label_style); + if( $this->x_tick_size > 0 ) - $tmp[] = $this->format_output($output_type,'x_ticks',$this->x_tick_size); + $tmp[] = $this->format_output($output_type,'x_ticks',$this->x_tick_size); if( $this->x_axis_steps > 0 ) - $tmp[] = $this->format_output($output_type,'x_axis_steps',$this->x_axis_steps); + $tmp[] = $this->format_output($output_type,'x_axis_steps',$this->x_axis_steps); if( strlen( $this->x_axis_3d ) > 0 ) - $tmp[] = $this->format_output($output_type,'x_axis_3d',$this->x_axis_3d); - + $tmp[] = $this->format_output($output_type,'x_axis_3d',$this->x_axis_3d); + if( strlen( $this->y_legend ) > 0 ) - $tmp[] = $this->format_output($output_type,'y_legend',$this->y_legend); - + $tmp[] = $this->format_output($output_type,'y_legend',$this->y_legend); + if( strlen( $this->y_legend_right ) > 0 ) - $tmp[] = $this->format_output($output_type,'y2_legend',$this->y_legend_right); + $tmp[] = $this->format_output($output_type,'y2_legend',$this->y_legend_right); if( strlen( $this->y_label_style ) > 0 ) - $tmp[] = $this->format_output($output_type,'y_label_style',$this->y_label_style); + $tmp[] = $this->format_output($output_type,'y_label_style',$this->y_label_style); $values = '5,10,'. $this->y_steps; $tmp[] = $this->format_output($output_type,'y_ticks',$values); if( count( $this->lines ) == 0 && count($this->data_sets)==0 ) { - $tmp[] = $this->format_output($output_type,$this->line_default['type'],$this->line_default['values']); + $tmp[] = $this->format_output($output_type,$this->line_default['type'],$this->line_default['values']); } else { foreach( $this->lines as $type=>$description ) - $tmp[] = $this->format_output($output_type,$type,$description); + $tmp[] = $this->format_output($output_type,$type,$description); } - + $num = 1; foreach( $this->data as $data ) { @@ -1104,10 +1104,10 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView { $tmp[] = $this->format_output($output_type,'values_'. $num, $data); } - + $num++; } - + $num = 1; foreach( $this->links as $link ) { @@ -1119,7 +1119,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView { $tmp[] = $this->format_output($output_type,'links_'. $num, $link); } - + $num++; } @@ -1133,27 +1133,27 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } if( count( $this->x_labels ) > 0 ) - $tmp[] = $this->format_output($output_type,'x_labels',implode(',',$this->x_labels)); + $tmp[] = $this->format_output($output_type,'x_labels',implode(',',$this->x_labels)); else { if( strlen($this->x_min) > 0 ) - $tmp[] = $this->format_output($output_type,'x_min',$this->x_min); - + $tmp[] = $this->format_output($output_type,'x_min',$this->x_min); + if( strlen($this->x_max) > 0 ) - $tmp[] = $this->format_output($output_type,'x_max',$this->x_max); + $tmp[] = $this->format_output($output_type,'x_max',$this->x_max); } - + $tmp[] = $this->format_output($output_type,'y_min',$this->y_min); $tmp[] = $this->format_output($output_type,'y_max',$this->y_max); if( strlen($this->y2_min) > 0 ) - $tmp[] = $this->format_output($output_type,'y2_min',$this->y2_min); + $tmp[] = $this->format_output($output_type,'y2_min',$this->y2_min); if( strlen($this->y2_max) > 0 ) - $tmp[] = $this->format_output($output_type,'y2_max',$this->y2_max); - + $tmp[] = $this->format_output($output_type,'y2_max',$this->y2_max); + if( strlen( $this->bg_colour ) > 0 ) - $tmp[] = $this->format_output($output_type,'bg_colour',$this->bg_colour); + $tmp[] = $this->format_output($output_type,'bg_colour',$this->bg_colour); if( strlen( $this->bg_image ) > 0 ) { @@ -1169,16 +1169,16 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } if( strlen( $this->y_axis_colour ) > 0 ) - $tmp[] = $this->format_output($output_type,'y_axis_colour',$this->y_axis_colour); + $tmp[] = $this->format_output($output_type,'y_axis_colour',$this->y_axis_colour); if( strlen( $this->y_grid_colour ) > 0 ) - $tmp[] = $this->format_output($output_type,'y_grid_colour',$this->y_grid_colour); - + $tmp[] = $this->format_output($output_type,'y_grid_colour',$this->y_grid_colour); + if( strlen( $this->y2_axis_colour ) > 0 ) - $tmp[] = $this->format_output($output_type,'y2_axis_colour',$this->y2_axis_colour); - + $tmp[] = $this->format_output($output_type,'y2_axis_colour',$this->y2_axis_colour); + if( strlen( $this->x_offset ) > 0 ) - $tmp[] = $this->format_output($output_type,'x_offset',$this->x_offset); + $tmp[] = $this->format_output($output_type,'x_offset',$this->x_offset); if( strlen( $this->inner_bg_colour ) > 0 ) { @@ -1190,7 +1190,7 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } $tmp[] = $this->format_output($output_type,'inner_background',$values); } - + if( strlen( $this->pie ) > 0 ) { $tmp[] = $this->format_output($output_type,'pie',$this->pie); @@ -1201,24 +1201,24 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView } if( strlen( $this->tool_tip ) > 0 ) - $tmp[] = $this->format_output($output_type,'tool_tip',$this->tool_tip); + $tmp[] = $this->format_output($output_type,'tool_tip',$this->tool_tip); - + if( strlen( $this->y_format ) > 0 ) - $tmp[] = $this->format_output($output_type,'y_format',$this->y_format); + $tmp[] = $this->format_output($output_type,'y_format',$this->y_format); if( strlen( $this->num_decimals ) > 0 ) - $tmp[] = $this->format_output($output_type,'num_decimals',$this->num_decimals); + $tmp[] = $this->format_output($output_type,'num_decimals',$this->num_decimals); if( strlen( $this->is_fixed_num_decimals_forced ) > 0 ) - $tmp[] = $this->format_output($output_type,'is_fixed_num_decimals_forced',$this->is_fixed_num_decimals_forced); + $tmp[] = $this->format_output($output_type,'is_fixed_num_decimals_forced',$this->is_fixed_num_decimals_forced); if( strlen( $this->is_decimal_separator_comma ) > 0 ) - $tmp[] = $this->format_output($output_type,'is_decimal_separator_comma',$this->is_decimal_separator_comma); + $tmp[] = $this->format_output($output_type,'is_decimal_separator_comma',$this->is_decimal_separator_comma); if( strlen( $this->is_thousand_separator_disabled ) > 0 ) - $tmp[] = $this->format_output($output_type,'is_thousand_separator_disabled',$this->is_thousand_separator_disabled); + $tmp[] = $this->format_output($output_type,'is_thousand_separator_disabled',$this->is_thousand_separator_disabled); $count = 1; @@ -1227,13 +1227,13 @@ abstract class Piwik_Visualization_OpenFlashChart implements Piwik_iView $tmp[] = $set->toString( $output_type, $count>1?'_'.$count:'' ); $count++; } - + if($output_type == 'js') { $tmp[] = 'so.write("my_chart' . $this->occurence . '");'; $tmp[] = '</script>'; } - + return implode("\r\n",$tmp); } } @@ -1248,11 +1248,11 @@ class bar var $key; var $key_size; var $var; - + function bar( $alpha, $colour ) { $this->var = 'bar'; - + $this->alpha = $alpha; $this->colour = $colour; $this->data = array(); @@ -1266,13 +1266,13 @@ class bar $this->key = graph::esc( $key ); $this->key_size = $size; } - + function add( $data, $link ) { $this->data[] = $data; $this->links[] = $link; } - + // return the variables for this // bar chart function _get_variable_list() @@ -1280,44 +1280,44 @@ class bar $values = array(); $values[] = $this->alpha; $values[] = $this->colour; - + if( $this->_key ) { $values[] = $this->key; $values[] = $this->key_size; } - + return $values; } - + function toString( $output_type, $set_num ) { $values = implode( ',', $this->_get_variable_list() ); - + $tmp = array(); - + if( $output_type == 'js' ) { $tmp[] = 'so.addVariable("'. $this->var .'","'. $values . '");'; $tmp[] = 'so.addVariable("values'. $set_num .'","'. implode( ',', $this->data ) .'");'; - + if( count( $this->links ) > 0 ) - $tmp[] = 'so.addVariable("values'. $set_num .'","'. implode( ',', $this->links ) .'");'; + $tmp[] = 'so.addVariable("values'. $set_num .'","'. implode( ',', $this->links ) .'");'; } else { $tmp[] = '&'. $this->var. $set_num .'='. $values .'&'; $tmp[] = '&values'. $set_num .'='. implode( ',', $this->data ) .'&'; - + if( count( $this->links ) > 0 ) - $tmp[] = '&links'. $set_num .'='. implode( ',', $this->links ) .'&'; + $tmp[] = '&links'. $set_num .'='. implode( ',', $this->links ) .'&'; } return implode( "\r\n", $tmp ); } - + } class bar_3d extends bar @@ -1341,14 +1341,14 @@ class bar_fade extends bar class bar_outline extends bar { var $outline_colour; - + function bar_outline( $alpha, $colour, $outline_colour ) { parent::bar( $alpha, $colour ); $this->var = 'filled_bar'; $this->outline_colour = $outline_colour; } - + // override the base method function _get_variable_list() { @@ -1356,13 +1356,13 @@ class bar_outline extends bar $values[] = $this->alpha; $values[] = $this->colour; $values[] = $this->outline_colour; - + if( $this->_key ) { $values[] = $this->key; $values[] = $this->key_size; } - + return $values; } } @@ -1383,14 +1383,14 @@ class bar_glass extends bar_outline class bar_sketch extends bar_outline { var $offset; - + function bar_sketch( $alpha, $offset, $colour, $outline_colour ) { parent::bar_outline( $alpha, $colour, $outline_colour ); $this->var = 'bar_sketch'; $this->offset = $offset; } - + // override the base method function _get_variable_list() { @@ -1399,13 +1399,13 @@ class bar_sketch extends bar_outline $values[] = $this->offset; $values[] = $this->colour; $values[] = $this->outline_colour; - + if( $this->_key ) { $values[] = $this->key; $values[] = $this->key_size; } - + return $values; } } @@ -1413,7 +1413,7 @@ class bar_sketch extends bar_outline class candle { var $out; - + function candle( $high, $open, $close, $low ) { $this->out = array(); @@ -1422,7 +1422,7 @@ class candle $this->out[] = $close; $this->out[] = $low; } - + function toString() { return '['. implode( ',', $this->out ) .']'; @@ -1432,7 +1432,7 @@ class candle class hlc { var $out; - + function hlc( $high, $low, $close ) { $this->out = array(); @@ -1440,7 +1440,7 @@ class hlc $this->out[] = $low; $this->out[] = $close; } - + function toString() { return '['. implode( ',', $this->out ) .']'; @@ -1450,7 +1450,7 @@ class hlc class point { var $out; - + function point( $x, $y, $size_px ) { $this->out = array(); @@ -1458,10 +1458,10 @@ class point $this->out[] = $y; $this->out[] = $size_px; } - + function toString() { return '['. implode( ',', $this->out ) .']'; } } -
\ No newline at end of file +
\ No newline at end of file diff --git a/modules/Widget.php b/modules/Widget.php index ec1aee866f..65e90d84fa 100644 --- a/modules/Widget.php +++ b/modules/Widget.php @@ -15,4 +15,4 @@ function Piwik_AddWidget( $pluginName, $controllerMethodToCall, $widgetTitle ) global $widgets; // get the plugin name from controller $widgets[$pluginName][] = array( $widgetTitle, $controllerMethodToCall ); -}
\ No newline at end of file +} @@ -1,189 +1,220 @@ -// Web analytics by Piwik - http://piwik.org
-// Copyleft 2007, All rights reversed.
-var _pk_use_title_as_name = 0;
-var _pk_install_tracker = 1;
-var _pk_tracker_pause = 250;
-var _pk_download_extensions = "7z|aac|avi|csv|doc|exe|flv|gif|gz|jpe?g|js|mp(3|4|e?g)|mov|pdf|phps|png|ppt|rar|sit|tar|torrent|txt|wma|wmv|xls|xml|zip";
-
-// Beginning script
-function _pk_plug_normal(_pk_pl) {
- if (_pk_tm.indexOf(_pk_pl) != -1 && (navigator.mimeTypes[_pk_pl].enabledPlugin != null))
- return '1';
- return '0';
-}
-
-function _pk_plug_ie(_pk_pl)
-{
- pk_found = false;
- document.write('<SCR' + 'IPT LANGUAGE=VBScript>\n on error resume next \n pk_found = IsObject(CreateObject("' + _pk_pl + '")) </SCR' + 'IPT>\n');
- if (pk_found) return '1';
- return '0';
-}
-
-var _pk_jav = '0'; if(navigator.javaEnabled()) _pk_jav='1';
-var _pk_agent = navigator.userAgent.toLowerCase();
-var _pk_moz = (navigator.appName.indexOf("Netscape") != -1);
-var _pk_ie = (_pk_agent.indexOf("msie") != -1);
-var _pk_win = ((_pk_agent.indexOf("win") != -1) || (_pk_agent.indexOf("32bit") != -1));
-var _pk_cookie = (navigator.cookieEnabled)? '1' : '0';
-if((typeof (navigator.cookieEnabled) == "undefined") && (_pk_cookie == '0')) {
- document.cookie="_pk_testcookie"
- _pk_cookie=(document.cookie.indexOf("_pk_testcookie")!=-1)? '1' : '0';
-}
-
-var _pk_dir='0',_pk_fla='0',_pk_pdf='0',_pk_qt = '0',_pk_rea = '0',_pk_wma='0';
-if (_pk_win && _pk_ie){
- _pk_dir = _pk_plug_ie("SWCtl.SWCtl.1");
- _pk_fla = _pk_plug_ie("ShockwaveFlash.ShockwaveFlash.1");
- if (_pk_plug_ie("PDF.PdfCtrl.1") == '1' || _pk_plug_ie('PDF.PdfCtrl.5') == '1' || _pk_plug_ie('PDF.PdfCtrl.6') == '1') _pk_pdf = '1';
- _pk_qt = _pk_plug_ie("Quicktime.Quicktime"); // Old : "QuickTimeCheckObject.QuickTimeCheck.1"
- _pk_rea = _pk_plug_ie("rmocx.RealPlayer G2 Control.1");
- _pk_wma = _pk_plug_ie("wmplayer.ocx"); // Old : "MediaPlayer.MediaPlayer.1"
-} else {
- var _pk_tm = '';
- for (var i=0; i < navigator.mimeTypes.length; i++)
- _pk_tm += navigator.mimeTypes[i].type.toLowerCase();
- _pk_dir = _pk_plug_normal("application/x-director");
- _pk_fla = _pk_plug_normal("application/x-shockwave-flash");
- _pk_pdf = _pk_plug_normal("application/pdf");
- _pk_qt = _pk_plug_normal("video/quicktime");
- _pk_rea = _pk_plug_normal("audio/x-pn-realaudio-plugin");
- _pk_wma = _pk_plug_normal("application/x-mplayer2");
-}
-
-var _pk_rtu = '';
-try {
- _pk_rtu = top.document.referrer;
-} catch(e1) {
- if(parent){
- try{ _pk_rtu = parent.document.referrer; } catch(e2) { _pk_rtu=''; }
- }
-}
-if(_pk_rtu == '') {
- _pk_rtu = document.referrer;
-}
-
-function _pk_escape(_pk_str){
- if(typeof(encodeURIComponent) == 'function') {
- return encodeURIComponent(_pk_str);
- } else {
- return escape(_pk_str);
- }
-}
-var _pk_title = '';
-if (document.title && document.title!="") _pk_title = _pk_escape(document.title);
-
-var _pk_called;
-
-function _pk_getUrlLog( _pk_action_name, _pk_site, _pk_pkurl, _pk_custom_vars )
-{
- var _pk_custom_vars_str = '';
- if(typeof _pk_custom_vars == "undefined"){
- _pk_custom_vars = false;
- }
- if (_pk_custom_vars) {
- for (var i in _pk_custom_vars){
- if (!Array.prototype[i]){
- _pk_custom_vars_str = _pk_custom_vars_str + '&vars['+ escape(i) + ']' + "=" + escape(_pk_custom_vars[i]);
- }
- }
- }
-
- var _pk_url = document.location.href;
- var _pk_da = new Date();
- var _pk_src = _pk_pkurl
- +'?url='+_pk_escape(document.location.href)
- +'&action_name='+_pk_escape(_pk_action_name)
- +'&idsite='+_pk_site
- +'&res='+screen.width+'x'+screen.height +'&col='+screen.colorDepth
- +'&h='+_pk_da.getHours()+'&m='+_pk_da.getMinutes()+'&s='+_pk_da.getSeconds()
- +'&fla='+_pk_fla+'&dir='+_pk_dir+'&qt='+_pk_qt+'&realp='+_pk_rea+'&pdf='+_pk_pdf
- +'&wma='+_pk_wma+'&java='+_pk_jav+'&cookie='+_pk_cookie
- +'&title='+_pk_title
- +'&urlref='+_pk_escape(_pk_rtu)
- +_pk_custom_vars_str;
- return _pk_src;
-}
-
-function piwik_log( _pk_action_name, _pk_site, _pk_pkurl, _pk_custom_vars )
-{
- if(_pk_called && (!_pk_action_name || _pk_action_name=="")) return;
- var _pk_src = _pk_getUrlLog(_pk_action_name, _pk_site, _pk_pkurl, _pk_custom_vars );
- document.writeln('<img src="'+_pk_src+'" alt="Piwik" style="border:0" />');
- if(!_pk_action_name || _pk_action_name=="") _pk_called=1;
-
- if(_pk_install_tracker) _pk_init_tracker(_pk_site, _pk_pkurl);
-}
-
-
-function _pk_add_event(elm, evType, fn, useCapture)
-{
- if (elm.addEventListener) {
- elm.addEventListener(evType, fn, useCapture);
- return true;
- } else if (elm.attachEvent) {
- var r = elm.attachEvent('on' + evType, fn);
- return r;
- } else {
- elm['on' + evType] = fn;
- }
-}
-
-var _pk_tracker_site, _pk_tracker_url;
-
-function _pk_init_tracker(_pk_site, _pk_pkurl)
-{
- _pk_tracker_site = _pk_site;
- _pk_tracker_url = _pk_pkurl;
-
- if (document.getElementsByTagName) {
- linksElements = document.getElementsByTagName('a')
- for (var i = 0; i < linksElements.length; i++) {
- _pk_add_event(linksElements[i], 'mousedown', _pk_click, false);
- }
- }
-}
-
-function _pk_dummy() { return true; }
-
-function _pk_pause(_pk_time_msec) {
- var _pk_now = new Date();
- var _pk_expire = _pk_now.getTime() + _pk_time_msec;
- while(_pk_now.getTime() < _pk_expire)
- _pk_now = new Date();
-}
-
-// _pk_type only 'download' and 'link' types supported
-function piwik_track(url, _pk_site, _pk_url, _pk_type)
-{
- var _pk_image = new Image();
- _pk_image.onLoad = function() { _pk_dummy(); };
- _pk_image.src = _pk_url + '?idsite=' + _pk_site + '&' + _pk_type + '=' + url + '&rand=' + Math.random() + '&redirect=0';
- _pk_pause(_pk_tracker_pause);
-}
-
-function _pk_click(e)
-{
- var source;
-
- if (typeof e == 'undefined')
- var e = window.event;
-
- if (typeof e.target != 'undefined')
- source = e.target;
- else if (typeof e.srcElement != 'undefined')
- source = e.srcElement;
- else return true;
-
- var target = new String(source.getAttribute('href'));
- //var title = source.childNodes[0].nodeValue;
-
- var _pk_download = new RegExp('\\.(' + _pk_download_extensions + ')$', 'i');
- var _pk_link_type = (_pk_download.test(target) ? 'download' : 'link');
-
- if( target != 'null' && (source.hostname != window.location.hostname || _pk_link_type == 'download') ) {
- piwik_track(target, _pk_tracker_site, _pk_tracker_url, _pk_link_type);
- }
-
- return true;
-}
\ No newline at end of file +// Web analytics by Piwik - http://piwik.org +// Copyleft 2007, All rights reversed. +var _pk_use_title_as_name = 0; +var _pk_install_tracker = 1; +var _pk_tracker_pause = 250; +var _pk_download_extensions = "7z|aac|avi|csv|doc|exe|flv|gif|gz|jpe?g|js|mp(3|4|e?g)|mov|pdf|phps|png|ppt|rar|sit|tar|torrent|txt|wma|wmv|xls|xml|zip"; + +// Beginning script +function _pk_plug_normal(_pk_pl) { + if (_pk_tm.indexOf(_pk_pl) != -1 && (navigator.mimeTypes[_pk_pl].enabledPlugin != null)) + return '1'; + return '0'; +} + +function _pk_plug_ie(_pk_pl) +{ + pk_found = false; + document.write('<SCR' + 'IPT LANGUAGE=VBScript>\n on error resume next \n pk_found = IsObject(CreateObject("' + _pk_pl + '")) </SCR' + 'IPT>\n'); + if (pk_found) return '1'; + return '0'; +} + +var _pk_jav = '0'; if(navigator.javaEnabled()) _pk_jav='1'; +var _pk_agent = navigator.userAgent.toLowerCase(); +var _pk_moz = (navigator.appName.indexOf("Netscape") != -1); +var _pk_ie = (_pk_agent.indexOf("msie") != -1); +var _pk_win = ((_pk_agent.indexOf("win") != -1) || (_pk_agent.indexOf("32bit") != -1)); +var _pk_cookie = (navigator.cookieEnabled)? '1' : '0'; +if((typeof (navigator.cookieEnabled) == "undefined") && (_pk_cookie == '0')) { + document.cookie="_pk_testcookie" + _pk_cookie=(document.cookie.indexOf("_pk_testcookie")!=-1)? '1' : '0'; +} + +var _pk_dir='0',_pk_fla='0',_pk_pdf='0',_pk_qt = '0',_pk_rea = '0',_pk_wma='0'; +if (_pk_win && _pk_ie){ + _pk_dir = _pk_plug_ie("SWCtl.SWCtl.1"); + _pk_fla = _pk_plug_ie("ShockwaveFlash.ShockwaveFlash.1"); + if (_pk_plug_ie("PDF.PdfCtrl.1") == '1' || _pk_plug_ie('PDF.PdfCtrl.5') == '1' || _pk_plug_ie('PDF.PdfCtrl.6') == '1') _pk_pdf = '1'; + _pk_qt = _pk_plug_ie("Quicktime.Quicktime"); // Old : "QuickTimeCheckObject.QuickTimeCheck.1" + _pk_rea = _pk_plug_ie("rmocx.RealPlayer G2 Control.1"); + _pk_wma = _pk_plug_ie("wmplayer.ocx"); // Old : "MediaPlayer.MediaPlayer.1" +} else { + var _pk_tm = ''; + for (var i=0; i < navigator.mimeTypes.length; i++) + _pk_tm += navigator.mimeTypes[i].type.toLowerCase(); + _pk_dir = _pk_plug_normal("application/x-director"); + _pk_fla = _pk_plug_normal("application/x-shockwave-flash"); + _pk_pdf = _pk_plug_normal("application/pdf"); + _pk_qt = _pk_plug_normal("video/quicktime"); + _pk_rea = _pk_plug_normal("audio/x-pn-realaudio-plugin"); + _pk_wma = _pk_plug_normal("application/x-mplayer2"); +} + +var _pk_rtu = ''; +try { + _pk_rtu = top.document.referrer; +} catch(e1) { + if(parent){ + try{ _pk_rtu = parent.document.referrer; } catch(e2) { _pk_rtu=''; } + } +} +if(_pk_rtu == '') { + _pk_rtu = document.referrer; +} + +function _pk_escape(_pk_str){ + if(typeof(encodeURIComponent) == 'function') { + return encodeURIComponent(_pk_str); + } else { + return escape(_pk_str); + } +} +var _pk_title = ''; +if (document.title && document.title!="") _pk_title = _pk_escape(document.title); + +var _pk_called; + +function _pk_getUrlLog( _pk_action_name, _pk_site, _pk_pkurl, _pk_custom_vars ) +{ + var _pk_custom_vars_str = ''; + if(typeof _pk_custom_vars == "undefined"){ + _pk_custom_vars = false; + } + if (_pk_custom_vars) { + for (var i in _pk_custom_vars){ + if (!Array.prototype[i]){ + _pk_custom_vars_str = _pk_custom_vars_str + '&vars['+ escape(i) + ']' + "=" + escape(_pk_custom_vars[i]); + } + } + } + + var _pk_url = document.location.href; + var _pk_da = new Date(); + var _pk_src = _pk_pkurl + +'?url='+_pk_escape(document.location.href) + +'&action_name='+_pk_escape(_pk_action_name) + +'&idsite='+_pk_site + +'&res='+screen.width+'x'+screen.height +'&col='+screen.colorDepth + +'&h='+_pk_da.getHours()+'&m='+_pk_da.getMinutes()+'&s='+_pk_da.getSeconds() + +'&fla='+_pk_fla+'&dir='+_pk_dir+'&qt='+_pk_qt+'&realp='+_pk_rea+'&pdf='+_pk_pdf + +'&wma='+_pk_wma+'&java='+_pk_jav+'&cookie='+_pk_cookie + +'&title='+_pk_title + +'&urlref='+_pk_escape(_pk_rtu) + +_pk_custom_vars_str; + return _pk_src; +} + +function piwik_log( _pk_action_name, _pk_site, _pk_pkurl, _pk_custom_vars ) +{ + if(_pk_called && (!_pk_action_name || _pk_action_name=="")) return; + var _pk_src = _pk_getUrlLog(_pk_action_name, _pk_site, _pk_pkurl, _pk_custom_vars ); + document.writeln('<img src="'+_pk_src+'" alt="Piwik" style="border:0" />'); + if(!_pk_action_name || _pk_action_name=="") _pk_called=1; + + _pk_init_tracker(_pk_site, _pk_pkurl); +} + +function _pk_add_event(elm, evType, fn, useCapture) +{ + if (elm.addEventListener) { + elm.addEventListener(evType, fn, useCapture); + return true; + } else if (elm.attachEvent) { + var r = elm.attachEvent('on' + evType, fn); + return r; + } else { + elm['on' + evType] = fn; + } +} + +var _pk_tracker_site, _pk_tracker_url; + +function _pk_init_tracker(_pk_site, _pk_pkurl) +{ + if( typeof(piwik_install_tracker) != "undefined" ) + _pk_install_tracker = piwik_install_tracker; + if( typeof(piwik_tracker_pause) != "undefined" ) + _pk_tracker_pause = piwik_tracker_pause; + if( typeof(piwik_download_extensions) != "undefined" ) + _pk_download_extensions = piwik_download_extensions; + + _pk_hosts_alias = ( typeof(piwik_hosts_alias) != "undefined" ? piwik_hosts_alias : new Array()) + _pk_hosts_alias.push(window.location.hostname); + + if( !_pk_install_tracker ) + return; + + _pk_tracker_site = _pk_site; + _pk_tracker_url = _pk_pkurl; + + if (document.getElementsByTagName) { + linksElements = document.getElementsByTagName('a') + for (var i = 0; i < linksElements.length; i++) { + if( linksElements[i].className != 'piwik_ignore' ) + _pk_add_event(linksElements[i], 'mousedown', _pk_click, false); + } + } +} + +function _pk_dummy() { return true; } + +function _pk_pause(_pk_time_msec) { + var _pk_now = new Date(); + var _pk_expire = _pk_now.getTime() + _pk_time_msec; + while(_pk_now.getTime() < _pk_expire) + _pk_now = new Date(); +} + +// _pk_type only 'download' and 'link' types supported +function piwik_track(url, _pk_site, _pk_url, _pk_type) +{ + var _pk_image = new Image(); + _pk_image.onLoad = function() { _pk_dummy(); }; + _pk_image.src = _pk_url + '?idsite=' + _pk_site + '&' + _pk_type + '=' + escape(url) + '&rand=' + Math.random() + '&redirect=0'; + _pk_pause(_pk_tracker_pause); +} + +function _pk_is_site_hostname(_pk_hostname) { + for(i = 0; i < _pk_hosts_alias.length; i++) + if( _pk_hostname == _pk_hosts_alias[i] ) + return true; + return false; +} + +function _pk_click(e) +{ + var source; + + if (typeof e == 'undefined') + var e = window.event; + + if (typeof e.target != 'undefined') + source = e.target; + else if (typeof e.srcElement != 'undefined') + source = e.srcElement; + else return true; + + while( source.tagName != "A" ) + source = source.parentNode; + + if( typeof source.href == 'undefined' ) + return true; + + var _pk_download = new RegExp('\\.(' + _pk_download_extensions + ')$', 'i'); + var _pk_link_type; + var _pk_not_site_hostname = !_pk_is_site_hostname(source.hostname); + + if( source.className == "piwik_download" ) + _pk_link_type = 'download'; + else if( source.className == "piwik_link" ) { + _pk_link_type = 'link'; + _pk_not_site_hostname = 1; + } + else _pk_link_type = (_pk_download.test(source.href) ? 'download' : 'link'); + + if( _pk_not_site_hostname || _pk_link_type == 'download' ) + piwik_track(source.href, _pk_tracker_site, _pk_tracker_url, _pk_link_type); + + return true; +} diff --git a/plugins/Actions/API.php b/plugins/Actions/API.php index 47ab9ae3c2..3dc665d93e 100644 --- a/plugins/Actions/API.php +++ b/plugins/Actions/API.php @@ -1,22 +1,22 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Actions
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Actions + */ + require_once "DataFiles/Browsers.php"; require_once "DataFiles/OS.php"; -require_once "Actions.php";
-
-/**
- *
- * @package Piwik_Actions
+require_once "Actions.php"; + +/** + * + * @package Piwik_Actions */ class Piwik_Actions_API extends Piwik_Apiable { @@ -29,7 +29,7 @@ class Piwik_Actions_API extends Piwik_Apiable static public function getInstance() { if (self::$instance == null) - { + { $c = __CLASS__; self::$instance = new $c(); } @@ -68,14 +68,17 @@ class Piwik_Actions_API extends Piwik_Apiable public function getDownloads( $idSite, $period, $date, $expanded = false, $idSubtable = false ) { - return $this->getDataTable('Actions_downloads', $idSite, $period, $date, $expanded, $idSubtable ); + $dataTable = $this->getDataTable('Actions_downloads', $idSite, $period, $date, $expanded, $idSubtable ); + $dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'url', create_function('$url', 'return $url;'))); + return $dataTable; } public function getOutlinks( $idSite, $period, $date, $expanded = false, $idSubtable = false ) - { + { $dataTable = $this->getDataTable('Actions_outlink', $idSite, $period, $date, $expanded, $idSubtable ); $dataTable->queueFilter('Piwik_DataTable_Filter_ColumnCallbackAddDetail', array('label', 'url', create_function('$url', 'return $url;'))); return $dataTable; } } + diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 2a657077cd..fe11a12a00 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -1,17 +1,17 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Actions
- */
-
-/**
- *
- * @package Piwik_Actions
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Actions + */ + +/** + * + * @package Piwik_Actions */ class Piwik_Actions extends Piwik_Plugin { @@ -96,11 +96,11 @@ class Piwik_Actions extends Piwik_Plugin // but this action was not properly recorded when it was hit in the first place // so we add this fake row information to make sure there is a nb_hits, etc. column for every action $this->defaultRow = new Piwik_DataTable_Row(array( - Piwik_DataTable_Row::COLUMNS => array( - 'nb_visits' => 1, - 'nb_uniq_visitors' => 1, - 'nb_hits' => 1, - ))); + Piwik_DataTable_Row::COLUMNS => array( + 'nb_visits' => 1, + 'nb_uniq_visitors' => 1, + 'nb_hits' => 1, + ))); /* * Actions global information @@ -110,12 +110,12 @@ class Piwik_Actions extends Piwik_Plugin count(distinct t1.idvisit) as nb_visits, count(distinct visitor_idcookie) as nb_uniq_visitors, count(*) as nb_hits - FROM (".$archiveProcessing->logTable." as t1 + FROM (".$archiveProcessing->logTable." as t1 LEFT JOIN ".$archiveProcessing->logVisitActionTable." as t2 USING (idvisit)) LEFT JOIN ".$archiveProcessing->logActionTable." as t3 USING (idaction) - WHERE visit_server_date = ? - AND idsite = ? - GROUP BY t3.idaction"; + WHERE visit_server_date = ? + AND idsite = ? + GROUP BY t3.idaction"; $query = $archiveProcessing->db->query($query, array( $archiveProcessing->strDateStart, $archiveProcessing->idsite )); $modified = $this->updateActionsTableWithRowQuery($query); @@ -132,11 +132,11 @@ class Piwik_Actions extends Piwik_Plugin sum(visit_total_time) as entry_sum_visit_length, sum(case visit_total_actions when 1 then 1 else 0 end) as entry_bounce_count - FROM ".$archiveProcessing->logTable." + FROM ".$archiveProcessing->logTable." JOIN ".$archiveProcessing->logActionTable." ON (visit_entry_idaction = idaction) - WHERE visit_server_date = ? - AND idsite = ? - GROUP BY visit_entry_idaction + WHERE visit_server_date = ? + AND idsite = ? + GROUP BY visit_entry_idaction "; $query = $archiveProcessing->db->query($query, array( $archiveProcessing->strDateStart, $archiveProcessing->idsite )); @@ -196,6 +196,21 @@ class Piwik_Actions extends Piwik_Plugin unset($this->actionsTablesByType); } + + static public function splitUrl($url) + { + $matches = array(); + $split_arr = array(); + $n = preg_match("#://[^/]+(/)#",$url, $matches, PREG_OFFSET_CAPTURE); + if( $n ) + { + $split_arr = array(substr($url, 0, $matches[1][1]), substr($url, $matches[1][1])); + } + else + $split_arr = array($url); + + return $split_arr; + } static public function getActionCategoryFromName($name) { @@ -203,7 +218,7 @@ class Piwik_Actions extends Piwik_Plugin // case the name is an URL we dont clean the name the same way if(Piwik_Common::isLookLikeUrl($name)) { - $split = array($name); + $split = self::splitUrl($name); $isUrl = true; } else @@ -248,6 +263,10 @@ class Piwik_Actions extends Piwik_Plugin // will always be unique as all the action names have been trimmed before reaching this point $actionName = '/' . $actionName; } + else + { + $actionName = ' ' . $actionName; + } // currentTable is now the array element corresponding the the action // at this point we may be for example at the 4th level of depth in the hierarchy @@ -331,3 +350,4 @@ Piwik_AddMenu('Actions', 'Pages', array('module' => 'Actions', 'action' => 'getA Piwik_AddMenu('Actions', 'Outlinks', array('module' => 'Actions', 'action' => 'getOutlinks')); Piwik_AddMenu('Actions', 'Downloads', array('module' => 'Actions', 'action' => 'getDownloads')); + diff --git a/plugins/Actions/Controller.php b/plugins/Actions/Controller.php index 9735379ab7..0a3b799413 100644 --- a/plugins/Actions/Controller.php +++ b/plugins/Actions/Controller.php @@ -6,20 +6,37 @@ class Piwik_Actions_Controller extends Piwik_Controller function getDownloads($fetch = false) { - $view = $this->getActionsView( $this->pluginName, - __FUNCTION__, - 'Actions.getDownloads', - 'getDownloadsSubDataTable' ); + $view = Piwik_ViewDataTable::factory(); + $view->init( $this->pluginName, + __FUNCTION__, + 'Actions.getDownloads', + 'getDownloadsSubDataTable' ); + $view->setColumnsToDisplay( array(0,2,3) ); + $view->setSortedColumn( 'nb_uniq_visitors','desc' ); + $view->setSortedColumn( 1 ); + $view->disableExcludeLowPopulation(); + $view->setLimit( 15 ); + + $view->main(); return $this->renderView($view, $fetch); } function getDownloadsSubDataTable($fetch = false) { - $view = $this->getActionsView( $this->pluginName, - __FUNCTION__, - 'Actions.getDownloads', - 'getDownloadsSubDataTable' ); + $view = Piwik_ViewDataTable::factory(); + $view->init( $this->pluginName, + __FUNCTION__, + 'Actions.getDownloads', + 'getDownloadsSubDataTable'); + $view->setColumnsToDisplay( array(0,2,3) ); + $view->setSortedColumn( 'nb_uniq_visitors','desc' ); + $view->setSortedColumn( 1 ); + $view->disableExcludeLowPopulation(); + $view->disableSearchBox(); + $view->setLimit( 15 ); + + $view->main(); return $this->renderView($view, $fetch); } function getActions($fetch = false) @@ -43,14 +60,15 @@ class Piwik_Actions_Controller extends Piwik_Controller function getOutlinks($fetch = false) { - $view = Piwik_ViewDataTable::factory(); $view->init( $this->pluginName, __FUNCTION__, - 'Actions.getOutlinks' ); + 'Actions.getOutlinks', + 'getOutlinksSubDataTable' ); $view->setColumnsToDisplay( array(0,2,3) ); $view->setSortedColumn( 'nb_uniq_visitors','desc' ); + $view->setSortedColumn( 1 ); $view->disableExcludeLowPopulation(); $view->setLimit( 15 ); @@ -59,11 +77,20 @@ class Piwik_Actions_Controller extends Piwik_Controller } function getOutlinksSubDataTable($fetch = false) { - $view = $this->getActionsView( $this->pluginName, - __FUNCTION__, - 'Actions.getOutlinks', - 'getOutlinksSubDataTable' ); + $view = Piwik_ViewDataTable::factory(); + $view->init( $this->pluginName, + __FUNCTION__, + 'Actions.getOutlinks', + 'getOutlinksSubDataTable'); + + $view->setColumnsToDisplay( array(0,2,3) ); + $view->setSortedColumn( 'nb_uniq_visitors','desc' ); + $view->setSortedColumn( 1 ); + $view->disableExcludeLowPopulation(); + $view->disableSearchBox(); + $view->setLimit( 15 ); + $view->main(); return $this->renderView($view, $fetch); } diff --git a/plugins/AdminHome/AdminHome.php b/plugins/AdminHome/AdminHome.php new file mode 100644 index 0000000000..a3a4a0f71f --- /dev/null +++ b/plugins/AdminHome/AdminHome.php @@ -0,0 +1,28 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id: ExamplePlugin.php 169 2008-01-14 05:41:15Z matt $ + * + * @package Piwik_AdminHome + */ + + +class Piwik_AdminHome extends Piwik_Plugin +{ + public function getInformation() + { + return array( + // name must be the className prefix! + 'name' => 'AdminHome', + 'description' => '', + 'author' => 'Piwik', + 'homepage' => 'http://piwik.org/', + 'version' => '0.1', + 'translationAvailable' => false, + ); + } +} + diff --git a/plugins/AdminHome/Controller.php b/plugins/AdminHome/Controller.php new file mode 100644 index 0000000000..6641067e77 --- /dev/null +++ b/plugins/AdminHome/Controller.php @@ -0,0 +1,66 @@ +<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version + * + * @package Piwik_AdminHome + * + */ + +require_once "API/Request.php"; + + +/** + * + * @package Piwik_AdminHome + */ +class Piwik_AdminHome_Controller extends Piwik_Controller +{ + function getDefaultAction() + { + return 'redirectToIndex'; + } + function redirectToIndex() + { + header("Location:?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin"); + } + + public function showInContext() + { + $controllerName = Piwik_Common::getRequestVar('moduleToLoad'); + $actionName = Piwik_Common::getRequestVar('actionToLoad', 'index'); + + $view = $this->getDefaultIndexView(); + $view->basicHtmlView = true; + $view->content = Piwik_FrontController::getInstance()->fetchDispatch( $controllerName, $actionName ); + echo $view->render(); + } + + protected function getDefaultIndexView() + { + + $view = new Piwik_View('AdminHome/templates/index.tpl'); + $view->menu = Piwik_GetAdminMenu(); + $view->menuJson = json_encode($view->menu); + + $view->userLogin = Piwik::getCurrentUserLogin(); + $view->sites = Piwik_SitesManager_API::getSitesWithAtLeastViewAccess(); + $view->url = Piwik_Url::getCurrentUrl(); + + $view->basicHtmlView = false; + $view->content = ''; + return $view; + } + + public function index() + { + Piwik::checkUserIsSuperUser(); + + $view = $this->getDefaultIndexView(); + echo $view->render(); + } +} + diff --git a/plugins/AdminHome/templates/index.tpl b/plugins/AdminHome/templates/index.tpl new file mode 100644 index 0000000000..e65e6dd5d1 --- /dev/null +++ b/plugins/AdminHome/templates/index.tpl @@ -0,0 +1,18 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd ">
+<html>
+<head>
+</head>
+<body>
+<link rel="stylesheet" type="text/css" href="plugins/AdminHome/templates/menu.css">
+
+<div id="menu">
+{include file="AdminHome/templates/menu.tpl"}
+</div>
+
+<div style="clear:both;">
+</div>
+
+<div id='content'>
+{if $content}{$content}{/if}
+</div>
+
diff --git a/plugins/AdminHome/templates/menu.css b/plugins/AdminHome/templates/menu.css new file mode 100644 index 0000000000..aa1bc92ffa --- /dev/null +++ b/plugins/AdminHome/templates/menu.css @@ -0,0 +1,37 @@ +#tablist { + padding: 3px 0; + margin-left: 0; + margin-bottom: 0; + margin-top: 0.1em; + font: bold 12px Verdana; + border-bottom: 1px solid gray; +} + +#tablist li { + list-style: none; + display: inline; + margin: 0; +} + +#tablist li a { + text-decoration: none; + padding: 3px 0.5em; + margin-right: 3px; + border: 1px solid #778; + border-bottom: none; + background: white; +} + +#tablist li a:link,#tablist li a:visited { + color: black; +} + +#tablist li a:hover { + color: black; + background: #defdbb; + border-color: black; +} + +#tablist li a.current { + background: #defdbb; +}
\ No newline at end of file diff --git a/plugins/AdminHome/templates/menu.tpl b/plugins/AdminHome/templates/menu.tpl new file mode 100644 index 0000000000..08dd8e0dde --- /dev/null +++ b/plugins/AdminHome/templates/menu.tpl @@ -0,0 +1,5 @@ +<ul id="tablist">
+{foreach from=$menu key=name item=url name=menu}
+ <li><a name='{$url|@urlRewriteAdminView}' href='{$url|@urlRewriteAdminView}'>{$name}</a></li>
+{/foreach}
+</ul>
diff --git a/plugins/Dashboard/templates/dashboard.css b/plugins/Dashboard/templates/dashboard.css index 97cf19f1b7..8009c7c6aa 100644 --- a/plugins/Dashboard/templates/dashboard.css +++ b/plugins/Dashboard/templates/dashboard.css @@ -1,20 +1,17 @@ /*Overriding some dataTable css for better dashboard display*/ -.widgetDiv .parentDiv, -.widgetDiv .parentDivGraph, -.widgetDiv .parentDivActions, -.widgetDiv .parentDivGraphEvolution { +.widgetDiv .parentDiv,.widgetDiv .parentDivGraph,.widgetDiv .parentDivActions,.widgetDiv .parentDivGraphEvolution + { width: 100%; } /*--- end of dataTable.css modif*/ - .col { - float:left; + float: left; width: 33%; } .items { - background: white; + background: white; } .hover { @@ -22,12 +19,12 @@ } .widget { - border: 1px solid #D2D9EB; - margin-top: 10px; - margin-bottom: 10px; - margin-right: 5px; - margin-left: 5px; - overflow: hidden; + border: 1px solid #D2D9EB; + margin-top: 10px; + margin-bottom: 10px; + margin-right: 5px; + margin-left: 5px; + overflow: hidden; } .widgetHover { @@ -43,11 +40,11 @@ font-weight: bold; padding-bottom: 4px; } + .handleHover { background: #E6E6F5; } - .widgetTitle { font-size: 14pt; margin-left: 25px; @@ -75,16 +72,16 @@ .dialog { display: none; - padding:20px 10px; - color:#7A0101; - cursor:wait; - font-size:1.2em; - font-weight:bold; - text-align:center; + padding: 20px 10px; + color: #7A0101; + cursor: wait; + font-size: 1.2em; + font-weight: bold; + text-align: center; } .menu { - display: none; + display: none; border: 2px solid #FCB842; background: white; } @@ -92,7 +89,7 @@ .helper { width: 33%; opacity: .6; - filter : alpha(opacity=60); /*for IE*/ + filter: alpha(opacity = 60); /*for IE*/ } .dummyHandle { @@ -100,6 +97,7 @@ } .menuItem { + } .menuSelected { @@ -114,9 +112,9 @@ .widgetLoading { cursor: wait; - padding:10px; - text-align:center; - font-size:10pt; + padding: 10px; + text-align: center; + font-size: 10pt; } #menuTitleBar { @@ -133,7 +131,7 @@ } .subMenu { - float:left; + float: left; margin: 30px; } @@ -141,9 +139,11 @@ cursor: default; margin-left: 50px; } + #sub2.subMenu { cursor: pointer; } + #sub3.subMenu { float: right; width: 40% @@ -159,7 +159,7 @@ ul#widgetList { list-style-type: none; line-height: 25px; } - + .subMenuItem span { color: black; } @@ -180,16 +180,16 @@ ul#widgetList { .previewDiv { height: 200px; } - + #previewLoading { font-size: 14pt; font-weight: bold; } -.widget input{ - background:#F7F7FF none repeat scroll 0% 50%; - border:1px solid #B3B3B3; - color:#0C183A; - font-size:0.7em; - padding:2px; -} +.widget input { + background: #F7F7FF none repeat scroll 0% 50%; + border: 1px solid #B3B3B3; + color: #0C183A; + font-size: 0.7em; + padding: 2px; +}
\ No newline at end of file diff --git a/plugins/Home/Controller.php b/plugins/Home/Controller.php index 7290a01dda..0ed36d4ea6 100644 --- a/plugins/Home/Controller.php +++ b/plugins/Home/Controller.php @@ -1,22 +1,22 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_Home
- *
- */
-
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_Home + * + */ + require_once "API/Request.php"; -require_once "ViewDataTable.php";
-
-/**
- *
- * @package Piwik_Home
+require_once "ViewDataTable.php"; + +/** + * + * @package Piwik_Home */ class Piwik_Home_Controller extends Piwik_Controller { @@ -24,7 +24,7 @@ class Piwik_Home_Controller extends Piwik_Controller { return 'redirectToIndex'; } - function redirectToIndex()
+ function redirectToIndex() { $sitesId = Piwik_SitesManager_API::getSitesIdWithAtLeastViewAccess(); if(!empty($sitesId)) @@ -45,7 +45,7 @@ class Piwik_Home_Controller extends Piwik_Controller Piwik_FrontController::dispatch('Login'); } } - exit;
+ exit; } protected function setGeneralVariablesView($view) diff --git a/plugins/Home/templates/datatable.css b/plugins/Home/templates/datatable.css index 61033f8083..db0c4f5a47 100644 --- a/plugins/Home/templates/datatable.css +++ b/plugins/Home/templates/datatable.css @@ -1,18 +1,21 @@ /* container of each table */ .parentDiv { - width:450px; /* not more than 450px to make sure 2 of them can fit horizontally on a 1024 screen */ + width: 450px; + /* not more than 450px to make sure 2 of them can fit horizontally on a 1024 screen */ } + .parentDivActions { - width:500px; + width: 500px; } + .parentDivGraph { - width:500px; + width: 500px; } + .parentDivGraphEvolution { - width:100%; + width: 100%; } - /* main data table */ table.dataTable { width: 100%; @@ -20,32 +23,30 @@ table.dataTable { border-collapse: collapse; border-spacing: 0; margin: 0; - font-size:0.9em; + font-size: 0.9em; } -table.dataTable td.label, -table.subDataTable td.label, -table.dataTableActions td.label { - width:100%; +table.dataTable td.label,table.subDataTable td.label,table.dataTableActions td.label + { + width: 100%; } -table.dataTable img, -table.subDataTable img, -table.dataTableActions img { +table.dataTable img,table.subDataTable img,table.dataTableActions img { vertical-align: middle; } + table.dataTable img { - border:0; - margin-right:1em; - margin-left:0.5em; -} -table.dataTable tr.subDataTable{ - cursor:pointer; + border: 0; + margin-right: 1em; + margin-left: 0.5em; } +table.dataTable tr.subDataTable { + cursor: pointer; +} table.dataTable th { - margin:0; + margin: 0; color: #6D929B; border-right: 1px solid #C1DAD7; border-bottom: 1px solid #C1DAD7; @@ -55,25 +56,27 @@ table.dataTable th { padding: 6px 6px 6px 12px; background: #D4E3ED url(images/bg_header.jpg) no-repeat; } + table.dataTable th.columnSorted { - font-weight:bold; - padding-right:20px; + font-weight: bold; + padding-right: 20px; } table.dataTable td { border-right: 1px solid #C1DAD7; border-bottom: 1px solid #C1DAD7; - border-left:0; + border-left: 0; padding: 5px 5px 5px 12px; background: #fff; } -table.dataTable td, table.dataTable td a { - margin:0; - text-decoration:none; + +table.dataTable td,table.dataTable td a { + margin: 0; + text-decoration: none; color: #4f6b72; } -table.dataTable td.labeleven, table.dataTable td.columneven { +table.dataTable td.labeleven,table.dataTable td.columneven { background: #F9FAFA; } @@ -91,83 +94,81 @@ table.dataTable td.labelodd { background: #fff url(images/bullet1.gif) no-repeat; } -table.dataTable td.label, -table.subActionsDataTable td.label, -table.actionsDataTable td.label { +table.dataTable td.label,table.subActionsDataTable td.label,table.actionsDataTable td.label + { border-top: 0; - border-left:1px solid #C1DAD7; + border-left: 1px solid #C1DAD7; } + table.dataTable th.label { - border-left:1px solid #C1DAD7; + border-left: 1px solid #C1DAD7; } - /* the cell containing the subdatatable */ table.dataTable .cellSubDataTable { - border-left:1px solid #C1DAD7; - padding:0; - margin:0; + border-left: 1px solid #C1DAD7; + padding: 0; + margin: 0; } - /* A link in a column in the DataTable */ table.dataTable td #urlLink { - display:none; + display: none; } -/* SUBDATATABLE */ -/* a datatable inside another datatable */ +/* SUBDATATABLE */ /* a datatable inside another datatable */ table.subDataTable { - background:#FFFFFF; - width:95%; - border-top:1px solid #e5eff8; - border-right:1px solid #e5eff8; + background: #FFFFFF; + width: 95%; + border-top: 1px solid #e5eff8; + border-right: 1px solid #e5eff8; margin: 10px; } table.subDataTable td { - border:0; + border: 0; } + table.subDataTable thead th { - - font-weight:normal; - font-size:1.1em; - text-align:left; - border:0; - border:1px solid #D1D1D1; - padding:.3em 1em; - color:#333333; + font-weight: normal; + font-size: 1.1em; + text-align: left; + border: 0; + border: 1px solid #D1D1D1; + padding: .3em 1em; + color: #333333; background: #FFE9C6; } - -table.subDataTable td.labeleven, -table.subDataTable td.labelodd { - background-image:none; +table.subDataTable td.labeleven,table.subDataTable td.labelodd { + background-image: none; } + table.subDataTable td { - border-bottom:1px solid #E5E5E5; - border-left:1px solid #E5E5E5; + border-bottom: 1px solid #E5E5E5; + border-left: 1px solid #E5E5E5; } -table.subDataTable td, table.subDataTable td a { - padding:0.3em 1em; - color:#615B53; + +table.subDataTable td,table.subDataTable td a { + padding: 0.3em 1em; + color: #615B53; } -table.subDataTable td.labeleven, table.subDataTable td.columneven { - color:#2D2A27; +table.subDataTable td.labeleven,table.subDataTable td.columneven { + color: #2D2A27; } table.subDataTable td.label { - width:80%; + width: 80%; } -table.subDataTable td.labelodd, table.subDataTable td.labelodd a{ - background:#ffffff; +table.subDataTable td.labelodd,table.subDataTable td.labelodd a { + background: #ffffff; } /* misc SPAN and DIV */ table thead div { + } #sortIconContainer { @@ -180,56 +181,64 @@ table thead div { } #dataTablePages { - color:#E1E1E1; - font-weight:bold; - margin:10px; - font-size:0.9em; + color: #E1E1E1; + font-weight: bold; + margin: 10px; + font-size: 0.9em; } + #dataTableSearchPattern { - display:inline; - white-space:nowrap; + display: inline; + white-space: nowrap; } + #dataTableSearchPattern input { font-size: 0.7em; - padding:2px; - border:1px solid #B3B3B3; - color:#0C183A; + padding: 2px; + border: 1px solid #B3B3B3; + color: #0C183A; } -#dataTableSearchPattern input:hover{ - background:#F7F7FF none repeat scroll 0%; + +#dataTableSearchPattern input:hover { + background: #F7F7FF none repeat scroll 0%; } + #dataTableSearchPattern #keyword { - background:transparent url(images/search.png) no-repeat scroll 4px center; - padding:3px 3px 3px 20px; + background: transparent url(images/search.png) no-repeat scroll 4px + center; + padding: 3px 3px 3px 20px; } -#dataTableExcludeLowPopulation, #dataTableNext, #dataTablePrevious { + +#dataTableExcludeLowPopulation,#dataTableNext,#dataTablePrevious { font-size: 0.9em; color: #184A83; - text-decoration:underline; - cursor:pointer; + text-decoration: underline; + cursor: pointer; } .subDataTable#dataTableFeatures { padding-top: 0px; padding-bottom: 5px; - width:100%; + width: 100%; } #dataTableFeatures { - padding-top:10px; - padding-bottom:10px; - width:100%; - text-align:center; + padding-top: 10px; + padding-bottom: 10px; + width: 100%; + text-align: center; } -#dataTableExcludeLowPopulation{ - float:right; - font-size:0.8em; - color:#C3C6D8; - text-align:right; +#dataTableExcludeLowPopulation { + float: right; + font-size: 0.8em; + color: #C3C6D8; + text-align: right; } -#dataTableNext, #dataTablePrevious, #dataTableSearchPattern, #loadingDataTable { - display:none; + +#dataTableNext,#dataTablePrevious,#dataTableSearchPattern,#loadingDataTable + { + display: none; } .subDataTable #exportDataTable { @@ -248,20 +257,20 @@ table thead div { #exportDataTableShow { float: right; } - -#exportDataTable,#exportDataTable a{ - text-decoration:none; - color:#8894B1; + +#exportDataTable,#exportDataTable a { + text-decoration: none; + color: #8894B1; } .dataTableSpacer { - clear: both; + clear: both; } - + #loadingDataTable { font-size: 1em; - color:#193B6C; - padding:0.5em; + color: #193B6C; + padding: 0.5em; } #tooltip { @@ -275,50 +284,56 @@ table thead div { font-size: 0.7em; } - /* Actions table */ table.dataTableActions tr td.labelodd { - background-image:none; + background-image: none; } /* levels higher than 4 have a default padding left */ -tr.subActionsDataTable td.label, tr.actionsDataTable td.label{ - padding-left:7em; +tr.subActionsDataTable td.label,tr.actionsDataTable td.label { + padding-left: 7em; } -tr.level0 td.label{ - padding-left:+1.5em; + +tr.level0 td.label { + padding-left: +1.5em; } -tr.level1 td.label{ - padding-left:+3.5em; + +tr.level1 td.label { + padding-left: +3.5em; } -tr.level2 td.label{ - padding-left:+5.5em; + +tr.level2 td.label { + padding-left: +5.5em; } -tr.level3 td.label{ - padding-left:+6.5em; + +tr.level3 td.label { + padding-left: +6.5em; } -tr.level4 td.label{ - padding-left:+7em; + +tr.level4 td.label { + padding-left: +7em; } tr td.label img.plusMinus { - margin-left:-1em; - margin-right:0em; + margin-left: -1em; + margin-right: 0em; } /* graph form containing embed code */ -.formEmbedCode, .formEmbedCode input, .formEmbedCode a { +.formEmbedCode,.formEmbedCode input,.formEmbedCode a { font-size: 11px; - text-decoration : none; + text-decoration: none; } + .formEmbedCode input { background-color: #FBFDFF; - border: 1px solid #ECECEC; + border: 1px solid #ECECEC; } + #emptyDatatable { - padding-top:20px; - padding-bottom:10px; - text-align:center; - font-size:0.9em; + padding-top: 20px; + padding-bottom: 10px; + text-align: center; + font-size: 0.9em; font-style: italic; }
\ No newline at end of file diff --git a/plugins/Home/templates/links_misc_modules.tpl b/plugins/Home/templates/links_misc_modules.tpl index c870389e0f..062edc38c6 100644 --- a/plugins/Home/templates/links_misc_modules.tpl +++ b/plugins/Home/templates/links_misc_modules.tpl @@ -2,9 +2,7 @@ <ul>
<li><a href='?module=API&action=listAllAPI'>API examples</a></li>
<li>Embed Piwik widgets everywhere: <a href='?module=Widgetize'>Widgetize!</a></li>
- <li><a href='?module=PluginsAdmin'>Admin plugins</a></li>
- <li><a href='?module=SitesManager'>Admin websites</a></li>
- <li><a href='?module=UsersManager'>Admin users</a></li>
+ <li><a href='?module=AdminHome'>Administration</a></li>
<li><a href='?module=SitesManager&action=displayJavascriptCode&idsite={$idSite}'>Show the javascript code to insert</a></li>
</ul>
</span>
\ No newline at end of file diff --git a/plugins/Home/templates/menu.css b/plugins/Home/templates/menu.css index 7efb4280ea..0fea52ce73 100644 --- a/plugins/Home/templates/menu.css +++ b/plugins/Home/templates/menu.css @@ -1,101 +1,111 @@ -.nav, .nav * { - margin:0; - padding:0; +.nav,.nav * { + margin: 0; + padding: 0; } + .nav { padding-bottom: 2.5em; - height:2.5em; + height: 2.5em; float: left; - line-height:1.0; - margin-bottom:1.5em; - position:relative; + line-height: 1.0; + margin-bottom: 1.5em; + position: relative; } + .nav ul { - background:#fff; /*IE6 needs this*/ + background: #fff; /*IE6 needs this*/ float: left; - position:relative; + position: relative; } + /* LEVEL1 NORMAL */ .nav li { - background:#DFE6FF; - border-left:1px solid #fff; + background: #DFE6FF; + border-left: 1px solid #fff; float: left; - list-style:none; - z-index:999; + list-style: none; + z-index: 999; } + .nav li.current ul { z-index: 999; } -.nav li.sfHover ul, -ul.nav li:hover ul { + +.nav li.sfHover ul,ul.nav li:hover ul { z-index: 1000; } + /* LEVEL2 NORMAL */ .nav li li { - background:#FBFFFF; + background: #FBFFFF; border-left-color: #AABDE6; } + .nav a { - border-bottom:1px solid #CFDEFF; + border-bottom: 1px solid #CFDEFF; color: #13a; - display:block; + display: block; float: left; padding: .75em 0 .75em 1em; - text-decoration:none; - width:8em; + text-decoration: none; + width: 8em; } + .nav li ul { - left:0; - top:-999em; - position:absolute; - width:48em; + left: 0; + top: -999em; + position: absolute; + width: 48em; } + /* LEVEL1 HOVER */ -.nav li:hover, -.nav li.sfHover, -.nav li.current, -.nav a:focus, .nav a:hover, .nav a:active { - background:#C9D5FF; +.nav li:hover,.nav li.sfHover,.nav li.current,.nav a:focus,.nav a:hover,.nav a:active + { + background: #C9D5FF; } + .nav li { - font-weight: normal; + font-weight: normal; } + .nav li.sfHover { - font-weight: bold; + font-weight: bold; } + /* LEVEL2 HOVER */ -.nav li li:hover, -.nav li li.sfHover, -.nav li li a:focus, .nav li li a:hover, .nav li li a:active { - background:#C9F6FF; +.nav li li:hover,.nav li li.sfHover,.nav li li a:focus,.nav li li a:hover,.nav li li a:active + { + background: #C9F6FF; font-weight: bold; } -.nav li.sfHover a, -.nav li.current a, -.nav a:focus, .nav a:hover, .nav a:active { + +.nav li.sfHover a,.nav li.current a,.nav a:focus,.nav a:hover,.nav a:active + { border-bottom: none; } + .nav li li.current a { font-weight: bold; } -.nav li:hover ul, /* pure CSS hover is removed below */ -body .nav li.current ul, /* this must be more specific than the .superfish override below */ -ul.nav li.sfHover ul { - top:2.5em; + +.nav li:hover ul, /* pure CSS hover is removed below */ body .nav li.current ul, + /* this must be more specific than the .superfish override below */ ul.nav li.sfHover ul + { + top: 2.5em; } -.nav li:hover li ul, -.nav li.sfHover li ul { - top:-999em; +.nav li:hover li ul,.nav li.sfHover li ul { + top: -999em; } -.nav li li:hover ul, /* pure CSS hover is removed below */ -ul.nav li li.sfHover ul { - top:2.5em; + +.nav li li:hover ul, /* pure CSS hover is removed below */ ul.nav li li.sfHover ul + { + top: 2.5em; } + /*following rule negates pure CSS hovers so submenu remains hidden and JS controls when and how it appears*/ -.superfish li:hover ul, -.superfish li li:hover ul { +.superfish li:hover ul,.superfish li li:hover ul { top: -999em; }
\ No newline at end of file diff --git a/plugins/PluginsAdmin/Controller.php b/plugins/PluginsAdmin/Controller.php index 44b9a3e28f..3bc15b6bb3 100644 --- a/plugins/PluginsAdmin/Controller.php +++ b/plugins/PluginsAdmin/Controller.php @@ -25,7 +25,7 @@ class Piwik_PluginsAdmin_Controller extends Piwik_Controller $loadedPlugins = Piwik_PluginsManager::getInstance()->getLoadedPlugins(); $plugins = array(); -// var_dump($loadedPlugins); + foreach($listPlugins as $pluginName) { $oPlugin = Piwik_PluginsManager::getInstance()->loadPlugin($pluginName); @@ -48,7 +48,7 @@ class Piwik_PluginsAdmin_Controller extends Piwik_Controller $pluginName = Piwik_Common::getRequestVar('pluginName', null, 'string'); Piwik_PluginsManager::getInstance()->deactivatePlugin($pluginName); - Piwik::redirectToModule('PluginsAdmin', 'index'); + Piwik_Url::redirectToUrl('?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin'); } function activate() @@ -57,8 +57,8 @@ class Piwik_PluginsAdmin_Controller extends Piwik_Controller $pluginName = Piwik_Common::getRequestVar('pluginName', null, 'string'); Piwik_PluginsManager::getInstance()->activatePlugin($pluginName); - - Piwik::redirectToModule('PluginsAdmin', 'index'); + + Piwik_Url::redirectToUrl('?module=AdminHome&action=showInContext&moduleToLoad=PluginsAdmin'); } } diff --git a/plugins/PluginsAdmin/PluginsAdmin.php b/plugins/PluginsAdmin/PluginsAdmin.php index 42b1a021e1..e8fe0e9d2a 100644 --- a/plugins/PluginsAdmin/PluginsAdmin.php +++ b/plugins/PluginsAdmin/PluginsAdmin.php @@ -25,3 +25,6 @@ class Piwik_PluginsAdmin extends Piwik_Plugin } } + +Piwik_AddAdminMenu('Plugins', array('module' => 'PluginsAdmin')); + diff --git a/plugins/PluginsAdmin/templates/manage.tpl b/plugins/PluginsAdmin/templates/manage.tpl index 11849fbe41..033c1793b9 100644 --- a/plugins/PluginsAdmin/templates/manage.tpl +++ b/plugins/PluginsAdmin/templates/manage.tpl @@ -1,24 +1,31 @@ -Test +<link rel="stylesheet" href="themes/default/common-admin.css"> -<table border=1 cellpadding=5> +<h2>Plugins</h2> -<tr> +<table id="plugins"> + +<thead> <th>Name</th> <th>Description</th> <th>Author</th> <th>Version</th> <th>Action</th> -</tr> -{foreach from=$pluginsName key=name item=plugin} +</thead>
+ +<tbody> + {foreach from=$pluginsName key=name item=plugin} -<tr> +{if $plugin.activated}<tr class="activate">{else}<tr class="deactivate">{/if} <td><b>{$name}</b></td> <td>{$plugin.info.description} </td> - <td><a href="{$plugin.info.homepage}">{$plugin.info.author}</a></td> + <td class="center"><a href="{$plugin.info.homepage}">{$plugin.info.author}</a></td> <td>{$plugin.info.version}</td> - <td>{if $plugin.activated}<a href=?module=PluginsAdmin&action=deactivate&pluginName={$name}>Deactivate</a> - {else}<a href=?module=PluginsAdmin&action=activate&pluginName={$name}>Activate</a>{/if}</td> -</tr> -{/foreach} + <td class="switch">{if $plugin.activated}<a href=?module=PluginsAdmin&action=deactivate&pluginName={$name}>Deactivate</a> +{else}<a href=?module=PluginsAdmin&action=activate&pluginName={$name}>Activate</a>{/if}</td> + </tr> +{/foreach}
-</table>
\ No newline at end of file +</tbody> +</table> +
+<p><a href='?module=Home'>Back to Piwik homepage</a></p>
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index 008699bc22..08cffe774e 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -12,23 +12,25 @@ /**
*
* @package Piwik_SitesManager
- */ -class Piwik_SitesManager extends Piwik_Plugin -{ - public function getInformation() - { - $info = array( - // name must be the className prefix! - 'name' => 'SitesManager', - 'description' => 'Description', - 'author' => 'Piwik', - 'homepage' => 'http://piwik.org/', - 'version' => '0.1', - 'translationAvailable' => false, - ); - - return $info; - } - -} - + */
+class Piwik_SitesManager extends Piwik_Plugin
+{
+ public function getInformation()
+ {
+ $info = array(
+ // name must be the className prefix!
+ 'name' => 'SitesManager',
+ 'description' => 'Description',
+ 'author' => 'Piwik',
+ 'homepage' => 'http://piwik.org/',
+ 'version' => '0.1',
+ 'translationAvailable' => false,
+ );
+
+ return $info;
+ }
+
+}
+
+Piwik_AddAdminMenu('Sites', array('module' => 'SitesManager'));
+
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl index abd8291cfd..9ced665119 100644 --- a/plugins/SitesManager/templates/SitesManager.tpl +++ b/plugins/SitesManager/templates/SitesManager.tpl @@ -17,7 +17,7 @@ You don't have any website to administrate. {else} <table id="editSites" border=1 cellpadding="10"> - <thead> + <thead> <tr> <th>Id</th> <th>Name</th> @@ -34,12 +34,12 @@ <td id="siteName" class="editableSite">{$site.name}</td> <td id="urls" class="editableSite">{foreach from=$site.alias_urls item=url}{$url}<br>{/foreach}</td> <td><img src='plugins/UsersManager/images/edit.png' class="editSite" id="row{$i}" href='#'></td> - <td><img src='plugins/UsersManager/images/remove.png' class="deleteSite" id="row{$i}" value="Delete"></td> - <td><a href='{url action=displayJavascriptCode idsite=$site.idsite}'>Show Code</a></td> + <td><img src='plugins/UsersManager/images/remove.png' class="deleteSite" id="row{$i}" value="Delete"></td> + <td><a href='{url actionToLoad=displayJavascriptCode idsite=$site.idsite}'>Show Code</a></td> </tr> {/foreach} - </tbody> + </tbody> </table> <div id="addRowSite"><img src='plugins/UsersManager/images/add.png'> <a href="#">Add a new Site</a></div> {/if} @@ -48,3 +48,4 @@ <p><a href='?module=Home'>Back to Piwik homepage</a></p> + diff --git a/plugins/UsersManager/UsersManager.php b/plugins/UsersManager/UsersManager.php index 88f2dcbd70..0bebe1726b 100644 --- a/plugins/UsersManager/UsersManager.php +++ b/plugins/UsersManager/UsersManager.php @@ -1,17 +1,17 @@ -<?php
-/**
- * Piwik - Open source web analytics
- *
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- *
- * @package Piwik_UsersManager
- */
-
-/**
- *
- * @package Piwik_UsersManager
+<?php +/** + * Piwik - Open source web analytics + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later + * @version $Id$ + * + * @package Piwik_UsersManager + */ + +/** + * + * @package Piwik_UsersManager */ class Piwik_UsersManager extends Piwik_Plugin { @@ -32,3 +32,6 @@ class Piwik_UsersManager extends Piwik_Plugin } +Piwik_AddAdminMenu('Users', array('module' => 'UsersManager')); + + diff --git a/plugins/UsersManager/templates/UsersManager.tpl b/plugins/UsersManager/templates/UsersManager.tpl index c08d2867d5..cdb136d523 100644 --- a/plugins/UsersManager/templates/UsersManager.tpl +++ b/plugins/UsersManager/templates/UsersManager.tpl @@ -21,17 +21,16 @@ <h2>Manage access</h2> <div id="sites"> -<form method="get" action="{$formUrl}" id="accessSites"> - <input type="hidden" name="module" value="UsersManager"> +<form method="post" action="{url actionToLoad=index}" id="accessSites"> <p>Sites: <select id="selectIdsite" name="idsite" onchange="this.form.submit()"> <optgroup label="All websites"> - <option label="All websites" value="-1" {if $idSiteSelected==-1} selected="selected"{/if}>Apply to all websites</option> + <option label="All websites" value="-1" {if $idSiteSelected==-1} selected="selected"{/if}>Apply to all websites</option> </optgroup> <optgroup label="Sites"> - {foreach from=$websites item=info} - <option value="{$info.idsite}" {if $idSiteSelected==$info.idsite} selected="selected"{/if}>{$info.name}</option> - {/foreach} + {foreach from=$websites item=info} + <option value="{$info.idsite}" {if $idSiteSelected==$info.idsite} selected="selected"{/if}>{$info.name}</option> + {/foreach} </optgroup> </select></p> @@ -65,9 +64,9 @@ <div id="accessUpdated">Done!</div> <div class="dialog" id="confirm"> - <p>Are you sure you want to change '<span id='login'></span>' permissions on all the websites?</p> - <input id="yes" type="button" value="Yes"/> - <input id="no" type="button" value="No"/> + <p>Are you sure you want to change '<span id='login'></span>' permissions on all the websites?</p> + <input id="yes" type="button" value="Yes"/> + <input id="no" type="button" value="No"/> </div> <h2>Manage users</h2> @@ -76,35 +75,35 @@ <div id="ajaxLoading" style="display:none">Loading... <img src="themes/default/loading.gif"></div> <table id="users"> <thead> - <tr> - <th>Login</th> - <th>Password</th> - <th>Email</th> - <th>Alias</th> - <th>token_auth</th> - <th>Edit</th> - <th>Delete</th> - </tr> + <tr> + <th>Login</th> + <th>Password</th> + <th>Email</th> + <th>Alias</th> + <th>token_auth</th> + <th>Edit</th> + <th>Delete</th> + </tr> </thead> <tbody> - {foreach from=$users item=user key=i} - {if $user.login != 'anonymous'} - <tr class="editable" id="row{$i}"> - <td id="userLogin" class="editable">{$user.login}</td> - <td id="password" class="editable">-</td> - <td id="email" class="editable">{$user.email}</td> - <td id="alias" class="editable">{$user.alias}</td> - <td id="alias">{$user.token_auth}</td> - <td><img src='plugins/UsersManager/images/edit.png' class="edituser" id="row{$i}" href='#'></td> - <td><img src='plugins/UsersManager/images/remove.png' class="deleteuser" id="row{$i}" value="Delete"></td> - </tr> - {/if} - {/foreach} + {foreach from=$users item=user key=i} + {if $user.login != 'anonymous'} + <tr class="editable" id="row{$i}"> + <td id="userLogin" class="editable">{$user.login}</td> + <td id="password" class="editable">-</td> + <td id="email" class="editable">{$user.email}</td> + <td id="alias" class="editable">{$user.alias}</td> + <td id="alias">{$user.token_auth}</td> + <td><img src='plugins/UsersManager/images/edit.png' class="edituser" id="row{$i}" href='#'></td> + <td><img src='plugins/UsersManager/images/remove.png' class="deleteuser" id="row{$i}" value="Delete"></td> + </tr> + {/if} + {/foreach} </tbody> - -</table> +</table>
+ <div id="addrow"><img src='plugins/UsersManager/images/add.png'> <a href="#">Add a new user</a></div> <script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script> -<p><a href='?module=Home'>Back to Piwik homepage</a></p>
\ No newline at end of file +<p><a href='?module=Home'>Back to Piwik homepage</a></p> diff --git a/themes/default/common-admin.css b/themes/default/common-admin.css index 8f2ba5ce92..c1aa8d4e14 100644 --- a/themes/default/common-admin.css +++ b/themes/default/common-admin.css @@ -1,91 +1,180 @@ - * { -font-family:Trebuchet MS,arial,sans-serif; + font-family: Trebuchet MS, arial, sans-serif; } -textarea{ +textarea { font-family: Trebuchet MS, Verdana; - font-size:0.85em; - + font-size: 0.85em; } -#editSites{ - valign:top; +#editSites { + valign: top; } -#access td, #users td -{ +#access td,#users td { spacing: 0px; - padding: 2px 5px 5px 4px; - border: 1px solid #660000; - width:100px; + padding: 2px 5px 5px 4px; + border: 1px solid #660000; + width: 100px; } +#plugins td { + spacing: 0px; + padding: 5px 5px 5px 4px; + border: 1px solid #660000; + width: 100px; +} -#ajaxError{ - color:red; - text-align:center; - font-weight:bold; - width:550px; +#ajaxError { + color: red; + text-align: center; + font-weight: bold; + width: 550px; border: 3px solid red; - margin: 10px; + margin: 10px; padding: 10px; } -#accessUpdated{ - color:red; - text-align:center; - font-weight:bold; - width:350px; - margin: 10px; +#accessUpdated { + color: red; + text-align: center; + font-weight: bold; + width: 350px; + margin: 10px; padding: 10px; - display:none; - border:3px solid green; - color:green; + display: none; + border: 3px solid green; + color: green; } + #addrow img { - vertical-align:middle; + vertical-align: middle; } + #addrow a { - text-decoration:none; + text-decoration: none; +} + +#logo h1 { + font-family: Georgia, "Times New Roman", Times, serif; + font-weight: normal; + color: #136F8B; + font-size: 48px; + text-transform: none; +} + +#logo .description { + font-family: Georgia, "Times New Roman", Times, serif; + font-weight: normal; + color: #879dbd; + font-size: 25px; } table { - font-size:0.9em; - font-family: Arial, Helvetica, verdana sans-serif; - background-color:#fff; - border-collapse: collapse; + font-size: 0.9em; + font-family: Arial, Helvetica, verdana sans-serif; + background-color: #fff; + border-collapse: collapse; } + thead th { - border-right: 1px solid #fff; - color:#fff; - text-align:center; - padding:2px; - text-transform:uppercase; - height:25px; - background-color: #a3c159; - font-weight: normal; + border-right: 1px solid #fff; + color: #fff; + text-align: center; + padding: 2px; + text-transform: uppercase; + height: 25px; + background-color: #a3c159; + font-weight: normal; } + tbody tr { - background-color:#fff; - border-bottom: 1px solid #f0f0f0; + background-color: #fff; + border-bottom: 1px solid #f0f0f0; } + tbody td { - color:#414141; - padding:5px; - text-align:left; + color: #414141; + padding: 5px; + text-align: left; } + tbody th { - text-align:left; - padding:2px; -} -tbody td, tbody th{ - color:#6C8C37; - text-decoration:none; - font-weight:normal; - padding-left:15px; -} -tbody td:hover, tbody th:hover { - color:#009193; - text-decoration:none; + text-align: left; + padding: 2px; +} + +tbody td,tbody th { + color: #6C8C37; + text-decoration: none; + font-weight: normal; + padding-left: 15px; +} + +tbody td:hover,tbody th:hover { + color: #009193; + text-decoration: none; +} + +.activate { + background-color: #fefefe; +} + +.deactivate { + background-color: #ddd; +} + +.activate .switch,.deactivate .switch,.center { + text-align: center; +} + +.activate .switch a,.deactivate .switch a { + padding: 2px; + text-decoration: none; + color: #2f381a; + font-weight: bold; +} + +.activate .switch a:hover { + padding: 2px; + background-color: red; + color: #fff; + text-decoration: none; +} + +.deactivate .switch a:hover { + padding: 2px; + background-color: #666; + color: #fff; + text-decoration: none; +} + +#submit input { + font-size: 2em; + border-top: 2px solid #8cb648; + border-left: 2px solid #8cb648; + border-bottom: 2px solid #4a6026; + border-right: 2px solid #4a6026; + background-color: #6c8c37; + color: #fff; +} + +#submit { + padding-top: 10px; + padding-left: 70px; +} + +.warning { + border: 1px dotted gray; + padding: 15px; + font-size: .8em; +} + +.warning ul { + margin-left: 50px; +} + +.access_error { + font-size: .7em; + padding: 15px; }
\ No newline at end of file diff --git a/themes/default/login.tpl b/themes/default/login.tpl index 3114127992..a8aee64af6 100644 --- a/themes/default/login.tpl +++ b/themes/default/login.tpl @@ -1,5 +1,67 @@ +<link rel="stylesheet" href="themes/default/common-admin.css"> +<div style="width:520px;margin:auto;padding-top:40px;"> + + <div id="logo"> + <h1>Piwik <span class="description"># open source web analytics</span></h1> + + </div> + +<div style="border: 1px solid #ddd;padding:15px;"> + {if $AccessErrorString} -<b>{$AccessErrorString}</b> +<div class="access_error">{$AccessErrorString}</div> +{/if} + +{if $form_data.errors} + <div class="warning"> + <div style="float:left;margin-right:20px;margin-bottom:40px;"><img src="themes/default/images/warning_medium.png"></div> + <div> + <strong>Please fix the following errors:</strong> + <ul> + {foreach from=$form_data.errors item=data} + <li>{$data}</li> + {/foreach} + </ul> + </div> + </div> +{/if} + +{* +{if isset($form_text)} +<p>{$form_text}</p> {/if} +*} + +<form {$form_data.attributes}> +<!-- Output hidden fields --> + +<!-- Display the fields --> +{foreach from=$element_list key=title item=data} + <h3>{$title}</h3> + + <table> + {foreach from=$data item=fieldname} + {* normal form *} + {if $form_data.$fieldname.label} + <tr> + <td>{$form_data.$fieldname.label}</td> + <td>{$form_data.$fieldname.html}</td> + + {elseif $form_data.$fieldname.type == 'hidden'} + {$form_data.$fieldname.html} + {/if}</tr> + {/foreach} + </table> + +{/foreach} + +<div id="submit"> +{$form_data.submit.html} +</div> + +</form> + + +</div> -{include file=genericForm.tpl}
\ No newline at end of file +</div> |