Index: applications/blog/src/main/resources/Blog/BlogCode.xml
===================================================================
--- applications/blog/src/main/resources/Blog/BlogCode.xml (revision 22284)
+++ applications/blog/src/main/resources/Blog/BlogCode.xml (working copy)
@@ -39,10 +39,11 @@
* @param blogDoc the XDocument holding the blog definition object.
*###
#macro(printBlog $blogDoc)
+ #includeInContext('Blog.CreatePost')
+ #showBlogInfo($blogDoc)
#getBlogEntries($blogDoc $entries)
#displayBlog($entries 'index' true)
#displayNavigationLinks($blogDoc)
- #includeInContext('Blog.CreatePost')
#end
##
##
Index: applications/blog/src/main/resources/Blog/BlogSheet.xml
===================================================================
--- applications/blog/src/main/resources/Blog/BlogSheet.xml (revision 22284)
+++ applications/blog/src/main/resources/Blog/BlogSheet.xml (working copy)
@@ -27,7 +27,6 @@
##
##
##
-#showBlogInfo($doc)
#if($context.action != 'inline')
#printBlog($doc)
#end
Index: applications/blog/src/main/resources/Blog/CreatePost.xml
===================================================================
--- applications/blog/src/main/resources/Blog/CreatePost.xml (revision 22284)
+++ applications/blog/src/main/resources/Blog/CreatePost.xml (working copy)
@@ -24,6 +24,8 @@
xwiki/1.0
true
#includeMacros("Blog.BlogCode")
+$xwiki.ssfx.use("uicomponents/form/form.css")
+$xwiki.ssfx.use("icons/icons.css", true)
#if($hasEdit)
$xwiki.jsx.use($blogScriptsDocumentName)##
##
@@ -36,12 +38,16 @@
#if($space == '')
#set($space = $doc.space)
#end
- 1.1 $msg.get('xe.blog.post.createpost')
<form action="${xwiki.getURL('Blog.CreatePost', 'view', 'xpage=plain')}" id="newBlogPost" method="post">
- <div>
+ <div class="floatinginfobox">
<input type="hidden" name="entrySpace" value="$space"/>
- <input type="text" name="entryTitle" value="$msg.get("xe.blog.post.title")"/>
- <input type="submit" value="$msg.get("xe.blog.post.create")"/>
+ <label class="formSmallName iconAdd"> $msg.get("xe.blog.post.createpost") </label>
+ <div class="formSmallInline">
+ <input type="text" name="entryTitle" value="$msg.get("xe.blog.post.title")"/>
+ <span class="buttonwrapper">
+ <input type="submit" class="button" value="$msg.get("xe.blog.post.create")"/>
+ </span>
+ </div>
</div>
</form>
#else
Index: skins/toucan/src/main/resources/toucan/toucan.css
===================================================================
--- skins/toucan/src/main/resources/toucan/toucan.css (revision 22284)
+++ skins/toucan/src/main/resources/toucan/toucan.css (working copy)
@@ -3084,6 +3084,8 @@
background-color: #FAFAFD;
padding: 10px;
margin: 1em 0 1em 1em;
+ position: relative;
+ z-index: 2;
}
div.floatingboxinner, fieldset.floatingboxinner {
Index: web/standard/src/main/webapp/resources/icons/icons.css
===================================================================
--- web/standard/src/main/webapp/resources/icons/icons.css (revision 0)
+++ web/standard/src/main/webapp/resources/icons/icons.css (revision 0)
@@ -0,0 +1,44 @@
+/* Different Icon Types Used in XWiki Applications */
+.icon, .iconAdd, .iconEdit, .iconDelete,
+.iconRss, .iconEmail,
+.iconPublish, .iconPrivate, .iconPublic, .iconSchedule {
+ background: transparent no-repeat scroll left center;
+ padding-left: 18px;
+ *display: inline-block; /* IE6, IE7 for empty elements */
+}
+
+.iconAdd {
+ background-image: url($xwiki.getSkinFile("icons/silk/add.gif"));
+}
+
+.iconEdit {
+ background-image: url($xwiki.getSkinFile("icons/silk/pencil.gif"));
+}
+
+.iconDelete {
+ background-image: url($xwiki.getSkinFile("icons/silk/cross.gif"));
+}
+
+.iconRss {
+ background-image: url($xwiki.getSkinFile("icons/black%2Drss%2Dmini.png"));
+}
+
+.iconEmail {
+ background-image: url($xwiki.getSkinFile("icons/silk/email.gif"));
+}
+
+.iconPublish{
+ background-image: url($xwiki.getSkinFile("icons/silk/page_white_put.gif"));
+}
+
+.iconPrivate {
+ background-image: url($xwiki.getSkinFile("icons/silk/lock.gif"));
+}
+
+.iconPublic {
+ background-image: url($xwiki.getSkinFile("icons/silk/lock_open.gif"));
+}
+
+.iconSchedule {
+ background-image: url($xwiki.getSkinFile("icons/silk/clock.gif"));
+}
\ No newline at end of file
Index: web/standard/src/main/webapp/resources/uicomponents/form/form.css
===================================================================
--- web/standard/src/main/webapp/resources/uicomponents/form/form.css (revision 0)
+++ web/standard/src/main/webapp/resources/uicomponents/form/form.css (revision 0)
@@ -0,0 +1,105 @@
+/* Name of the Small Form */
+.formSmallName {
+ font-style: normal;
+ font-size: 11px;
+ font-weight: bold;
+ color: #888;
+ text-transform: uppercase;
+ white-space:nowrap;
+ width: 97%;
+}
+
+.formSmallName a {
+ color: #888;
+}
+
+/* Status for the Small Form, associated with the Form's Name */
+.formSmallStatus {
+ margin-left: 3px;
+ font-size: 12px;
+ text-transform: none;
+ font-weight: bold;
+ color: #4d4d4d;
+}
+
+/* Informative messages on forms actions */
+.formSmallMessage {
+ color: #888;
+ font-size: 12px;
+ display: block;
+ text-align: justify;
+ margin-bottom: 5px;
+}
+
+/* Inline Small Forms */
+.formSmallInline {
+ display: block;
+ white-space:nowrap;
+ vertical-align: middle;
+}
+
+.formSmallExpandable {
+ margin-left: 10px;
+ margin-right: 10px;
+ margin-top: 5px;
+ width: 212px;
+}
+
+.formSmallContainer {
+ border-width: 0px;
+ padding: 7px 18px 7px 18px;
+ background-color: transparent;
+ margin-bottom: 5px;
+}
+
+.formSmallExpandable .formSmallContainer {
+ border-top: 1px dashed #E4E4E5;
+ background-color: #FAFAFD;
+ margin-top: 5px;
+}
+
+.formSmallContainerOptions {
+ width: 175px;
+}
+
+.formSmallContainer .buttonwrapper, .formSmallInline .buttonwrapper{
+ padding: 0px;
+ margin: 0px;
+}
+
+.formSmallContainer label{
+ color: #888;
+ text-transform: uppercase;
+ font-size: 11px;
+ font-weight: bold;
+ font-family: sans-serif;
+ font-style: normal;
+ display: block;
+}
+
+.formSmallContainerOptions select ,
+.formSmallContainerOptions input,
+.formSmallContainerOptions textarea,
+.formSmallInline select,
+.formSmallInline input,
+.formSmallInline textarea {
+ border: 1px solid #ccc;
+ margin-left: 0px;
+ margin-right: 0px;
+ margin-bottom: 5px;
+}
+
+.formSmallContainerOptions select ,
+.formSmallContainerOptions input,
+.formSmallContainerOptions textarea {
+ display: block;
+ width: 100%;
+}
+
+.formSmallContainer input[type=hidden]{
+ border: none;
+}
+
+.formSmallContainer select {
+ text-transform: capitalize;
+}
\ No newline at end of file