Author: dward
Date: 2008-01-17 23:59:55 +0100 (Thu, 17 Jan 2008)
New Revision: 6951
Added:
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
Removed:
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
Modified:
xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList
xwiki-products/curriki/trunk/wiki/src/main/resources/FW_masterFramework/History
Local
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/Translations
xwiki-products/curriki/trunk/wiki/src/main/resources/XWiki/Menu.it
xwiki-products/curriki/trunk/wiki/src/main/resources/package.xml
Log:
- Removed spaces from page names (ViewGroup and Messages)
- Other updates
Modified: xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList
===================================================================
--- xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList
2008-01-17 22:11:58 UTC (rev 6950)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/Admin/PageList
2008-01-17 22:59:55 UTC (rev 6951)
@@ -12,14 +12,14 @@
<customClass></customClass>
<contentAuthor>XWiki.dward</contentAuthor>
<creationDate>1168117384000</creationDate>
-<date>1200607575000</date>
-<contentUpdateDate>1200607575000</contentUpdateDate>
-<version>1.88</version>
+<date>1200610680000</date>
+<contentUpdateDate>1200610680000</contentUpdateDate>
+<version>1.89</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
<validationScript></validationScript>
-<comment>MyCurriki.Translations got missed</comment>
+<comment>Remove bad spaces</comment>
<object>
<class>
<name>XWiki.TagClass</name>
@@ -536,7 +536,7 @@
Groups.WebPreferences
Groups.CollectionsSheet
Groups.FeaturedGroups
-Groups.ViewGroup
+Groups.ViewGroup
Groups_TemplateSpace.Contributions
Groups_TemplateSpace.WebHome
Groups_TemplateSpace.Curriculum
@@ -547,5 +547,5 @@
Groups_TemplateSpace.InviteMembers
Groups_TemplateSpace.Members
Groups_TemplateSpace.Documentation
-Groups_TemplateSpace.Messages
-</content></xwikidoc>
\ No newline at end of file
+Groups_TemplateSpace.Messages</content>
+</xwikidoc>
Modified:
xwiki-products/curriki/trunk/wiki/src/main/resources/FW_masterFramework/History
Local
===================================================================
---
xwiki-products/curriki/trunk/wiki/src/main/resources/FW_masterFramework/History
Local 2008-01-17 22:11:58 UTC (rev 6950)
+++
xwiki-products/curriki/trunk/wiki/src/main/resources/FW_masterFramework/History
Local 2008-01-17 22:59:55 UTC (rev 6951)
@@ -11,9 +11,9 @@
<author></author>
<customClass></customClass>
<contentAuthor></contentAuthor>
-<creationDate>1200607595000</creationDate>
-<date>1200607595000</date>
-<contentUpdateDate>1200607595000</contentUpdateDate>
+<creationDate>1200610701000</creationDate>
+<date>1200610701000</date>
+<contentUpdateDate>1200610701000</contentUpdateDate>
<version>1.1</version>
<title></title>
<template></template>
Modified:
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/Translations
===================================================================
--- xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/Translations
2008-01-17 22:11:58 UTC (rev 6950)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/Translations
2008-01-17 22:59:55 UTC (rev 6951)
@@ -12,9 +12,9 @@
<customClass></customClass>
<contentAuthor>XWiki.jkl1231</contentAuthor>
<creationDate>1198492279000</creationDate>
-<date>1200605443000</date>
-<contentUpdateDate>1200605443000</contentUpdateDate>
-<version>1.213</version>
+<date>1200608660000</date>
+<contentUpdateDate>1200608660000</contentUpdateDate>
+<version>1.216</version>
<title></title>
<template></template>
<defaultTemplate></defaultTemplate>
@@ -157,7 +157,7 @@
groups_home_editmasthead_groupdescription_tooltip=When people browse or find
listings of Curriki groups, they first see your group
&quot;masthead,&quot; which includes this description along with your
group name and a group logo. (You add your logo by editing your group home tab
in the next step.)
-groups_home_editmasthead_logo_infotxt_withoutlogo=Your group masthead is
currently using the Curriki placeholder image. If you would like to update this
image to show another image, click "Browse" to find the image on your computer.
Once you locate the image, click "Submit Updates" to make it appear in your
group masthead. The best size for this image is 121x83 pixels.
+groups_home_editmasthead_logo_infotxt_withoutlogo=Your group masthead is
currently using the Curriki placeholder image. If you would like to update this
image to show another image, click "Browse" to find the image on your computer.
Once you locate the image, click "Submit Updates" to make it appear in your
group masthead. The best size for this image is 120x82 pixels.
groups_home_editmasthead_logo_infotxt_withlogo=Your group masthead is
currently using the image on the left. If you would like to update this image
to show something different, click "Browse" to find the image on your computer.
Once you locate the image, click "Submit Updates" to make it appear in your
group masthead. The best size for this image is 121x83 pixels. If you want to
return to using the default Curriki Group image<a href={0} onclick="return
confirm(''Are you sure you want to remove your current logo?'')">click
here</a> to remove the current image and the default Curriki Group image
will automatically appear.
@@ -272,6 +272,7 @@
groups_messages_createmessage_btt=Create
+groups_messages_create_mandatory=Please enter a subject or title for your
message.
groups_messages_allmessages_title={0} Messages
groups_messages_createdby=by
@@ -560,7 +561,7 @@
groups.curriculum.collections.titlebarbutton=Hide Descriptions
groups.curriculum.collections.titlebarbuttonalt=Show Descriptions
groups.curriculum.collections.about=Here's where you will find all collections
from the group.
-groups.curriculum.collections.addButton=Add Group Collection
+groups.curriculum.collections.addButton=Create Group Collection
groups.curriculum.collections.actions.delete.confirm=This cannot be undone.
Are you sure you want to delete?
groups.curriculum.collections.view=View
groups.curriculum.collections.edit=Edit
Added: xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
===================================================================
--- xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
(rev 0)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
2008-01-17 22:59:55 UTC (rev 6951)
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xwikidoc>
+<web>Groups</web>
+<name>ViewGroup</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent>Main.WebHome</parent>
+<creator>XWiki.dward</creator>
+<author>XWiki.dward</author>
+<customClass></customClass>
+<contentAuthor>XWiki.dward</contentAuthor>
+<creationDate>1196110595000</creationDate>
+<date>1196112751000</date>
+<contentUpdateDate>1196112751000</contentUpdateDate>
+<version>1.6</version>
+<title>View Group</title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment>Add rest of titlebars</comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>Groups.ViewGroup</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>## Variables used on this page
+#set($isGroupAdmin = true)
+#set($isGroupMember = false)
+#if($!groupRef)
+#set($groupTitle = 'To Be Filled By Calling Page')
+#else
+#set($groupTitle = 'Title filled in from group info')
+#end
+#macro(grouptitlebar $lefttitle $righttitle $link $color)
+#if($isGroupAdmin)
+#titlebar($lefttitle $righttitle $link $color)
+#else
+#title($lefttitle $color)
+#end
+#end
+<div id="group-title">
+1 ${groupTitle}
+</div>
+
+<div id="group-content">
+<div id="group-tabs-home">
+Feature Tabs here Home Collections Members
+</div>
+
+<div id="group-block-about">
+#grouptitlebar("$groupTitle" $msg.get("group.edit") "Main.WebHome" "blue")
+About Group Block here
+</div>
+
+<div id="group-block-welcome">
+#grouptitlebar($msg.get("group.welcome.titlebar") $msg.get("group.edit")
"Main.WebHome" "blue")
+Welcome Message here
+</div>
+
+<div id="group-block-changes">
+#titlebar($msg.get("group.recent.titlebar")
$msg.get("group.recent.titlebar.right") "Main.WebHome" "blue")
+Recent Changes Section
+</div>
+
+<div id="group-block-information">
+#grouptitlebar($msg.get("group.information.titlebar") $msg.get("group.edit")
"Main.WebHome" "blue")
+Group Information Here
+</div>
+
+<div id="group-block-search">
+#titlebar($msg.get("group.search.titlebar") $msg.get("group.view_all")
"Main.WebHome" "red")
+Search Group Assets and Resources
+</div>
+
+<div id="group-block-membership">
+#title($msg.get("group.membership.titlebar") "blue")
+Membership Info Block
+</div>
+</div></content>
+</xwikidoc>
Deleted: xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
===================================================================
--- xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
2008-01-17 22:11:58 UTC (rev 6950)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/Groups/ViewGroup
2008-01-17 22:59:55 UTC (rev 6951)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xwikidoc>
-<web>Groups</web>
-<name>ViewGroup </name>
-<language></language>
-<defaultLanguage></defaultLanguage>
-<translation>0</translation>
-<parent></parent>
-<creator></creator>
-<author></author>
-<customClass></customClass>
-<contentAuthor></contentAuthor>
-<creationDate>1200607621000</creationDate>
-<date>1200607621000</date>
-<contentUpdateDate>1200607621000</contentUpdateDate>
-<version>1.1</version>
-<title></title>
-<template></template>
-<defaultTemplate></defaultTemplate>
-<validationScript></validationScript>
-<comment></comment>
-<content>
-</content></xwikidoc>
\ No newline at end of file
Added:
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
===================================================================
---
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
(rev 0)
+++
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
2008-01-17 22:59:55 UTC (rev 6951)
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<xwikidoc>
+<web>Groups_TemplateSpace</web>
+<name>Messages</name>
+<language></language>
+<defaultLanguage>en</defaultLanguage>
+<translation>0</translation>
+<parent></parent>
+<creator>XWiki.LudovicDubost</creator>
+<author>XWiki.LudovicDubost</author>
+<customClass></customClass>
+<contentAuthor>XWiki.LudovicDubost</contentAuthor>
+<creationDate>1198444819000</creationDate>
+<date>1198444838000</date>
+<contentUpdateDate>1198444838000</contentUpdateDate>
+<version>1.1</version>
+<title></title>
+<template></template>
+<defaultTemplate></defaultTemplate>
+<validationScript></validationScript>
+<comment>Added Messages</comment>
+<object>
+<class>
+<name>XWiki.TagClass</name>
+<customClass></customClass>
+<customMapping></customMapping>
+<defaultViewSheet></defaultViewSheet>
+<defaultEditSheet></defaultEditSheet>
+<defaultWeb></defaultWeb>
+<nameField></nameField>
+<validationScript></validationScript>
+<tags>
+<cache>0</cache>
+<displayType>select</displayType>
+<multiSelect>1</multiSelect>
+<name>tags</name>
+<number>1</number>
+<prettyName>Tags</prettyName>
+<relationalStorage>1</relationalStorage>
+<separator> </separator>
+<separators> ,|</separators>
+<size>30</size>
+<unmodifiable>0</unmodifiable>
+<values></values>
+<classType>com.xpn.xwiki.objects.classes.StaticListClass</classType>
+</tags>
+</class>
+<name>Groups_TemplateSpace.Messages</name>
+<number>0</number>
+<className>XWiki.TagClass</className>
+<property>
+<tags/>
+</property>
+</object>
+<content>#includeInContext("Groups.MessagesSheet")
+</content></xwikidoc>
\ No newline at end of file
Deleted:
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
===================================================================
---
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
2008-01-17 22:11:58 UTC (rev 6950)
+++
xwiki-products/curriki/trunk/wiki/src/main/resources/Groups_TemplateSpace/Messages
2008-01-17 22:59:55 UTC (rev 6951)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<xwikidoc>
-<web>Groups_TemplateSpace</web>
-<name>Messages </name>
-<language></language>
-<defaultLanguage></defaultLanguage>
-<translation>0</translation>
-<parent></parent>
-<creator></creator>
-<author></author>
-<customClass></customClass>
-<contentAuthor></contentAuthor>
-<creationDate>1200607621000</creationDate>
-<date>1200607621000</date>
-<contentUpdateDate>1200607621000</contentUpdateDate>
-<version>1.1</version>
-<title></title>
-<template></template>
-<defaultTemplate></defaultTemplate>
-<validationScript></validationScript>
-<comment></comment>
-<content>
-</content></xwikidoc>
\ No newline at end of file
Modified: xwiki-products/curriki/trunk/wiki/src/main/resources/XWiki/Menu.it
===================================================================
--- xwiki-products/curriki/trunk/wiki/src/main/resources/XWiki/Menu.it
2008-01-17 22:11:58 UTC (rev 6950)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/XWiki/Menu.it
2008-01-17 22:59:55 UTC (rev 6951)
@@ -13,7 +13,7 @@
<contentAuthor></contentAuthor>
<creationDate>1109970950000</creationDate>
<date>1109970950000</date>
-<contentUpdateDate>1200607612000</contentUpdateDate>
+<contentUpdateDate>1200610705000</contentUpdateDate>
<version>1.2</version>
<title></title>
<template></template>
Modified: xwiki-products/curriki/trunk/wiki/src/main/resources/package.xml
===================================================================
--- xwiki-products/curriki/trunk/wiki/src/main/resources/package.xml
2008-01-17 22:11:58 UTC (rev 6950)
+++ xwiki-products/curriki/trunk/wiki/src/main/resources/package.xml
2008-01-17 22:59:55 UTC (rev 6951)
@@ -511,7 +511,7 @@
<file defaultAction="-1" language="">Groups.WebPreferences</file>
<file defaultAction="-1" language="">Groups.CollectionsSheet</file>
<file defaultAction="-1" language="">Groups.FeaturedGroups</file>
-<file defaultAction="-1" language="">Groups.ViewGroup </file>
+<file defaultAction="-1" language="">Groups.ViewGroup</file>
<file defaultAction="-1" language="">Groups_TemplateSpace.Contributions</file>
<file defaultAction="-1" language="">Groups_TemplateSpace.WebHome</file>
<file defaultAction="-1" language="">Groups_TemplateSpace.Curriculum</file>
@@ -522,6 +522,6 @@
<file defaultAction="-1" language="">Groups_TemplateSpace.InviteMembers</file>
<file defaultAction="-1" language="">Groups_TemplateSpace.Members</file>
<file defaultAction="-1" language="">Groups_TemplateSpace.Documentation</file>
-<file defaultAction="-1" language="">Groups_TemplateSpace.Messages </file>
+<file defaultAction="-1" language="">Groups_TemplateSpace.Messages</file>
</files>
</package>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
