Menu
▾
▴
[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[27938] trunk
|
From: <sy...@us...> - 2010-07-12 11:34:50
|
Revision: 27938
http://tikiwiki.svn.sourceforge.net/tikiwiki/?rev=27938&view=rev
Author: sylvieg
Date: 2010-07-12 11:34:40 +0000 (Mon, 12 Jul 2010)
Log Message:
-----------
[MRG] Automatic merge, branches/5.x 27926 to 27937
Modified Paths:
--------------
trunk/lang/de/language.php
trunk/lib/setup/sections.php
trunk/lib/wiki-plugins/wikiplugin_trackerlist.php
trunk/styles/darkroom.css
trunk/styles/jqui/options/excitebike.css
trunk/styles/layout/design.css
trunk/styles/ohia.css
trunk/templates/tiki-browse_gallery.tpl
trunk/templates/tiki-browse_image.tpl
trunk/templates/tiki-edit_image.tpl
trunk/templates/tiki-upload_file.tpl
trunk/templates/tiki-upload_file_progress.tpl
trunk/templates/tiki-view_tracker_item.tpl
trunk/templates/tracker_pretty_item.tpl
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-27926
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/proposals/4.x:24005
+ /branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-27937
/branches/experimental/big-blue-button:26681-26698
/branches/experimental/declfilter:15787-16031
/branches/experimental/edit_fixup:20923-21573
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/proposals/4.x:24005
Modified: trunk/lang/de/language.php
===================================================================
--- trunk/lang/de/language.php 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/lang/de/language.php 2010-07-12 11:34:40 UTC (rev 27938)
@@ -1,4 +1,4 @@
-<?php // -*- coding:utf-8 -*-
+<?php // -*- coding:utf-8 -*-
// (c) Copyright 2002-2010 by authors of the Tiki Wiki/CMS/Groupware Project
//
// All Rights Reserved. See copyright.txt for details and a complete list of authors.
@@ -2255,7 +2255,7 @@
// "Traditional Chinese" => "Traditional Chinese",
// "Ukrainian" => "Ukrainian",
// "Vietnamese" => "Vietnamese",
-// "Template %s not registered" => "Template %s not registered",
+"Template %s not registered" => "Vorlage %s nicht registriert",
// "Error line: %d" => "Error line: %d",
// "anonymous" => "anonymous",
// "Administration" => "Administration",
@@ -2265,7 +2265,7 @@
// "Blogs" => "Blogs",
// "FAQs" => "FAQs",
// "survey" => "survey",
-// "(not registered)" => "(not registered)",
+"(not registered)" => "(nicht registriert)",
// "You have mistyped the anti-bot verification code; please try again" => "You have mistyped the anti-bot verification code; please try again",
// "Please wait %d seconds between posts" => "Please wait %d seconds between posts",
// "Invalid Email" => "Invalid Email",
@@ -2347,7 +2347,7 @@
// "Impossible to open %s : %s" => "Impossible to open %s : %s",
// "The content retrieved at %s is not a list of mods" => "The content retrieved at %s is not a list of mods",
// "Can't chdir to '%s'" => "Can't chdir to '%s'",
-// "%s impossible to remove" => "%s impossible to remove",
+"%s impossible to remove" => "%s kann nicht gelöscht werden",
// "Description not available" => "Description not available",
// "Module Title" => "Module Title",
// "Title to display at the top of the box" => "Title to display at the top of the box",
@@ -2486,10 +2486,10 @@
// "First day of the week" => "First day of the week",
// "Depends user language" => "Depends user language",
// "Split hours in periods of" => "Split hours in periods of",
-// "1 minute" => "1 minute",
-// "10 minutes" => "10 minutes",
-// "15 minutes" => "15 minutes",
-// "30 minutes" => "30 minutes",
+"1 minute" => "1 Minute",
+"10 minutes" => "10 Minuten",
+"15 minutes" => "15 Minuten",
+"30 minutes" => "30 Minuten",
// "First year in the dropdown" => "First year in the dropdown",
// "Enter a year or use +/- N to specify a year relative to the current year" => "Enter a year or use +/- N to specify a year relative to the current year",
// "Last year in the dropdown" => "Last year in the dropdown",
@@ -3438,7 +3438,7 @@
// "0 for no cache" => "0 for no cache",
// "Inline plugin %0" => "Inline plugin %0",
// "Wysiwyg Editor is optional" => "Wysiwyg Editor is optional",
-// "... and is displayed by default" => "... and is displayed by default",
+"... and is displayed by default" => "... und wird standardmäßig angezeigt",
// "Reopen with the same editor" => "Reopen with the same editor",
// "Content is parsed like wiki page" => "Content is parsed like wiki page",
// "Content is partially parsed" => "Content is partially parsed",
@@ -5829,7 +5829,7 @@
// "There are no wiki pages similar to '{\$page}'" => "There are no wiki pages similar to '{\$page}'",
// "Go to Log in Page" => "Go to Log in Page",
// "Change them here" => "Change them here",
-// "(page will be orphaned)" => "(page will be orphaned)",
+"(page will be orphaned)" => "(Seite wird verwaist sein)",
// "Close Window" => "Close Window",
// "Go to" => "Go to",
// "Private Gallery" => "Private Gallery",
@@ -5905,7 +5905,7 @@
// "User Tracker" => "User Tracker",
// "Go to your friendship network to accept or refuse this request" => "Go to your friendship network to accept or refuse this request",
// "You're invited to join my network of friends" => "You're invited to join my network of friends",
-// "Bye bye from %s at %s" => "Bye bye from %s at %s",
+"Bye bye from %s at %s" => "Auf Wiedersehen von %s an %s",
// "Welcome to %s at %s" => "Welcome to %s at %s",
// "Reply notification" => "Reply notification",
// "Someone" => "Someone",
@@ -5914,7 +5914,7 @@
// "Please click on the following link to confirm you wish to reset your password and go to the screen where you must enter a new \"permanent\" password. Please pick a password only you will know, and don't share it with anyone else" => "Please click on the following link to confirm you wish to reset your password and go to the screen where you must enter a new \"permanent\" password. Please pick a password only you will know, and don't share it with anyone else",
// "Important: Username & password are CaSe SenSitiVe" => "Important: Username & password are CaSe SenSitiVe",
// "Important: The old password remains active if you don't click the link above" => "Important: The old password remains active if you don't click the link above",
-// "New article submitted at %s" => "New article submitted at %s",
+"New article submitted at %s" => "Neuer Artikel eingereicht am %s",
// "Look at this link" => "Look at this link",
// "A friend sends you a link from: " => "A friend sends you a link from: ",
// "ItemID {\$mail_itemId} was deleted in the tracker {\$mail_trackerName}" => "ItemID {\$mail_itemId} was deleted in the tracker {\$mail_trackerName}",
@@ -5947,7 +5947,7 @@
// "removed" => "removed",
// "Old" => "Old",
// "updated" => "updated",
-// "File Gallery %s changed" => "File Gallery %s changed",
+"File Gallery %s changed" => "Dateiverzeichnis %s geändert",
// "A file was removed from the file gallery" => "A file was removed from the file gallery",
// "File Name" => "File Name",
// "A new file was posted to file gallery" => "A new file was posted to file gallery",
@@ -7212,8 +7212,8 @@
// "FlashPlugin min version" => "FlashPlugin min version",
// "ex" => "ex",
// "Remove Zones (you lose entered info for the banner)" => "Remove Zones (you lose entered info for the banner)",
-// "A category is mandatory" => "A category is mandatory",
-// "Display Options" => "Display Options",
+"A category is mandatory" => "Eine Kategorie ist obligatorisch",
+"Display Options" => "Optionen Anzeige",
// "Display titles in blog posts" => "Display titles in blog posts",
// "Display author in blog posts" => "Display author in blog posts",
// "Display published date in blog posts" => "Display published date in blog posts",
@@ -7252,7 +7252,7 @@
// "Monospace font" => "Monospace font",
// "Code sample" => "Code sample",
// "Line break" => "Line break",
-// "(very useful especially in tables)" => "(very useful especially in tables)",
+"(very useful especially in tables)" => "(sehr nützlich, vor allem in Tabellen)",
// "to separate pages" => "to separate pages",
// "Prevents wiki parsing of the enclosed data" => "Prevents wiki parsing of the enclosed data",
// "~pp~ data ~/pp~ Displays preformated text/code; no Wiki processing is done inside these sections (as with np), and the spacing is fixed (no word wrapping is done). ~pre~ data ~/pre~ also displayes preformatted text with fixed spacing, but wiki processing still occurs on the text" => "~pp~ data ~/pp~ Displays preformated text/code; no Wiki processing is done inside these sections (as with np), and the spacing is fixed (no word wrapping is done). ~pre~ data ~/pre~ also displayes preformatted text with fixed spacing, but wiki processing still occurs on the text",
@@ -7290,20 +7290,20 @@
// "and its subpages from the structure" => "and its subpages from the structure",
// "The page already exists. The page that has been added to the structure is the existing one" => "The page already exists. The page that has been added to the structure is the existing one",
// "The following pages added have automatically been categorized with the same categories as the structure" => "The following pages added have automatically been categorized with the same categories as the structure",
-// "Monitor the Sub-Structure" => "Monitor the Sub-Structure",
-// "Stop Monitoring the Sub-Structure" => "Stop Monitoring the Sub-Structure",
+"Monitor the Sub-Structure" => "Sub-Struktur beobachten",
+"Stop Monitoring the Sub-Structure" => "Beobachtung Sub-Struktur beenden",
// "Promote" => "Promote",
// "Demote" => "Demote",
-// "Move in this structure" => "Move in this structure",
-// "Move to another structure" => "Move to another structure",
-// "at the beginning" => "at the beginning",
-// "at the end" => "at the end",
+"Move in this structure" => "verschieben in diese Struktur",
+"Move to another structure" => "verschieben in andere Struktur",
+"at the beginning" => "am Anfang",
+"at the end" => "am Ende",
// "Categorize all pages in structure together" => "Categorize all pages in structure together",
// "Remove existing categories from ALL pages before recategorizing" => "Remove existing categories from ALL pages before recategorizing",
// "<b>*</b>=optional" => "<b>*</b>=optional",
-// "<b>Topline</b>=small line above Title" => "<b>Topline</b>=small line above Title",
-// "<b>Subtitle</b>=small line below Title" => "<b>Subtitle</b>=small line below Title",
-// "<b>Source</b>=URL to article source" => "<b>Source</b>=URL to article source",
+"<b>Topline</b>=small line above Title" => "<b>Kopfzeile</b>=schmale Zeile über Titel",
+"<b>Subtitle</b>=small line below Title" => "<b>Untertitel</b>=schmale Zeile unter Titel",
+"<b>Source</b>=URL to article source" => "<b>Quelltext</b>=URL zum Artikel-Quelltext",
// "If you go to edit this (or any other TPL file) file via the Tiki built-in TPL editor below, all the javascript can be sanitized or completely stripped out by Tiki security filtering" => "If you go to edit this (or any other TPL file) file via the Tiki built-in TPL editor below, all the javascript can be sanitized or completely stripped out by Tiki security filtering",
// "This would cause you problems (e.g. menus can stop collapsing/expanding)" => "This would cause you problems (e.g. menus can stop collapsing/expanding)",
// "You should only modify default header.tpl and other important files via text code editor, through console, or SSH, or FTP edit commands. And only if you know what you are doing ! ;-)" => "You should only modify default header.tpl and other important files via text code editor, through console, or SSH, or FTP edit commands. And only if you know what you are doing ! ;-)",
@@ -7651,12 +7651,12 @@
// "Your OpenID identity is valid" => "Your OpenID identity is valid",
// "Your identity gives you access to multiple user accounts" => "Your identity gives you access to multiple user accounts",
// "Select account" => "Select account",
-// "{\$atts|@count} files attached" => "{\$atts|@count} files attached",
+"{\$atts|@count} files attached" => "{\$atts|@count} angehängte Dateien",
// "Show Edit Sessions" => "Show Edit Sessions",
// "Show All Versions" => "Show All Versions",
// "Preview of version" => "Preview of version",
// "(current)" => "(current)",
-// "Rollback to this version" => "Rollback to this version",
+"Rollback to this version" => "diese Version wider herstellen",
// "Source of version" => "Source of version",
// "Updated from" => "Updated from",
// "Used to update" => "Used to update",
@@ -8200,8 +8200,8 @@
// "You cannot mix old and new trackers" => "You cannot mix old and new trackers",
// "Requested action is not supported on repository" => "Requested action is not supported on repository",
// "Requested action in not supported on repository" => "Requested action in not supported on repository",
-// "Mail-in account %s incorrect" => "Mail-in account %s incorrect",
-// "Mail-in account %s saved" => "Mail-in account %s saved",
+"Mail-in account %s incorrect" => "Mail-in Konto %s fehlerhaft",
+"Mail-in account %s saved" => "Mail-in Konto %s gespeichert",
// "Frequency should be a positive integer" => "Frequency should be a positive integer",
// "Mail-in accounts set to be checked every %s minutes" => "Mail-in accounts set to be checked every %s minutes",
// "Automatic Mail-in accounts checking disabled" => "Automatic Mail-in accounts checking disabled",
@@ -8277,8 +8277,8 @@
// "%s %s assigned to %s %s" => "%s %s assigned to %s %s",
// "group %s set as the default group of user %s" => "group %s set as the default group of user %s",
// "Login contains invalid characters" => "Login contains invalid characters",
-// "%s changed from %s to %s" => "%s changed from %s to %s",
-// "Impossible to change %s from %s to %s" => "Impossible to change %s from %s to %s",
+"%s changed from %s to %s" => "%s geändert von %s auf %s",
+"Impossible to change %s from %s to %s" => "Nicht möglich zu ändern %s von %s zu %s",
// "Please go back and try again" => "Please go back and try again",
// "approved by " => "approved by ",
// "This function is only for staging pages" => "This function is only for staging pages",
@@ -8352,7 +8352,7 @@
// "Form error - no server-side filename entered for selected import method" => "Form error - no server-side filename entered for selected import method",
// "Last replied forum topics" => "Last replied forum topics",
// "Not supported yet" => "Not supported yet",
-// "Accepted friendship request from %s" => "Accepted friendship request from %s",
+"Accepted friendship request from %s" => "akzeptiert Bitte zur Freundschaft von %s",
// "Refused friendship request from %s" => "Refused friendship request from %s",
// "Canceled friendship request with %s" => "Canceled friendship request with %s",
// "Broke friendship with %s" => "Broke friendship with %s",
@@ -8425,7 +8425,7 @@
// "I do not know where is gdaltindex. Set correctly the Map feature" => "I do not know where is gdaltindex. Set correctly the Map feature",
// " to " => " to ",
// "No page provided" => "No page provided",
-// "Page \"%0\" does not exist" => "Page \"%0\" does not exist",
+"Page \"%0\" does not exist" => "Seite \"%0\" nicht vorhanden",
// "This Tikiwiki site is prepared for access from a lot of mobile devices, e.g. WAP phones, PDA's, i-mode devices and much more" => "This Tikiwiki site is prepared for access from a lot of mobile devices, e.g. WAP phones, PDA's, i-mode devices and much more",
// "You can browse this site on your mobile device by directing your device's browser towards the following URL here on this site" => "You can browse this site on your mobile device by directing your device's browser towards the following URL here on this site",
// "tiki-mobile.php" => "tiki-mobile.php",
@@ -8466,7 +8466,7 @@
// "Cannot rename page because the new name begins with reserved prefix" => "Cannot rename page because the new name begins with reserved prefix",
// "Cannot rename page because maybe new staging page name already exists" => "Cannot rename page because maybe new staging page name already exists",
// "Error Message" => "Error Message",
-// "Tiki RSS Feed Error Message: \$errmsg" => "Tiki RSS Feed Error Message: \$errmsg",
+"Tiki RSS Feed Error Message: \$errmsg" => "Tiki RSS Feed Fehlermeldung: \$errmsg",
// "A problem occured during file uploading" => "A problem occured during file uploading",
// "File which was causing trouble was at rank" => "File which was causing trouble was at rank",
// "The error was" => "The error was",
@@ -8478,7 +8478,7 @@
// "Notice: this variable may not be empty" => "Notice: this variable may not be empty",
// "Notice: invalid variable value" => "Notice: invalid variable value",
// "Spreadsheet - " => "Spreadsheet - ",
-// "You do not have permission to edit messages \$owner" => "You do not have permission to edit messages \$owner",
+"You do not have permission to edit messages \$owner" => "Sie haben keine Berechtigung, diese Nachrichten zu bearbeiten \$owner",
// "Clean the sql logs" => "Clean the sql logs",
// "Send a link to a friend " => "Send a link to a friend ",
// "Your email is mandatory" => "Your email is mandatory",
Modified: trunk/lib/setup/sections.php
===================================================================
--- trunk/lib/setup/sections.php 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/lib/setup/sections.php 2010-07-12 11:34:40 UTC (rev 27938)
@@ -194,8 +194,15 @@
}
function current_object() {
- global $section, $sections, $cat_type, $cat_objid;
+ global $section, $sections, $cat_type, $cat_objid, $postId;
+ if ($section == 'blogs' && !empty($postId)) { // blog post check the category on the blog - but freetags are on blog post
+ return array(
+ 'type' => 'blog post',
+ 'object' => $postId,
+ );
+ }
+
if( $cat_type && $cat_objid ) {
return array(
'type' => $cat_type,
Modified: trunk/lib/wiki-plugins/wikiplugin_trackerlist.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_trackerlist.php 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/lib/wiki-plugins/wikiplugin_trackerlist.php 2010-07-12 11:34:40 UTC (rev 27938)
@@ -792,7 +792,14 @@
if (!empty($infoComputed)) {
$allfields['data'][$i] = array_merge($infoComputed, $allfields['data'][$i]);
}
- }
+ } elseif ($allfields["data"][$i]['type'] == 'w') {
+ /* keep track of dynamic list items referring to user selectors */
+ $refFieldId = $allfields["data"][$i]['options_array'][3];
+ $refField = $trklib->get_tracker_field($refFieldId);
+ if ($refField['type'] == 'u') {
+ $allfields["data"][$i]['type'] = $refField['type'];
+ }
+ }
if ((in_array($allfields["data"][$i]['fieldId'],$listfields) or in_array($allfields["data"][$i]['fieldId'],$popupfields))and $allfields["data"][$i]['isPublic'] == 'y') {
$passfields["{$allfields["data"][$i]['fieldId']}"] = $allfields["data"][$i];
}
Modified: trunk/styles/darkroom.css
===================================================================
--- trunk/styles/darkroom.css 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/styles/darkroom.css 2010-07-12 11:34:40 UTC (rev 27938)
@@ -810,6 +810,10 @@
float: right;
}
+.inline_syntax {
+ color: orange;
+}
+
/**** Boxes *****/
/** Modules **/
Modified: trunk/styles/jqui/options/excitebike.css
===================================================================
--- trunk/styles/jqui/options/excitebike.css 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/styles/jqui/options/excitebike.css 2010-07-12 11:34:40 UTC (rev 27938)
@@ -194,7 +194,9 @@
.box-data a,
.box-data a:visited,
.wikitext a,
-.wikitext a:visited {
+.wikitext a:visited,
+table.normal a.link,
+table.normal a {
color: #e69700;
}
@@ -202,7 +204,7 @@
.rbox-data {
background: url(../../../lib/jquery/jquery-ui/themes/excite-bike/images/ui-bg_diagonals-small_25_c5ddfc_40x40.png) repeat scroll 50% 50%;
border: 1px solid #E69700;
- color: #fff;
+ color: #e8a119;
}
.rbox-title {
@@ -249,11 +251,6 @@
font-weight: bold;
}
-table.normal a.link,
-table.normal a {
-
-}
-
tr.odd td,
td.odd,
li.odd {
Modified: trunk/styles/layout/design.css
===================================================================
--- trunk/styles/layout/design.css 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/styles/layout/design.css 2010-07-12 11:34:40 UTC (rev 27938)
@@ -248,6 +248,11 @@
padding: 0;
}
+.inline_syntax {
+ font-family: "Lucida Console";
+ color: brown;
+}
+
/* New Toolbars */
.textarea-toolbar > div {
Modified: trunk/styles/ohia.css
===================================================================
--- trunk/styles/ohia.css 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/styles/ohia.css 2010-07-12 11:34:40 UTC (rev 27938)
@@ -143,7 +143,7 @@
#col3 input[type="text"],
#col3 input[type="password"] {width: 90%}
-input[type="file"] {color: #000}
+input[type="file"] {color: #cfcfcf}
span.button a,
@@ -424,6 +424,10 @@
/****** Misc. Global ****/
+.inline_syntax {
+ color: orange;
+}
+
/***** Boxes *****/
/** Modules **/
div.box {
Modified: trunk/templates/tiki-browse_gallery.tpl
===================================================================
--- trunk/templates/tiki-browse_gallery.tpl 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/templates/tiki-browse_gallery.tpl 2010-07-12 11:34:40 UTC (rev 27938)
@@ -193,40 +193,45 @@
{/if}
<table class="normal noslideshow">
-<tr>
- <td class="even">
- <small>
- {tr}You can view this gallery's configured image (first, random, etc.) in your browser using{/tr}:<br /><br />
- <a class="gallink" href="{$base_url}show_image.php?galleryId={$galleryId}">{$base_url}show_image.php?galleryId={$galleryId}</a><br />
- </small>
- </td>
-</tr>
-<tr>
- <td class="even">
- <small>
- {tr}You can include the gallery's image in an HTML page using one of these lines{/tr}:<br /><br />
- {if $resultscale == $defaultscale}
- <img src="{$base_url}show_image.php?galleryId={$galleryId}" /><br />
- {elseif !$resultscale}
- <img src="{$base_url}show_image.php?galleryId={$galleryId}" /><br />
- {else}
- <img src="{$base_url}show_image.php?galleryId={$galleryId}" /><br />
- {/if}
- </small>
- </td>
-</tr>
-<tr>
- <td class="even">
- <small>
- {tr}You can include the image in a tiki page using one of these lines{/tr}:<br /><br />
- {if $resultscale == $defaultscale}
- {literal}{{/literal}img src=show_image.php?galleryId={$galleryId} {literal}}{/literal}<br />
- {elseif !$resultscale}
- {literal}{{/literal}img src=show_image.php?galleryId={$galleryId} {literal}}{/literal}<br />
- {else}
- {literal}{{/literal}img src={$base_url}show_image.php?galleryId={$galleryId} {literal}}{/literal}<br />
- {/if}
- </small>
- </td>
-</tr>
+ <tr>
+ <td class="even" colspan="2" style="border:0px; font-size:x-small">
+ {tr}You can view this gallery's configured image (first, random, etc.) in your browser using{/tr}:
+ </td>
+ <tr>
+ <td width="6px" style="border:0px">
+ </td>
+ <td style="border:0px; font-size:x-small">
+ <a class="gallink" href="{$base_url}show_image.php?galleryId={$galleryId}">
+ {$base_url}show_image.php?galleryId={$galleryId}
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td class="even" style="border-bottom:0px; font-size:x-small" colspan="2">
+ {tr}You can include the gallery's image in an HTML page using{/tr}:
+ </td>
+ </tr>
+ <tr>
+ <td style="border:0px" width="6px"></td>
+ <td style="border:0px; font-size:x-small">
+ <span class="inline_syntax">
+ <img src="{$base_url}show_image.php?galleryId={$galleryId}" />
+ </span>
+ </td>
+ </tr>
+ <tr>
+ <td class="even" style="border-bottom:0px; font-size:x-small" colspan="2">
+ {tr}You can include the image in a tiki page using{/tr}:
+ </td>
+ <tr>
+ <td width="6px" style="border:0px">
+ </td>
+ <td class="inline_syntax" style="border:0px; font-size:x-small">
+ {if $resultscale == $defaultscale or !$resultscale}
+ {literal}{{/literal}img src=show_image.php?galleryId={$galleryId} {literal}}{/literal}<br />
+ {else}
+ {literal}{{/literal}img src={$base_url}show_image.php?galleryId={$galleryId} {literal}}{/literal}<br />
+ {/if}
+ </td>
+ </tr>
</table>
Modified: trunk/templates/tiki-browse_image.tpl
===================================================================
--- trunk/templates/tiki-browse_image.tpl 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/templates/tiki-browse_image.tpl 2010-07-12 11:34:40 UTC (rev 27938)
@@ -96,79 +96,101 @@
{if !$popup}
{$smarty.capture.buttons}
{/if}
-
{if $popup eq ""}
- <br /><br />
- <table class="normal noslideshow">
- <tr><td class="odd">{tr}Image Name{/tr}:</td><td class="odd">{$name}</td></tr>
- <tr><td class="even">{tr}Created{/tr}:</td><td class="even">{$created|tiki_long_datetime}</td></tr>
- <tr><td class="odd">{tr}Image size{/tr}:</td><td class="odd">{$xsize}x{$ysize}</td></tr>
- <tr><td class="even">{tr}Image Scale{/tr}:</td><td class="even">{if $resultscale}{$xsize_scaled}x{$ysize_scaled}{else}{tr}Original Size{/tr}{/if}</td></tr>
- <tr><td class="odd">{tr}Hits{/tr}:</td><td class="odd">{$hits}</td></tr>
- <tr><td class="even">{tr}Description{/tr}:</td><td class="even">{$description}</td></tr>
- {if $prefs.feature_maps eq 'y' and $gal_info.geographic eq 'y'}
- <tr><td class="odd">{tr}Latitude (WGS84/decimal degrees){/tr}:</td><td class="odd">{$lat|escape}</td></tr>
- <tr><td class="even">{tr}Longitude (WGS84/decimal degrees){/tr}:</td><td class="even">{$lon|escape}</td></tr>
- {/if}
- <tr><td class="odd">{tr}Author{/tr}:</td><td class="odd">{$image_user|userlink}</td></tr>
- {if $tiki_p_admin_galleries eq 'y' or ($user and $user eq $owner)}
- <tr><td class="even">{tr}Move image{/tr}:</td><td class="odd">
- <form action="tiki-browse_image.php" method="post">
- <input type="hidden" name="scalesize" value="{$scalesize|escape}" />
- <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"/>
- <input type="hidden" name="imageId" value="{$imageId|escape}"/>
- <input type="hidden" name="galleryId" value="{$galleryId|escape}"/>
- <input type="text" name="newname" value="{$name}" />
- <select name="newgalleryId">
- {section name=idx loop=$galleries}
- <option value="{$galleries[idx].id|escape}" {if $galleries[idx].id eq $galleryId}selected="selected"{/if}>{$galleries[idx].name}</option>
- {/section}
- </select>
- <input type="submit" name="move_image" value="{tr}Move{/tr}" />
- </form>
- </td></tr>
- {/if}
- </table>
- <br /><br />
- <table class="normal noslideshow">
- <tr>
- <td class="even">
- <small>
- {tr}Include the image in a tiki page using the following syntax{/tr}:<br />
- {if $resultscale == $defaultscale}
- <tt style="color: brown;line-height: 200%">{literal}{{/literal}img id={$imageId}{literal}}{/literal}</tt><br />
- {elseif !$resultscale}
- <tt style="color: brown;line-height: 200%">{literal}{{/literal}img id={$imageId}&scalesize=0){literal}}{/literal}</tt><br />
- {else}
- <tt style="color: brown;line-height: 200%">{literal}{{/literal}img id={$imageId}&scaled&scalesize={$resultscale}{literal}}{/literal}</tt><br />
- {/if}
- </small>
- </td>
- </tr>
- <tr>
- <td class="even">
- <small>
- {tr}To include the image in an HTML page{/tr}:<br />
- {if $resultscale == $defaultscale}
- <tt style="color: brown;line-height: 200%"><img src="{$url_show}?id={$imageId}" /></tt><br />
- {elseif !$resultscale}
- <tt style="color: brown;line-height: 200%"><img src="{$url_show}?id={$imageId}&scalesize=0" /></tt><br />
- {else}
- <tt style="color: brown;line-height: 200%"><img src="{$url_show}?id={$imageId}&scalesize={$resultscale}" /></tt><br />
- {/if}
- </small>
- </td>
- </tr>
- <tr>
- <td class="even">
- <small>
- {tr}To link to this page from another tiki page{/tr}:<br />
- <tt style="color: brown;line-height: 200%">{literal}[{/literal}tiki-browse_image.php?imageId={$imageId}{literal}]{/literal}</tt><br />
- </small>
- </td>
- </tr>
- </table>
+ <br /><br />
+ <table class="normal noslideshow">
+ <tr><td class="odd">{tr}Image Name{/tr}:</td><td class="odd">{$name}</td></tr>
+ <tr><td class="even">{tr}Created{/tr}:</td><td class="even">{$created|tiki_long_datetime}</td></tr>
+ <tr><td class="odd">{tr}Image size{/tr}:</td><td class="odd">{$xsize}x{$ysize}</td></tr>
+ <tr><td class="even">{tr}Image Scale{/tr}:</td><td class="even">{if $resultscale}{$xsize_scaled}x{$ysize_scaled}{else}{tr}Original Size{/tr}{/if}</td></tr>
+ <tr><td class="odd">{tr}Hits{/tr}:</td><td class="odd">{$hits}</td></tr>
+ <tr><td class="even">{tr}Description{/tr}:</td><td class="even">{$description}</td></tr>
+ {if $prefs.feature_maps eq 'y' and $gal_info.geographic eq 'y'}
+ <tr><td class="odd">{tr}Latitude (WGS84/decimal degrees){/tr}:</td><td class="odd">{$lat|escape}</td></tr>
+ <tr><td class="even">{tr}Longitude (WGS84/decimal degrees){/tr}:</td><td class="even">{$lon|escape}</td></tr>
+ {/if}
+ <tr><td class="odd">{tr}Author{/tr}:</td><td class="odd">{$image_user|userlink}</td></tr>
+ {if $tiki_p_admin_galleries eq 'y' or ($user and $user eq $owner)}
+ <tr>
+ <td class="even">
+ {tr}Move image{/tr}:
+ </td>
+ <td class="odd">
+ <form action="tiki-browse_image.php" method="post">
+ <input type="hidden" name="scalesize" value="{$scalesize|escape}" />
+ <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"/>
+ <input type="hidden" name="imageId" value="{$imageId|escape}"/>
+ <input type="hidden" name="galleryId" value="{$galleryId|escape}"/>
+ <input type="text" name="newname" value="{$name}" />
+ <select name="newgalleryId">
+ {section name=idx loop=$galleries}
+ <option value="{$galleries[idx].id|escape}" {if $galleries[idx].id eq $galleryId}selected="selected"{/if}>{$galleries[idx].name}</option>
+ {/section}
+ </select>
+ <input type="submit" name="move_image" value="{tr}Move{/tr}" />
+ </form>
+ </td>
+ </tr>
+ {/if}
+ </table>
+ <br /><br />
+ <table class="normal noslideshow" style="font-size:small">
+ <tr>
+ <td class="even" style="border-bottom:0px" colspan="2">
+ {tr}Include the image in a tiki page using the following syntax{/tr}:
+ </td>
+ </tr>
+ <tr>
+ <td width="6px" style="border:0px">
+ </td>
+ <td style="border:0px">
+ <div class="inline_syntax">
+ {if $resultscale == $defaultscale}
+ {literal}{{/literal}img id={$imageId}{literal}}{/literal}
+ {elseif !$resultscale}
+ {literal}{{/literal}img id={$imageId}&scalesize=0){literal}}{/literal}
+ {else}
+ {literal}{{/literal}img id={$imageId}&scaled&scalesize={$resultscale}{literal}}{/literal}
+ {/if}
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="even" style="border-bottom:0px" colspan="2">
+ {tr}To include the image in an HTML page{/tr}:
+ </td>
+ </tr>
+ <tr>
+ <td width="10px" style="border:0px">
+ </td>
+ <td style="border:0px">
+ <div class="inline_syntax">
+ {if $resultscale == $defaultscale}
+ <img src="{$url_show}?id={$imageId}" />
+ {elseif !$resultscale}
+ <img src="{$url_show}?id={$imageId}&scalesize=0" />
+ {else}
+ <img src="{$url_show}?id={$imageId}&scalesize={$resultscale}" />
+ {/if}
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="even" style="border-bottom:0px" colspan="2">
+ {tr}To link to this page from another tiki page{/tr}:
+ </td>
+ </tr>
+ <tr>
+ <td width="6px" style="border:0px">
+ </td>
+ <td style="border:0px">
+ <div class="inline_syntax">
+ {literal}[{/literal}tiki-browse_image.php?imageId={$imageId}{literal}]{/literal}
+ </div>
+ </td>
+ </tr>
+ </table>
{/if}
</div> {* id="{$rootid}browse_image" *}
Modified: trunk/templates/tiki-edit_image.tpl
===================================================================
--- trunk/templates/tiki-edit_image.tpl 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/templates/tiki-edit_image.tpl 2010-07-12 11:34:40 UTC (rev 27938)
@@ -33,37 +33,98 @@
</table>
</form>
<br />
-<br /><br />
- <table class="normal">
- <tr>
- <td class="even">
- <small>
- {tr}You can view this image in your browser using{/tr}:<br /><br />
- <a class="gallink" href="{$url_browse}?imageId={$imageId}">{$url_browse}?imageId={$imageId}</a><br />
- </small>
- </td>
- </tr>
- <tr>
- <td class="even">
- <small>
- {tr}You can include the image in an HTML page using one of these lines{/tr}:<br /><br />
- <img src="show_image.php?id={$imageId}" /><br />
- <img src="show_image.php?name={$name|escape}&galleryId={$galleryId}" /><br />
- <img src="{$url_show}?id={$imageId}" /><br />
- <img src="{$url_show}?name={$name|escape}&galleryId={$galleryId}" /><br />
- </small>
- </td>
- </tr>
- <tr>
- <td class="even">
- <small>
- {tr}You can include the image in a tiki page using one of these lines{/tr}:<br /><br />
- {literal}{{/literal}img src="show_image.php?id={$imageId}" {literal}}{/literal}<br />
- {literal}{{/literal}img src="show_image.php?name={$name|escape}&galleryId={$galleryId}" {literal}}{/literal}<br />
- {literal}{{/literal}img src="{$url_show}?id={$imageId}" {literal}}{/literal}<br />
- {literal}{{/literal}img src="{$url_show}?name={$name|escape}&galleryId={$galleryId}" {literal}}{/literal}<br />
- </small>
- </td>
- </tr>
- </table>
+<br /><br />
+ <!--this table is a duplicate of the one in tiki-browse_image.tpl-->
+ <table class="normal noslideshow">
+ <tr><td class="odd">{tr}Image Name{/tr}:</td><td class="odd">{$name}</td></tr>
+ <tr><td class="even">{tr}Created{/tr}:</td><td class="even">{$created|tiki_long_datetime}</td></tr>
+ <tr><td class="odd">{tr}Image size{/tr}:</td><td class="odd">{$xsize}x{$ysize}</td></tr>
+ <tr><td class="even">{tr}Image Scale{/tr}:</td><td class="even">{if $resultscale}{$xsize_scaled}x{$ysize_scaled}{else}{tr}Original Size{/tr}{/if}</td></tr>
+ <tr><td class="odd">{tr}Hits{/tr}:</td><td class="odd">{$hits}</td></tr>
+ <tr><td class="even">{tr}Description{/tr}:</td><td class="even">{$description}</td></tr>
+ {if $prefs.feature_maps eq 'y' and $gal_info.geographic eq 'y'}
+ <tr><td class="odd">{tr}Latitude (WGS84/decimal degrees){/tr}:</td><td class="odd">{$lat|escape}</td></tr>
+ <tr><td class="even">{tr}Longitude (WGS84/decimal degrees){/tr}:</td><td class="even">{$lon|escape}</td></tr>
+ {/if}
+ <tr><td class="odd">{tr}Author{/tr}:</td><td class="odd">{$image_user|userlink}</td></tr>
+ {if $tiki_p_admin_galleries eq 'y' or ($user and $user eq $owner)}
+ <tr>
+ <td class="even">
+ {tr}Move image{/tr}:
+ </td>
+ <td class="odd">
+ <form action="tiki-browse_image.php" method="post">
+ <input type="hidden" name="scalesize" value="{$scalesize|escape}" />
+ <input type="hidden" name="sort_mode" value="{$sort_mode|escape}"/>
+ <input type="hidden" name="imageId" value="{$imageId|escape}"/>
+ <input type="hidden" name="galleryId" value="{$galleryId|escape}"/>
+ <input type="text" name="newname" value="{$name}" />
+ <select name="newgalleryId">
+ {section name=idx loop=$galleries}
+ <option value="{$galleries[idx].id|escape}" {if $galleries[idx].id eq $galleryId}selected="selected"{/if}>{$galleries[idx].name}</option>
+ {/section}
+ </select>
+ <input type="submit" name="move_image" value="{tr}Move{/tr}" />
+ </form>
+ </td>
+ </tr>
+ {/if}
+ </table>
+ <br /><br />
+ <table class="normal noslideshow" style="font-size:small">
+ <tr>
+ <td class="even" style="border-bottom:0px" colspan="2">
+ {tr}Include the image in a tiki page using the following syntax{/tr}:
+ </td>
+ </tr>
+ <tr>
+ <td width="6px" style="border:0px">
+ </td>
+ <td style="border:0px">
+ <div class="inline_syntax">
+ {if $resultscale == $defaultscale}
+ {literal}{{/literal}img id={$imageId}{literal}}{/literal}
+ {elseif !$resultscale}
+ {literal}{{/literal}img id={$imageId}&scalesize=0){literal}}{/literal}
+ {else}
+ {literal}{{/literal}img id={$imageId}&scaled&scalesize={$resultscale}{literal}}{/literal}
+ {/if}
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="even" style="border-bottom:0px" colspan="2">
+ {tr}To include the image in an HTML page{/tr}:
+ </td>
+ </tr>
+ <tr>
+ <td width="10px" style="border:0px">
+ </td>
+ <td style="border:0px">
+ <div class="inline_syntax">
+ {if $resultscale == $defaultscale}
+ <img src="{$url_show}?id={$imageId}" />
+ {elseif !$resultscale}
+ <img src="{$url_show}?id={$imageId}&scalesize=0" />
+ {else}
+ <img src="{$url_show}?id={$imageId}&scalesize={$resultscale}" />
+ {/if}
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td class="even" style="border-bottom:0px" colspan="2">
+ {tr}To link to this page from another tiki page{/tr}:
+ </td>
+ </tr>
+ <tr>
+ <td width="6px" style="border:0px">
+ </td>
+ <td style="border:0px">
+ <div class="inline_syntax">
+ {literal}[{/literal}tiki-browse_image.php?imageId={$imageId}{literal}]{/literal}
+ </div>
+ </td>
+ </tr>
+ </table>
</div>
Modified: trunk/templates/tiki-upload_file.tpl
===================================================================
--- trunk/templates/tiki-upload_file.tpl 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/templates/tiki-upload_file.tpl 2010-07-12 11:34:40 UTC (rev 27938)
@@ -139,7 +139,7 @@
<td><label for="userfile">{tr}Upload from disk:{/tr}</label></td>
<td>
{if $editFileId}{$fileInfo.filename|escape}{/if}
- <input id="userfile" name="userfile[]" type="file" size="15"/>
+ <input id="userfile" name="userfile[]" type="file" size="40"/>
</td>
{/if}
</tr>
Modified: trunk/templates/tiki-upload_file_progress.tpl
===================================================================
--- trunk/templates/tiki-upload_file_progress.tpl 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/templates/tiki-upload_file_progress.tpl 2010-07-12 11:34:40 UTC (rev 27938)
@@ -16,30 +16,68 @@
<a {$alink}><img src="{$fileId|sefurl:thumbnail}" /></a>
</td>
<td>
- {if !empty($filegals_manager)}
-
- <a {$alink}>{$name} ({$size|kbsize})</a>
- {else}
- <b>{$name} ({$size|kbsize})</b>
- {/if}
- {if $feedback_message != ''}
- <div class="upload_note">{$feedback_message}</div>
- {/if}
- {if empty($filegals_manager)}<div>
- {button href="#" _onclick="javascript:flip('uploadinfos$fileId');flip('close_uploadinfos$fileId','inline');return false;" _text="{tr}Additional Info{/tr}"}
- <span id="close_uploadinfos{$fileId}" style="display:none">
- {button href="#" _onclick="javascript:flip('uploadinfos$fileId');flip('close_uploadinfos$fileId','inline');return false;" _text="({tr}Hide{/tr})"}
- </span>
- </div>
- <div style="{if $prefs.javascript_enabled eq 'y'}display:none;{/if}" id="uploadinfos{$fileId}">
- <div style="font-style: italic; ">{tr} Syntax tips:{/tr}</div>
- <span style="line-height: 150%">{tr}Link to file from a Wiki page{/tr}:</span><br/> <tt style="color: brown;">[{$fileId|sefurl:file}|{$name}]</tt><br/>
- <div style="font-style: italic; margin-top: 10px">{tr}For image files:{/tr}</div>
- <span style="line-height: 150%">{tr}To display in a Wiki page{/tr}:</span><br/> <tt style="color: brown;">{img fileId={$fileId}}</tt><br/>
- {if $prefs.feature_shadowbox eq 'y'}
- <span style="line-height: 200%">{tr}Display thumbnail that enlarges{/tr}: </span><br/> <tt style="color: brown;">{img fileId={$fileId} thumb=y rel=box[g]}</tt><br/>
- {/if}
- </div>{/if}
+ {if !empty($filegals_manager)}
+ <a {$alink}>{$name} ({$size|kbsize})</a>
+ {else}
+ <b>{$name} ({$size|kbsize})</b>
+ {/if}
+ {if $feedback_message != ''}
+ <div class="upload_note">
+ {$feedback_message}
+ </div>
+ {/if}
+ {if empty($filegals_manager)}
+ <div>
+ {button href="#" _onclick="javascript:flip('uploadinfos$fileId');flip('close_uploadinfos$fileId','inline');return false;" _text="{tr}Additional Info{/tr}"}
+ <span id="close_uploadinfos{$fileId}" style="display:none">
+ {button href="#" _onclick="javascript:flip('uploadinfos$fileId');flip('close_uploadinfos$fileId','inline');return false;" _text="({tr}Hide{/tr})"}
+ </span>
+ </div>
+ <div style="{if $prefs.javascript_enabled eq 'y'}display:none;{/if}" id="uploadinfos{$fileId}">
+ <div style="font-weight:bold; font-style: italic; ">
+ {tr} Syntax tips:{/tr}
+ </div>
+ <span style="line-height: 150%">
+ { tr}Link to file from a Wiki page{/tr}:
+ </span><br/>
+ <table>
+ <tr>
+ <td width="6px">
+ </td>
+ <td class="inline_syntax">
+ [{$fileId|sefurl:file}|{$name}]
+ </td>
+ </tr>
+ </table>
+ <div style="font-weight:bold; font-style: italic; margin-top: 10px">
+ {tr}In addition, for image files:{/tr}
+ </div>
+ <span style="line-height: 150%">
+ {tr}To display in a Wiki page{/tr}:</span><br/>
+ <table>
+ <tr>
+ <td width="6px">
+ </td>
+ <td class="inline_syntax">
+ {img fileId={$fileId}}
+ </td>
+ </tr>
+ </table>
+ {if $prefs.feature_shadowbox eq 'y'}
+ <span style="line-height: 200%">{tr}Display thumbnail that enlarges{/tr}:
+ </span><br/>
+ <table>
+ <tr>
+ <td width="6px">
+ </td>
+ <td class="inline_syntax">
+ {img fileId={$fileId} thumb=y rel=box[g]}
+ </td>
+ </tr>
+ </table>
+ {/if}
+ </div>
+ {/if}
</td>
</tr>
</table>
Modified: trunk/templates/tiki-view_tracker_item.tpl
===================================================================
--- trunk/templates/tiki-view_tracker_item.tpl 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/templates/tiki-view_tracker_item.tpl 2010-07-12 11:34:40 UTC (rev 27938)
@@ -71,7 +71,7 @@
{assign var=stick value="n"}
{foreach from=$ins_fields key=ix item=cur_field}
- {if ($cur_field.isHidden ne 'y' or $tiki_p_admin_trackers eq 'y') and !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and empty($cur_field.cat) and $cur_field.type ne 's' and $cur_field.type ne 'h') and ($cur_field.type ne 'p' or $cur_field.options_array[0] ne 'password') and (empty($cur_field.visibleBy) or in_array($default_group, $cur_field.visibleBy) or $tiki_p_admin_trackers eq 'y')}
+ {if ($cur_field.isHidden ne 'y' or $tiki_p_admin_trackers eq 'y') and !($tracker_info.doNotShowEmptyField eq 'y' and empty($cur_field.value) and empty($cur_field.cat) and empty($cur_field.links) and $cur_field.type ne 'S' and $cur_field.type ne 's' and $cur_field.type ne 'h') and ($cur_field.type ne 'p' or $cur_field.options_array[0] ne 'password') and (empty($cur_field.visibleBy) or in_array($default_group, $cur_field.visibleBy) or $tiki_p_admin_trackers eq 'y')}
{if $cur_field.type eq 'h'}
</table>
<h2>{$cur_field.name|escape}</h2>
Modified: trunk/templates/tracker_pretty_item.tpl
===================================================================
--- trunk/templates/tracker_pretty_item.tpl 2010-07-12 10:12:52 UTC (rev 27937)
+++ trunk/templates/tracker_pretty_item.tpl 2010-07-12 11:34:40 UTC (rev 27938)
@@ -28,6 +28,7 @@
{set var=f_lastmodif value=$item.lastModif}
{set var=f_itemId value=$item.itemId}
{set var=f_status value=$item.status}
+{set var=f_itemUser value=$item.itemUser}
{* ------------------------------------ *}
{include file="$wiki" item=$item}
{/strip}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|