[kune-commits] r1039 - in trunk: .
src/main/java/org/ourproject/kune/platf/server/domain
src/main/java/org/ourproject/kune/workspace/client/editor
src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic
src/main/rails/publicspace/app/models
src/main/rails/publicspace/public/templates/basic
vjrj
vjrj at ourproject.org
Tue Jan 27 00:25:56 CET 2009
Author: vjrj
Date: 2009-01-27 00:25:53 +0100 (Tue, 27 Jan 2009)
New Revision: 1039
Removed:
trunk/org.ourproject-kune-0.0.5-0.deb
Modified:
trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java
trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java
trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
trunk/src/main/rails/publicspace/app/models/content.rb
trunk/src/main/rails/publicspace/public/templates/basic/basic.css
trunk/src/main/rails/publicspace/public/templates/basic/docs.liquid.html
Log:
Some changes in public space. Other minor changes
Deleted: trunk/org.ourproject-kune-0.0.5-0.deb
===================================================================
(Binary files differ)
Modified: trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java 2009-01-26 20:38:12 UTC (rev 1038)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/domain/BasicMimeType.java 2009-01-26 23:25:53 UTC (rev 1039)
@@ -20,41 +20,37 @@
import javax.persistence.Embeddable;
-import org.hibernate.search.annotations.Field;
-
@Embeddable
public class BasicMimeType {
- @Field(name = "mimetype")
- private String type;
- @Field(name = "mimesubtype")
- private String subtype;
+ private String mimetype;
+ private String mimesubtype;
public BasicMimeType() {
- this(null, null);
+ this(null, null);
}
public BasicMimeType(final String mimetype) {
- if (mimetype != null) {
- final String[] split = mimetype.split("/", 2);
- type = split[0];
- if (split.length > 1 && split[1].length() > 0) {
- subtype = split[1];
- }
- }
+ if (mimetype != null) {
+ final String[] split = mimetype.split("/", 2);
+ this.mimetype = split[0];
+ if (split.length > 1 && split[1].length() > 0) {
+ this.mimesubtype = split[1];
+ }
+ }
}
public BasicMimeType(final String type, final String subtype) {
- this.type = type;
- this.subtype = subtype;
+ this.mimetype = type;
+ this.mimesubtype = subtype;
}
public String getSubtype() {
- return subtype;
+ return mimesubtype;
}
public String getType() {
- return type;
+ return mimetype;
}
/**
@@ -63,7 +59,7 @@
* @return
*/
public boolean isImage() {
- return type != null && type.equals("image");
+ return mimetype != null && mimetype.equals("image");
}
/**
@@ -72,7 +68,7 @@
* @return
*/
public boolean isPdf() {
- return type != null && subtype != null && type.equals("application") && subtype.equals("pdf");
+ return mimetype != null && mimesubtype != null && mimetype.equals("application") && mimesubtype.equals("pdf");
}
/**
@@ -81,20 +77,20 @@
* @return
*/
public boolean isText() {
- return type != null && subtype != null && type.equals("text") && subtype.equals("plain");
+ return mimetype != null && mimesubtype != null && mimetype.equals("text") && mimesubtype.equals("plain");
}
public void setSubtype(final String subtype) {
- this.subtype = subtype;
+ this.mimesubtype = subtype;
}
public void setType(final String type) {
- this.type = type;
+ this.mimetype = type;
}
@Override
public String toString() {
- return subtype == null ? type : type + "/" + subtype;
+ return mimesubtype == null ? mimetype : mimetype + "/" + mimesubtype;
}
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2009-01-26 20:38:12 UTC (rev 1038)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2009-01-26 23:25:53 UTC (rev 1039)
@@ -249,8 +249,8 @@
if (basic != null) {
subscript = createToggleButton(images.subscript(), i18n.t("Toggle Subscript"));
superscript = createToggleButton(images.superscript(), i18n.t("Toggle Superscript"));
- // topPanel.add(subscript);
- // topPanel.add(superscript);
+ topPanel.add(subscript);
+ topPanel.add(superscript);
topPanel.add(justifyLeft = createPushButton(images.alignleft(), i18n.t("Left Justify")));
topPanel.add(justifyCenter = createPushButton(images.centerpara(), i18n.t("Center")));
topPanel.add(justifyRight = createPushButton(images.alignright(), i18n.t("Right Justify")));
@@ -260,14 +260,14 @@
topPanel.add(indent = createPushButton(images.incrementindent(), i18n.t("Indent Right")));
topPanel.add(outdent = createPushButton(images.decrementindent(), i18n.t("Indent Left")));
hr = createPushButton(images.hfixedline(), i18n.t("Insert Horizontal Rule"));
- // topPanel.add(hr);
+ topPanel.add(hr);
topPanel.add(ol = createPushButton(images.defaultnumbering(), i18n.t("Insert Ordered List")));
topPanel.add(ul = createPushButton(images.defaultbullet(), i18n.t("Insert Unordered List")));
topPanel.add(insertImage = createPushButton(images.images(), i18n.t("Insert Image")));
topPanel.add(createLink = createPushButton(images.link(), i18n.t("Create Link")));
topPanel.add(removeLink = createPushButton(images.linkBreak(), i18n.t("Remove Link")));
removeFormat = createPushButton(images.removeFormat(), i18n.t("Remove Formatting"));
- // topPanel.add(removeFormat);
+ topPanel.add(removeFormat);
}
if (basic != null) {
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2009-01-26 20:38:12 UTC (rev 1038)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2009-01-26 23:25:53 UTC (rev 1039)
@@ -90,6 +90,6 @@
}
private void gotoPublic() {
- Window.open(publicUrl, "_blank", "");
+ Window.open(publicUrl, "_kunepublic", "");
}
}
Modified: trunk/src/main/rails/publicspace/app/models/content.rb
===================================================================
--- trunk/src/main/rails/publicspace/app/models/content.rb 2009-01-26 20:38:12 UTC (rev 1038)
+++ trunk/src/main/rails/publicspace/app/models/content.rb 2009-01-26 23:25:53 UTC (rev 1039)
@@ -22,4 +22,13 @@
def body
@content.last_revision.body
end
+
+ def group_short_name
+ @content.container.owner.shortName
+ end
+
+ def statetoken
+ @content.container.owner.shortName + "." + @content.container.toolName + "." + @content.container.id.to_s + "." + @content.id.to_s
+ end
+
end
Modified: trunk/src/main/rails/publicspace/public/templates/basic/basic.css
===================================================================
--- trunk/src/main/rails/publicspace/public/templates/basic/basic.css 2009-01-26 20:38:12 UTC (rev 1038)
+++ trunk/src/main/rails/publicspace/public/templates/basic/basic.css 2009-01-26 23:25:53 UTC (rev 1039)
@@ -1,7 +1,7 @@
-html {background-color: #D6FF2F;}
+html {background-color: #DD8A3D;}
-.page {width: 60em; margin: 2em auto; padding: 1em; background-color: #fff; overflow: hidden;}
-h1 { color: black; font-size:3em; letter-spacing:-0.05em; line-height:1em; margin:1em 0 0.5em 4em; }
+.page {width: 60em; height: 30em; margin: 2em auto; padding: 1em; background-color: #fff; overflow: hidden;}
+.page h1 {color: black; letter-spacing:-0.05em; line-height:1em; margin:1em 0 0.5em 4em; }
.page .menu {float: left; padding: 1em; width: 9em; background-color: #efefef; margin-right: 1em;}
.page .content {}
\ No newline at end of file
Modified: trunk/src/main/rails/publicspace/public/templates/basic/docs.liquid.html
===================================================================
--- trunk/src/main/rails/publicspace/public/templates/basic/docs.liquid.html 2009-01-26 20:38:12 UTC (rev 1038)
+++ trunk/src/main/rails/publicspace/public/templates/basic/docs.liquid.html 2009-01-26 23:25:53 UTC (rev 1039)
@@ -1,17 +1,24 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
"http://www.w3.org/TR/html4/strict.dtd">
<html>
- <head>
- <title>Kune cositas</title>
- <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/reset/reset-min.css">
- <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js" type="text/javascript"></script>
- <link rel="stylesheet" type="text/css" href="{{ 'basic.css' | asset }}">
- </head>
- <body>
- <div class="page">
- <h1>{{ content.title }}</h1>
- <div class="menu">aquí va el menu</div>
- <div class="content">{{ content.body }}</div>
- </div>
- </body>
+ <head>
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
+ <title>{{ content.group_short_name }}: {{ content.title }}</title>
+ <link rel="shortcut icon" href="/kune/servlets/EntityLogoDownloadManager?token={{ content.statetoken }} />
+ <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/reset/reset-min.css">
+ <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/fonts/fonts-min.css">
+ <link rel="stylesheet" type="text/css" href="http://yui.yahooapis.com/2.6.0/build/base/base-min.css">
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.2.6/jquery.min.js" type="text/javascript"></script>
+ <link rel="stylesheet" type="text/css" href="{{ 'basic.css' | asset }}">
+ <!--[if lt IE 7.]>
+ <script defer type="text/javascript" src="js/pngfix.js"></script>
+ <![endif]-->
+ </head>
+ <body>
+ <div class="page">
+ <h1>{{ content.title }}</h1>
+ <div class="menu">Here the container</div>
+ <div class="content">{{ content.body }}</div>
+ </div>
+ </body>
</html>
More information about the kune-commits
mailing list