Right.. only macros.vm should have changed. I Fixed it.
Ludovic
Sergiu Dumitriu wrote:
> Any reason why these files were changed? If not, they should be rolled back.
>
> ludovic (SVN) wrote:
>
>> Author: ludovic
>> Date: 2009-01-01 11:57:53 +0100 (Thu, 01 Jan 2009)
>> New Revision: 14999
>>
>> Modified:
>> platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
>> platform/web/trunk/standard/src/main/webapp/templates/attachwysiwyg.vm
>> platform/web/trunk/standard/src/main/webapp/templates/macros.vm
>>
>> platform/web/trunk/standard/src/main/webapp/templates/uploadattachwysiwyg.vm
>> Log:
>> XWIKI-3060 Adding Google calendar velocity macros to the core
>>
>> Modified:
>> platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
>> ===================================================================
>> ---
>> platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
>> 2009-01-01 10:56:59 UTC (rev 14998)
>> +++
>> platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
>> 2009-01-01 10:57:53 UTC (rev 14999)
>> @@ -31,7 +31,7 @@
>> <div id="_attachments">
>> #if($attachments.size()>0)
>> #foreach ($attach in $attachments)
>> - <div class="attachment #if($velocityCount % 2 == 0) even #else odd
>> #end">
>> + <div class="displayers #if($velocityCount % 2 == 0) even #else odd
>> #end">
>> <span
>> class="mime">#mimetypeimg($attach.getMimeType().toLowerCase()
>> $attach.getFilename().toLowerCase())</span>
>> <div class="information">
>> <span class="name"><a
>> href="$doc.getAttachmentURL("${attach.filename}", "download")"
>> title="$msg.get("downloadthisattachment")">#packName($attach.filename)</a></span>
>>
>> Modified:
>> platform/web/trunk/standard/src/main/webapp/templates/attachwysiwyg.vm
>> ===================================================================
>> --- platform/web/trunk/standard/src/main/webapp/templates/attachwysiwyg.vm
>> 2009-01-01 10:56:59 UTC (rev 14998)
>> +++ platform/web/trunk/standard/src/main/webapp/templates/attachwysiwyg.vm
>> 2009-01-01 10:57:53 UTC (rev 14999)
>> @@ -9,7 +9,7 @@
>> <br /><br />
>> $msg.get("choosefiletoupload"):
>> <input type="file" name="filepath" value="" size="40" /> <br /><br />
>> - <input type="submit" id="attachment" name="attachment"
>> value="$msg.get("attachthisfile")" />
>> + <input type="submit" id="displayers" name="displayers"
>> value="$msg.get("attachthisfile")" />
>> </p>
>> </form>
>> #set($counter=0)
>>
>
>
>> Modified:
>> platform/web/trunk/standard/src/main/webapp/templates/uploadattachwysiwyg.vm
>> ===================================================================
>> ---
>> platform/web/trunk/standard/src/main/webapp/templates/uploadattachwysiwyg.vm
>> 2009-01-01 10:56:59 UTC (rev 14998)
>> +++
>> platform/web/trunk/standard/src/main/webapp/templates/uploadattachwysiwyg.vm
>> 2009-01-01 10:57:53 UTC (rev 14999)
>> @@ -7,6 +7,6 @@
>> $msg.get("choosefiletoupload"):
>> <input type="file" name="filepath" value="" size="40" /> <br /><br />
>> #set($action = $doc.getURL("upload"))
>> - <input type="button" id="attachment" name="attachment"
>> onclick="updateAttachName(document.forms.attach);
>> document.forms.attach.action = '$action' ; document.forms.attach.submit();"
>> value="$msg.get("attachthisfile")" />
>> + <input type="button" id="displayers" name="displayers"
>> onclick="updateAttachName(document.forms.attach);
>> document.forms.attach.action = '$action' ; document.forms.attach.submit();"
>> value="$msg.get("attachthisfile")" />
>> </p>
>> </div>
>> \ No newline at end of file
>>
>
>
>
--
Ludovic Dubost
Blog: http://blog.ludovic.org/
XWiki: http://www.xwiki.com
Skype: ldubost GTalk: ldubost
_______________________________________________
devs mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/devs
