- kune-commits - lists.ourproject.org

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
by vjrj 26 Jan '09

26 Jan '09

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 }}"> +  + </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>

1 0

26 Jan '09

Author: vjrj Date: 2009-01-26 21:38:12 +0100 (Mon, 26 Jan 2009) New Revision: 1038 Added: trunk/org.ourproject-kune-0.0.5-0.deb trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCheckedCondition.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java Log: Complete - task Add Publish/Reject content actions Complete - task Add show deleted items menu option Added: trunk/org.ourproject-kune-0.0.5-0.deb =================================================================== (Binary files differ) Property changes on: trunk/org.ourproject-kune-0.0.5-0.deb ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-01-26 20:38:12 UTC (rev 1038) @@ -41,4 +41,4 @@ padding: 1px 0px 1px 1px; text-decoration:none; } -*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-rejdel a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;} \ No newline at end of file +*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-deleted a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-rejected a span{text-decoration:line-through;/* color: #FF6633; */color:#F30;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-01-26 20:38:12 UTC (rev 1038) @@ -700,11 +700,18 @@ .x-tree-node .k-ctn-status-normal a span { } -.x-tree-node .k-ctn-status-rejdel a span { +.x-tree-node .k-ctn-status-deleted a span { text-decoration: line-through; color: gray; } +.x-tree-node .k-ctn-status-rejected a span { + text-decoration: line-through; + /* color: #FF6633; */ + color: #FF3300; + +} + .x-tree-node .k-ctn-status-editing a span { font-style: italic; color: gray; Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -102,5 +102,6 @@ createDelContainerAction("Delete blog", parentMenuTitleCtx, containersNoRoot); createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); } } Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -22,12 +22,14 @@ import org.ourproject.kune.chat.client.ctx.room.AddRoom; import org.ourproject.kune.docs.client.DocumentClientTool; import org.ourproject.kune.gallery.client.GalleryClientTool; +import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; import org.ourproject.kune.platf.client.actions.ContentActionRegistry; import org.ourproject.kune.platf.client.actions.ContextActionRegistry; import org.ourproject.kune.platf.client.dto.AccessRolDTO; +import org.ourproject.kune.platf.client.dto.ContentStatusDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.wiki.client.WikiClientTool; @@ -70,6 +72,7 @@ chatAbout.setIconUrl("images/emite-room.png"); chatAbout.setToolTip("Chat and comment this"); chatAbout.setLeftSeparator(ActionToolbarButtonSeparator.fill); + chatAbout.setEnableCondition(notDeleted()); ActionToolbarButtonDescriptor<StateToken> joinRoom = new ActionToolbarButtonDescriptor<StateToken>( AccessRolDTO.Viewer, ActionToolbarPosition.topbar, new Listener<StateToken>() { @@ -105,4 +108,14 @@ contextActionRegistry.addAction(addRoom, ChatClientTool.TYPE_ROOT, ChatClientTool.TYPE_ROOM); contentActionRegistry.addAction(joinRoom, ChatClientTool.TYPE_ROOM); } + + private ActionEnableCondition<StateToken> notDeleted() { + return new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( + ContentStatusDTO.inTheDustbin)); + return isNotDeleted; + } + }; + } } Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -106,6 +106,7 @@ createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); } @Override Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -102,6 +102,7 @@ createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); } @Override Added: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCheckedCondition.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCheckedCondition.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCheckedCondition.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -0,0 +1,5 @@ +package org.ourproject.kune.platf.client.actions; + +public interface ActionCheckedCondition { + boolean mustBeChecked(); +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -86,6 +86,12 @@ this.mustBeAuthenticated = true; } + public ActionDescriptor(final AccessRolDTO accessRolDTO, final Listener<T> onPerformCall, + final ActionAddCondition<T> addCondition) { + this(accessRolDTO, onPerformCall); + this.addCondition = addCondition; + } + /** * Instantiates a new action descriptor. * Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -34,6 +34,12 @@ public ActionToolbarButtonDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall, + final ActionAddCondition<T> addCondition) { + super(accessRolDTO, actionToolbarPosition, onPerformCall, addCondition); + } + + public ActionToolbarButtonDescriptor(final AccessRolDTO accessRolDTO, + final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { super(accessRolDTO, actionToolbarPosition, onPerformCall, enableCondition); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -33,6 +33,12 @@ } public ActionToolbarDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, + final Listener<T> onPerformCall, final ActionAddCondition<T> addCondition) { + super(accessRolDTO, onPerformCall, addCondition); + this.actionToolbarPosition = actionToolbarPosition; + } + + public ActionToolbarDescriptor(final AccessRolDTO accessRolDTO, final ActionToolbarPosition actionToolbarPosition, final Listener<T> onPerformCall, final ActionEnableCondition<T> enableCondition) { super(accessRolDTO, onPerformCall, enableCondition); this.actionToolbarPosition = actionToolbarPosition; Added: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuCheckItemDescriptor.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -0,0 +1,21 @@ +package org.ourproject.kune.platf.client.actions; + +import org.ourproject.kune.platf.client.dto.AccessRolDTO; + +import com.calclab.suco.client.events.Listener; + +public class ActionToolbarMenuCheckItemDescriptor<T> extends ActionToolbarMenuDescriptor<T> { + + private final ActionCheckedCondition mustBeChecked; + + public ActionToolbarMenuCheckItemDescriptor(AccessRolDTO accessRol, ActionToolbarPosition toolbarPosition, + Listener<T> onPerformCall, ActionCheckedCondition mustBeChecked) { + super(accessRol, toolbarPosition, onPerformCall); + this.mustBeChecked = mustBeChecked; + } + + public ActionCheckedCondition getMustBeChecked() { + return mustBeChecked; + } + +} Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/toolbar/ActionToolbarPanel.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -8,6 +8,7 @@ import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; import org.ourproject.kune.platf.client.actions.ActionToolbarDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuCheckItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; @@ -178,6 +179,11 @@ checkItem.setGroup(radioDescriptor.getGroup()); checkItem.setChecked(radioDescriptor.mustBeChecked()); item = checkItem; + } else if (action instanceof ActionToolbarMenuCheckItemDescriptor) { + CheckItem checkItem = new CheckItem(action.getText()); + ActionToolbarMenuCheckItemDescriptor<T> checkItemDescriptor = (ActionToolbarMenuCheckItemDescriptor<T>) action; + checkItem.setChecked(checkItemDescriptor.getMustBeChecked().mustBeChecked()); + item = checkItem; } else { item = new Item(action.getText()); } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/dto/UserInfoDTO.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -31,6 +31,7 @@ private String userHash; private List<GroupDTO> groupsIsAdmin; private List<GroupDTO> groupsIsCollab; + private boolean showDeletedContent; public String getChatName() { return chatName; @@ -68,6 +69,10 @@ return user.getShortName(); } + public boolean getShowDeletedContent() { + return showDeletedContent; + } + public UserSimpleDTO getUser() { return user; } @@ -97,6 +102,10 @@ this.homePage = homePage; } + public void setShowDeletedContent(boolean showDeletedContent) { + this.showDeletedContent = showDeletedContent; + } + public void setUser(UserSimpleDTO user) { this.user = user; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -51,7 +51,7 @@ StateContainerDTO addRoom(String user, StateToken parentToken, String name) throws DefaultException; - void delContent(String userHash, StateToken token) throws DefaultException; + StateContentDTO delContent(String userHash, StateToken token) throws DefaultException; StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -51,7 +51,7 @@ void addRoom(String user, StateToken parentToken, String name, AsyncCallback<StateContainerDTO> callback); - void delContent(String userHash, StateToken token, AsyncCallback<?> asyncCallback); + void delContent(String userHash, StateToken token, AsyncCallback<StateContentDTO> asyncCallback); void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -64,20 +64,6 @@ */ int SESSION_DURATION = 1000 * 60 * 60 * 24 * 14; - public String getCurrentCCversion(); - - public LicenseDTO getDefLicense(); - - public int getImgCropsize(); - - public int getImgIconsize(); - - public int getImgResizewidth(); - - public int getImgThumbsize(); - - public boolean inSameToken(StateToken token); - void check(AsyncCallbackSimple<?> callback); StateContainerDTO getContainerState(); @@ -88,6 +74,8 @@ Object[][] getCountriesArray(); + String getCurrentCCversion(); + I18nLanguageDTO getCurrentLanguage(); StateAbstractDTO getCurrentState(); @@ -98,22 +86,38 @@ UserInfoDTO getCurrentUserInfo(); + LicenseDTO getDefLicense(); + String getGalleryPermittedExtensions(); Collection<ToolSimpleDTO> getGroupTools(); + int getImgCropsize(); + + int getImgIconsize(); + + int getImgResizewidth(); + + int getImgThumbsize(); + List<I18nLanguageSimpleDTO> getLanguages(); Object[][] getLanguagesArray(); List<LicenseDTO> getLicenses(); + boolean getShowDeletedContent(); + Object[][] getTimezones(); String getUserHash(); Collection<ToolSimpleDTO> getUserTools(); + boolean inSameToken(StateToken token); + + boolean isCurrentStateAContent(); + boolean isLogged(); void onInitDataReceived(Listener<InitDataDTO> listener); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -158,6 +158,10 @@ return initData.getLicenses(); } + public boolean getShowDeletedContent() { + return currentUserInfo == null ? false : currentUserInfo.getShowDeletedContent(); + } + public Object[][] getTimezones() { if (timezonesArray == null) { mapTimezones(); @@ -177,6 +181,10 @@ return getCurrentStateToken().equals(token); } + public boolean isCurrentStateAContent() { + return currentState instanceof StateContentDTO; + } + public boolean isLogged() { return userHash != null; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -37,8 +37,6 @@ Content createContent(String title, String body, User author, Container container, String typeId); - void delContent(User user, Long contentId) throws DefaultException; - boolean findIfExistsTitle(Container container, String title); Double getRateAvg(Content content); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -103,12 +103,6 @@ return persist(newContent); } - public void delContent(final User user, final Long contentId) throws DefaultException { - final Content content = finder.getContent(contentId); - content.setStatus(ContentStatus.inTheDustbin); - content.setDeletedOn(new Date()); - } - public boolean findIfExistsTitle(Container container, String title) { return (contentFinder.findIfExistsTitle(container, title) > 0) || (containerFinder.findIfExistsTitle(container, title) > 0); @@ -215,7 +209,12 @@ switch (status) { case publishedOnline: content.setPublishedOn(new Date()); + content.setDeletedOn(null); break; + case inTheDustbin: + content.setDeletedOn(new Date()); + content.setPublishedOn(null); + break; default: break; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -204,10 +204,9 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) - public void delContent(final String userHash, final StateToken token) throws DefaultException { + public StateContentDTO delContent(final String userHash, final StateToken token) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final User user = getCurrentUser(); - contentManager.delContent(user, contentId); + return getState(getCurrentUser(), contentManager.setStatus(contentId, ContentStatus.inTheDustbin)); } @Authenticated(mandatory = false) Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfo.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -34,6 +34,7 @@ private List<Group> groupsIsAdmin; private List<Group> groupsIsCollab; private String userHash; + private boolean showDeletedContent; public String getChatName() { return chatName; @@ -71,6 +72,10 @@ return user.getShortName(); } + public boolean getShowDeletedContent() { + return showDeletedContent; + } + public User getUser() { return user; } @@ -99,6 +104,10 @@ this.homePage = homePage; } + public void setShowDeletedContent(boolean showDeletedContent) { + this.showDeletedContent = showDeletedContent; + } + public void setUser(User user) { this.user = user; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/platf/server/users/UserInfoServiceDefault.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -48,6 +48,8 @@ info.setChatName(user.getShortName()); info.setChatPassword(user.getPassword()); info.setUserHash(userHash); + // FIXME: save this in user properties + info.setShowDeletedContent(false); final Group userGroup = user.getUserGroup(); Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -106,6 +106,7 @@ createDelContainerAction("Delete folder", parentMenuTitleCtx, containersNoRoot); createDelContentAction(parentMenuTitle, i18n.t("Delete"), contents); + createShowDeletedItems(parentMenuTitleCtx, all); } @Override Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -1,11 +1,14 @@ package org.ourproject.kune.workspace.client; +import org.ourproject.kune.platf.client.actions.ActionAddCondition; +import org.ourproject.kune.platf.client.actions.ActionCheckedCondition; import org.ourproject.kune.platf.client.actions.ActionEnableCondition; import org.ourproject.kune.platf.client.actions.ActionMenuItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonAndItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarButtonSeparator; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuAndItemDescriptor; +import org.ourproject.kune.platf.client.actions.ActionToolbarMenuCheckItemDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarMenuRadioDescriptor; import org.ourproject.kune.platf.client.actions.ActionToolbarPosition; @@ -111,12 +114,11 @@ AccessRolDTO.Administrator, i18n.t("Published online"), parentMenuTitle, ContentStatusDTO.publishedOnline); final ActionToolbarMenuRadioDescriptor<StateToken> setEditionInProgressStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Editing in progress"), parentMenuTitle, - ContentStatusDTO.editingInProgress); + AccessRolDTO.Editor, i18n.t("Editing in progress"), parentMenuTitle, ContentStatusDTO.editingInProgress); final ActionToolbarMenuRadioDescriptor<StateToken> setRejectStatus = createSetStatusAction( AccessRolDTO.Administrator, i18n.t("Rejected"), parentMenuTitle, ContentStatusDTO.rejected); final ActionToolbarMenuRadioDescriptor<StateToken> setSubmittedForPublishStatus = createSetStatusAction( - AccessRolDTO.Administrator, i18n.t("Submitted for publish"), parentMenuTitle, + AccessRolDTO.Editor, i18n.t("Submitted for publish"), parentMenuTitle, ContentStatusDTO.submittedForEvaluation); final ActionToolbarMenuRadioDescriptor<StateToken> setInTheDustBinStatus = createSetStatusAction( AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), parentMenuTitle, @@ -126,6 +128,10 @@ contentActionRegistry.addAction(setRejectStatus, contentsModerated); contentActionRegistry.addAction(setSubmittedForPublishStatus, contentsModerated); contentActionRegistry.addAction(setInTheDustBinStatus, contentsModerated); + createPublishAction("images/accept.png", i18n.t("Publish online"), ContentStatusDTO.publishedOnline, + contentsModerated); + createPublishAction("images/cancel.png", i18n.t("Reject publication"), ContentStatusDTO.rejected, + contentsModerated); } protected void createContentRenameAction(String parentMenuTitle, String textDescription, String... registerInTypes) { @@ -137,6 +143,7 @@ }); renameCtn.setTextDescription(textDescription); renameCtn.setParentMenuTitle(parentMenuTitle); + renameCtn.setEnableCondition(notDeleted()); contentActionRegistry.addAction(renameCtn, registerInTypes); } @@ -160,10 +167,13 @@ AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken token) { contentServiceProvider.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<String>() { - public void onSuccess(final String result) { + new AsyncCallbackSimple<StateContentDTO>() { + public void onSuccess(final StateContentDTO state) { + session.setCurrentState(state); final StateToken parent = token.copy().clearDocument(); stateManager.gotoToken(parent); + contextNavigator.clear(); + contextNavigator.refreshState(); } }); } @@ -173,12 +183,7 @@ delContent.setMustBeConfirmed(true); delContent.setConfirmationTitle(i18n.t("Please confirm")); delContent.setConfirmationText(i18n.t("Are you sure?")); - delContent.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); - return !itemToken.equals(defContentToken); - } - }); + delContent.setEnableCondition(notDefAndNotDeleted()); contentActionRegistry.addAction(delContent, registerInTypes); } @@ -266,6 +271,7 @@ editContent.setTextDescription(i18n.tWithNT("Edit", "used in button")); editContent.setIconUrl("images/content_edit.png"); editContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); + editContent.setEnableCondition(notDeleted()); contentActionRegistry.addAction(editContent, registerInTypes); return editContent; } @@ -361,6 +367,28 @@ protected void createPostSessionInitActions() { } + protected void createPublishAction(String icon, String tooltip, final ContentStatusDTO status, + String... registerInTypes) { + ActionToolbarButtonDescriptor<StateToken> pubAction = new ActionToolbarButtonDescriptor<StateToken>( + AccessRolDTO.Administrator, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(StateToken stateToken) { + setContentStatus(status, stateToken); + } + }, new ActionAddCondition<StateToken>() { + public boolean mustBeAdded(StateToken param) { + if (session.isCurrentStateAContent() + && session.getContentState().getStatus().equals(ContentStatusDTO.submittedForEvaluation)) { + return true; + } + return false; + } + }); + pubAction.setMustBeAuthenticated(true); + pubAction.setToolTip(tooltip); + pubAction.setIconUrl(icon); + contentActionRegistry.addAction(pubAction, registerInTypes); + } + protected ActionToolbarMenuDescriptor<StateToken> createRefreshCntAction(String parentMenuTitle, String... registerInTypes) { final ActionToolbarMenuDescriptor<StateToken> refreshCnt = new ActionToolbarMenuDescriptor<StateToken>( @@ -428,12 +456,7 @@ }); setAsDefGroupContent.setTextDescription(i18n.t("Set this as the default group page")); setAsDefGroupContent.setIconUrl("images/group-home.png"); - setAsDefGroupContent.setEnableCondition(new ActionEnableCondition<StateToken>() { - public boolean mustBeEnabled(final StateToken itemToken) { - final StateToken defContentToken = session.getCurrentState().getGroup().getDefaultContent().getStateToken(); - return !itemToken.equals(defContentToken); - } - }); + setAsDefGroupContent.setEnableCondition(notDefAndNotDeleted()); setAsDefGroupContent.setParentMenuTitle(parentMenuTitle); contentActionRegistry.addAction(setAsDefGroupContent, registerInTypes); return setAsDefGroupContent; @@ -444,22 +467,7 @@ final ActionToolbarMenuRadioDescriptor<StateToken> action = new ActionToolbarMenuRadioDescriptor<StateToken>( rol, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken stateToken) { - final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { - public void onSuccess(final StateAbstractDTO state) { - if (session.inSameToken(stateToken)) { - session.setCurrentState(state); - publicLink.setState(state); - } - contextNavigator.setItemStatus(stateToken, status); - } - }; - if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected) - || status.equals(ContentStatusDTO.inTheDustbin)) { - contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, - callback); - } else { - contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); - } + setContentStatus(status, stateToken); } }, "ContentRadioStatus", new RadioMustBeChecked() { public boolean mustBeChecked() { @@ -476,6 +484,30 @@ return action; } + protected void createShowDeletedItems(String parentMenuTitle, String... registerInTypes) { + ActionToolbarMenuCheckItemDescriptor<StateToken> showDeletedItems = new ActionToolbarMenuCheckItemDescriptor<StateToken>( + AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { + public void onEvent(StateToken parameter) { + boolean mustShow = !session.getCurrentUserInfo().getShowDeletedContent(); + session.getCurrentUserInfo().setShowDeletedContent(mustShow); + if (!mustShow && session.isCurrentStateAContent() + && session.getContentState().getStatus().equals(ContentStatusDTO.inTheDustbin)) { + stateManager.gotoToken(session.getCurrentStateToken().getGroup()); + } + contextNavigator.clear(); + contextNavigator.refreshState(); + } + }, new ActionCheckedCondition() { + public boolean mustBeChecked() { + return session.getShowDeletedContent(); + } + }); + showDeletedItems.setParentMenuTitle(parentMenuTitle); + showDeletedItems.setTextDescription("Show deleted items"); + showDeletedItems.setMustBeAuthenticated(true); + contextActionRegistry.addAction(showDeletedItems, registerInTypes); + } + protected ActionToolbarButtonDescriptor<StateToken> createTranslateAction(String... registerInTypes) { ActionToolbarButtonDescriptor<StateToken> translateContent = new ActionToolbarButtonDescriptor<StateToken>( AccessRolDTO.Editor, ActionToolbarPosition.topbar, new Listener<StateToken>() { @@ -487,6 +519,7 @@ translateContent.setToolTip(i18n.t("Translate this document to other languages")); translateContent.setIconUrl("images/language.gif"); translateContent.setLeftSeparator(ActionToolbarButtonSeparator.spacer); + translateContent.setEnableCondition(notDeleted()); contentActionRegistry.addAction(translateContent, registerInTypes); return translateContent; } @@ -560,6 +593,28 @@ return setGroupLogo; } + private ActionEnableCondition<StateToken> notDefAndNotDeleted() { + return new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + final boolean isNotDefContentToken = !session.getCurrentState().getGroup().getDefaultContent().getStateToken().equals( + itemToken); + final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( + ContentStatusDTO.inTheDustbin)); + return isNotDefContentToken && isNotDeleted; + } + }; + } + + private ActionEnableCondition<StateToken> notDeleted() { + return new ActionEnableCondition<StateToken>() { + public boolean mustBeEnabled(final StateToken itemToken) { + final boolean isNotDeleted = !(session.isCurrentStateAContent() && session.getContentState().getStatus().equals( + ContentStatusDTO.inTheDustbin)); + return isNotDeleted; + } + }; + } + private void register(ActionToolbarMenuAndItemDescriptor<StateToken> action, Position position, String... registerInTypes) { switch (position) { @@ -572,4 +627,23 @@ } } + private void setContentStatus(final ContentStatusDTO status, final StateToken stateToken) { + final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { + public void onSuccess(final StateAbstractDTO state) { + if (session.inSameToken(stateToken)) { + session.setCurrentState(state); + publicLink.setState(state); + foldableContent.refreshState(); + } + contextNavigator.setItemStatus(stateToken, status); + } + }; + if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected) + || status.equals(ContentStatusDTO.inTheDustbin)) { + contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, callback); + } else { + contentServiceProvider.get().setStatus(session.getUserHash(), stateToken, status, callback); + } + } + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -317,8 +317,10 @@ node.setCls("k-ctn-status-normal"); break; case inTheDustbin: + node.setCls("k-ctn-status-deleted"); + break; case rejected: - node.setCls("k-ctn-status-rejdel"); + node.setCls("k-ctn-status-rejected"); break; case editingInProgress: node.setCls("k-ctn-status-editing"); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -167,7 +167,6 @@ private ActionItemCollection<StateToken> addItem(final String title, final String contentTypeId, final BasicMimeTypeDTO mimeType, final ContentStatusDTO status, final StateToken stateToken, final StateToken parentStateToken, final AccessRightsDTO rights, final boolean isNodeSelected) { - final ActionItemCollection<StateToken> toolbarActions = actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, true); @@ -178,7 +177,11 @@ && rights.isAdministrable(), capabilitiesRegistry.isDropable(contentTypeId) && rights.isAdministrable(), actionRegistry.getCurrentActions(stateToken, contentTypeId, session.isLogged(), rights, false)); - view.addItem(item); + if (status.equals(ContentStatusDTO.inTheDustbin) && !session.getShowDeletedContent()) { + // Don't show + } else { + view.addItem(item); + } return toolbarActions; } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2009-01-26 17:13:03 UTC (rev 1037) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2009-01-26 20:38:12 UTC (rev 1038) @@ -169,7 +169,7 @@ participate.setToolTip(i18n.t("Request to participate in this group")); participate.setMustBeAuthenticated(false); participate.setAddCondition(new ActionAddCondition<StateToken>() { - public boolean mustBeAdded(StateToken token) { + public boolean mustBeAdded(StateToken param) { return !isMember(session.getCurrentState().getGroupRights()); } });

1 0

26 Jan '09

Author: vjrj Date: 2009-01-26 18:13:03 +0100 (Mon, 26 Jan 2009) New Revision: 1037 Modified: trunk/TODO trunk/pom.xml trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java Log: Content status UI improved. Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/TODO 2009-01-26 17:13:03 UTC (rev 1037) @@ -11,6 +11,7 @@ * SHORT-TERM (URGENT) ** TODO <v> User preferences storing + (See also variables in 'Styling braimstorming') We need a way to store (in db) User preferences (like emite chat configurations) in a extensible way. Something similar to java.util.prefs.Preferences or Mozilla about:config http://java.sun.com/developer/technicalArticles/releases/preferences/ @@ -19,8 +20,33 @@ http://stackoverflow.com/questions/194349/what-is-the-proper-way-to-store-a… ** vjrj Styling braimstorming *** layouts -*** screenshot + - name :: greenforrest + - screenshot :: images/greenforrest.png + - varsgroupname :: layout.greenforrest *** html+css+variables +**** css: + +**** variables + prefgroups + - id :: 1 + - groupname :: emite.ui + + pref + - id :: 1 + - group :: 1 + - name :: usercolor + - description :: (optional) The color of the self alias color in chat conversations + - vartype :: (int/boolean/String) red + - defvalue :: ?? #000000 + + userpref + - id :: 1 + - userid :: 123 + - varid :: 1 + - group :: 1 + - name :: usercolor + - status :: (setted|def) setted + - value :: red *** logos *** caching ** danigb,vjrj URLs public/workspace braimstorming @@ -75,6 +101,9 @@ http://vafer.org/blog/20070918215154 Related info: http://java.debian.net/building.html +** <v> implement pubsub in emite + http://xmpp.org/extensions/attic/jep-0060-1.6.html + see: svn checkout svn://anonsvn.it.su.se/su-smack su-smack ** TODO <v> study different embeded video solutions - for ogg :: http://www.flumotion.net/cortado/ - for mp3+ogg :: flowplayer Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/pom.xml 2009-01-26 17:13:03 UTC (rev 1037) @@ -309,10 +309,10 @@ <id>Codehaus Snapshots</id> <url>http://snapshots.repository.codehaus.org/</url> <snapshots> - <enabled>true</enabled> + <enabled>false</enabled> </snapshots> <releases> - <enabled>true</enabled>  + <enabled>false</enabled>  </releases> </pluginRepository> </pluginRepositories> @@ -478,6 +478,7 @@ <scanIntervalSeconds>0</scanIntervalSeconds> </configuration> </plugin> +  <plugin> <groupId>org.liquibase</groupId> <artifactId>liquibase-plugin</artifactId> Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-01-26 17:13:03 UTC (rev 1037) @@ -41,4 +41,4 @@ padding: 1px 0px 1px 1px; text-decoration:none; } -*/.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;} \ No newline at end of file +*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-rejdel a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;} \ No newline at end of file Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-01-26 17:13:03 UTC (rev 1037) @@ -697,18 +697,21 @@ } */ -.k-textlinethrough { +.x-tree-node .k-ctn-status-normal a span { +} + +.x-tree-node .k-ctn-status-rejdel a span { text-decoration: line-through; - color: red; + color: gray; } -.k-textnormal { - text-decoration: inherit; - color: green; +.x-tree-node .k-ctn-status-editing a span { + font-style: italic; + color: gray; } -.k-textunderline { - text-decoration: underline; +.x-tree-node .k-ctn-status-submitted a span { + color: green; } .k-info-links { Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -40,6 +40,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import com.calclab.suco.client.ioc.Provider; @@ -52,11 +53,12 @@ final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<TextEditor> textEditorProvider, final KuneErrorHandler errorHandler, - final BlogViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider) { + final BlogViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo); + documentViewer, entityLogo, publicLink); } @Override @@ -86,8 +88,8 @@ createRefreshCntAction(parentMenuTitle, contents); createRefreshCxtAction(parentMenuTitleCtx, containers); - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", - i18n.t("Upload files (images, PDFs...)"), null, containersNoRoot); + createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), + null, containersNoRoot); createSetAsDefContent(parentMenuTitle, contents); Modified: trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/blogs/client/BlogClientModule.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -48,6 +48,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; @@ -77,7 +78,7 @@ $$(ContentServiceAsync.class), $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityHeader.class), $$(TextEditor.class), $(KuneErrorHandler.class), $(BlogViewer.class), - $$(ContextPropEditor.class)); + $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -40,6 +40,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import com.calclab.suco.client.ioc.Provider; @@ -52,11 +53,12 @@ final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<TextEditor> textEditorProvider, final KuneErrorHandler errorHandler, - final DocumentViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider) { + final DocumentViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo); + documentViewer, entityLogo, publicLink); } @Override @@ -89,8 +91,8 @@ createSetAsDefContent(parentMenuTitle, contents); - createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", - i18n.t("Upload files (images, PDFs...)"), null, containers); + createUploadAction(i18n.t("Upload file"), "images/nav/upload.png", i18n.t("Upload files (images, PDFs...)"), + null, containers); createDownloadActions(TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -48,6 +48,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; @@ -77,7 +78,7 @@ $$(ContentServiceAsync.class), $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityHeader.class), $$(TextEditor.class), $(KuneErrorHandler.class), - $(DocumentViewer.class), $$(ContextPropEditor.class)); + $(DocumentViewer.class), $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -39,6 +39,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import com.calclab.suco.client.ioc.Provider; @@ -51,11 +52,12 @@ final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<TextEditor> textEditorProvider, final KuneErrorHandler errorHandler, - final GalleryViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider) { + final GalleryViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo); + documentViewer, entityLogo, publicLink); } @Override Modified: trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/gallery/client/GalleryClientModule.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -48,6 +48,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; @@ -77,7 +78,7 @@ $$(ContentServiceAsync.class), $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityHeader.class), $$(TextEditor.class), $(KuneErrorHandler.class), $(GalleryViewer.class), - $$(ContextPropEditor.class)); + $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentService.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -63,9 +63,9 @@ void removeAuthor(String userHash, StateToken token, String authorShortName) throws DefaultException; - String renameContainer(String userHash, StateToken token, String newName) throws DefaultException; + StateAbstractDTO renameContainer(String userHash, StateToken token, String newName) throws DefaultException; - String renameContent(String userHash, StateToken token, String newName) throws DefaultException; + StateAbstractDTO renameContent(String userHash, StateToken token, String newName) throws DefaultException; void save(String user, StateToken token, String content) throws DefaultException; @@ -75,9 +75,9 @@ void setPublishedOn(String userHash, StateToken token, Date date) throws DefaultException; - void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status); + StateAbstractDTO setStatus(String userHash, StateToken stateToken, ContentStatusDTO status); - void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status); + StateAbstractDTO setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status); TagCloudResultDTO setTags(String userHash, StateToken token, String tags) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/ContentServiceAsync.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -63,9 +63,10 @@ void removeAuthor(String userHash, StateToken token, String authorShortName, AsyncCallback<?> asyncCallback); - void renameContainer(String userHash, StateToken token, String newName, AsyncCallback<String> asyncCallback); + void renameContainer(String userHash, StateToken token, String newName, + AsyncCallback<StateAbstractDTO> asyncCallback); - void renameContent(String userHash, StateToken token, String newName, AsyncCallback<String> asyncCallback); + void renameContent(String userHash, StateToken token, String newName, AsyncCallback<StateAbstractDTO> asyncCallback); void save(String user, StateToken token, String content, AsyncCallback<?> asyncCallback); @@ -76,10 +77,11 @@ void setPublishedOn(String userHash, StateToken token, Date publishedOn, AsyncCallback<?> asyncCallback); - void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status, AsyncCallback<?> asyncCallback); + void setStatus(String userHash, StateToken stateToken, ContentStatusDTO status, + AsyncCallback<StateAbstractDTO> asyncCallback); void setStatusAsAdmin(String userHash, StateToken stateToken, ContentStatusDTO status, - AsyncCallback<?> asyncCallback); + AsyncCallback<StateAbstractDTO> asyncCallback); void setTags(String userHash, StateToken token, String tags, AsyncCallback<TagCloudResultDTO> asyncCallback); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -76,6 +76,8 @@ public int getImgThumbsize(); + public boolean inSameToken(StateToken token); + void check(AsyncCallbackSimple<?> callback); StateContainerDTO getContainerState(); Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -173,6 +173,10 @@ return initData.getUserTools(); } + public boolean inSameToken(StateToken token) { + return getCurrentStateToken().equals(token); + } + public boolean isLogged() { return userHash != null; } Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManager.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -36,7 +36,7 @@ boolean findIfExistsTitle(Container container, String title); - String renameFolder(Group group, Container container, String newName) throws DefaultException; + Container renameFolder(Group group, Container container, String newName) throws DefaultException; SearchResult<Container> search(String search); Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContainerManagerDefault.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -95,7 +95,7 @@ || (containerFinder.findIfExistsTitle(container, title) > 0); } - public String renameFolder(final Group group, final Container container, final String newName) + public Container renameFolder(final Group group, final Container container, final String newName) throws DefaultException { FilenameUtils.checkBasicFilename(newName); String newNameWithoutNT = FilenameUtils.chomp(newName); @@ -107,7 +107,7 @@ } container.setName(newNameWithoutNT); persist(container); - return newNameWithoutNT; + return container; } public SearchResult<Container> search(final String search) { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManager.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -51,7 +51,7 @@ void removeAuthor(User user, Long contentId, String authorShortName) throws DefaultException; - String renameContent(User user, Long contentId, String newName) throws DefaultException; + Content renameContent(User user, Long contentId, String newName) throws DefaultException; Content save(User editor, Content content, String body); @@ -63,7 +63,7 @@ void setPublishedOn(User user, Long contentId, Date publishedOn) throws DefaultException; - void setStatus(Long contentId, ContentStatus contentStatus); + Content setStatus(Long contentId, ContentStatus contentStatus); void setTags(User user, Long contentId, String tags) throws DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/server/content/ContentManagerDefault.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -156,7 +156,7 @@ content.removeAuthor(author); } - public String renameContent(final User user, final Long contentId, final String newTitle) throws DefaultException { + public Content renameContent(final User user, final Long contentId, final String newTitle) throws DefaultException { String newTitleWithoutNL = FilenameUtils.chomp(newTitle); FilenameUtils.checkBasicFilename(newTitleWithoutNL); final Content content = finder.getContent(contentId); @@ -164,7 +164,7 @@ throw new NameInUseException(); } content.getLastRevision().setTitle(newTitleWithoutNL); - return newTitle; + return content; } public Content save(final User editor, final Content content, final String body) { @@ -209,7 +209,7 @@ content.setPublishedOn(publishedOn); } - public void setStatus(final Long contentId, final ContentStatus status) { + public Content setStatus(final Long contentId, final ContentStatus status) { final Content content = finder.getContent(contentId); content.setStatus(status); switch (status) { @@ -219,6 +219,7 @@ default: break; } + return content; } public void setTags(final User user, final Long contentId, final String tags) throws DefaultException { Modified: trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/platf/server/rpc/ContentRPC.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -125,8 +125,7 @@ public void addAuthor(final String userHash, final StateToken token, final String authorShortName) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); contentManager.addAuthor(user, contentId, authorShortName); } @@ -135,8 +134,7 @@ @Transactional(type = TransactionType.READ_WRITE) public CommentDTO addComment(final String userHash, final StateToken token, final Long parentCommentId, final String commentText) throws DefaultException { - final UserSession userSession = getUserSession(); - final User author = userSession.getUser(); + final User author = getCurrentUser(); final Long contentId = ContentUtils.parseId(token.getDocument()); final Comment comment = commentManager.addComment(author, contentId, commentText, parentCommentId); return mapper.map(comment, CommentDTO.class); @@ -147,8 +145,7 @@ @Transactional(type = TransactionType.READ_WRITE) public CommentDTO addComment(final String userHash, final StateToken token, final String commentText) throws DefaultException { - final UserSession userSession = getUserSession(); - final User author = userSession.getUser(); + final User author = getCurrentUser(); final Long contentId = ContentUtils.parseId(token.getDocument()); final Comment comment = commentManager.addComment(author, contentId, commentText); return mapper.map(comment, CommentDTO.class); @@ -159,14 +156,11 @@ @Transactional(type = TransactionType.READ_WRITE) public StateContentDTO addContent(final String userHash, final StateToken parentToken, final String title, final String typeId) throws DefaultException { - final Group group = groupManager.findByShortName(parentToken.getGroup()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); final Container container = accessService.accessToContainer(ContentUtils.parseId(parentToken.getFolder()), user, AccessRol.Editor); final Content addedContent = creationService.createContent(title, "", user, container, typeId); - final StateContent state = stateService.create(user, addedContent); - return mapStateSiblings(state, user, group); + return getState(user, addedContent); } @Authenticated @@ -174,13 +168,10 @@ @Transactional(type = TransactionType.READ_WRITE) public StateContainerDTO addFolder(final String userHash, final StateToken parentToken, final String title, final String contentTypeId) throws DefaultException { - final Group group = groupManager.findByShortName(parentToken.getGroup()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); final Container container = createFolder(parentToken.getGroup(), ContentUtils.parseId(parentToken.getFolder()), title, contentTypeId); - StateContainer state = stateService.create(user, container); - return mapStateSiblings(state, user, group); + return getState(user, container); } @Authenticated @@ -189,19 +180,15 @@ public StateContainerDTO addRoom(final String userHash, final StateToken parentToken, final String roomName) throws DefaultException { final String groupShortName = parentToken.getGroup(); - final Group group = groupManager.findByShortName(groupShortName); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); final String userShortName = user.getShortName(); - final ChatConnection connection = xmppManager.login(userShortName, userSession.getUser().getPassword(), - userHash); + final ChatConnection connection = xmppManager.login(userShortName, user.getPassword(), userHash); xmppManager.createRoom(connection, roomName, userShortName + userHash); xmppManager.disconnect(connection); try { final Container container = createFolder(groupShortName, ContentUtils.parseId(parentToken.getFolder()), roomName, ChatServerTool.TYPE_ROOM); - StateContainer state = stateService.create(user, container); - return mapStateSiblings(state, user, group); + return getState(user, container); } catch (final ContentNotFoundException e) { xmppManager.destroyRoom(connection, roomName); throw new ContentNotFoundException(); @@ -219,8 +206,7 @@ @Transactional(type = TransactionType.READ_WRITE) public void delContent(final String userHash, final StateToken token) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); contentManager.delContent(user, contentId); } @@ -228,10 +214,8 @@ @Transactional(type = TransactionType.READ_ONLY) public StateAbstractDTO getContent(final String userHash, final StateToken token) throws DefaultException { Group defaultGroup; - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); - final boolean userIsLoggedIn = userSession.isUserLoggedIn(); - if (userIsLoggedIn) { + final User user = getCurrentUser(); + if (isUserLoggedIn()) { defaultGroup = groupManager.getGroupOfUserWithId(user.getId()); if (groupManager.findEnabledTools(defaultGroup.getId()).size() == 0) { // Groups with no homepage @@ -265,8 +249,7 @@ @Transactional(type = TransactionType.READ_WRITE) public CommentDTO markCommentAsAbuse(final String userHash, final StateToken token, final Long commentId) throws DefaultException { - final UserSession userSession = getUserSession(); - final User informer = userSession.getUser(); + final User informer = getCurrentUser(); final Long contentId = ContentUtils.parseId(token.getDocument()); final Comment comment = commentManager.markAsAbuse(informer, contentId, commentId); return mapper.map(comment, CommentDTO.class); @@ -277,11 +260,10 @@ @Transactional(type = TransactionType.READ_WRITE) public RateResultDTO rateContent(final String userHash, final StateToken token, final Double value) throws DefaultException { - final UserSession userSession = getUserSession(); - final User rater = userSession.getUser(); + final User rater = getCurrentUser(); final Long contentId = ContentUtils.parseId(token.getDocument()); - if (userSession.isUserLoggedIn()) { + if (isUserLoggedIn()) { RateResult result = contentManager.rateContent(rater, contentId, value); return mapper.map(result, RateResultDTO.class); } else { @@ -295,32 +277,32 @@ public void removeAuthor(final String userHash, final StateToken token, final String authorShortName) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); contentManager.removeAuthor(user, contentId, authorShortName); } @Authenticated @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) - public String renameContainer(final String userHash, final StateToken token, final String newName) + public StateAbstractDTO renameContainer(final String userHash, final StateToken token, final String newName) throws DefaultException { - return renameFolder(token.getGroup(), ContentUtils.parseId(token.getFolder()), newName); + renameFolder(token.getGroup(), ContentUtils.parseId(token.getFolder()), newName); + return getContent(userHash, token); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) - public String renameContent(final String userHash, final StateToken token, final String newName) + public StateAbstractDTO renameContent(final String userHash, final StateToken token, final String newName) throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); try { accessService.accessToContent(ContentUtils.parseId(token.getDocument()), user, AccessRol.Editor); } catch (final NoResultException e) { throw new AccessViolationException(); } - return renameContent(token.getDocument(), newName); + renameContent(token.getDocument(), newName); + return getContent(userHash, token); } @Authenticated @@ -329,8 +311,7 @@ public void save(final String userHash, final StateToken token, final String textContent) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); final Content content = accessService.accessToContent(contentId, user, AccessRol.Editor); creationService.saveContent(user, content, textContent); } @@ -344,26 +325,13 @@ return mapper.map(content, ContentSimpleDTO.class); } - // @Authenticated - // @Authorizated(accessRolRequired = AccessRol.Administrator, - // actionLevel=ActionLevel.container) - // @Transactional(type = TransactionType.READ_WRITE) - // public ContentSimpleDTO setFolderAsDefaultContent(final String userHash, - // final StateToken token) { - // Container container = - // containerManager.find(ContentUtils.parseId(token.getFolder())); - // groupManager.setDefaultContent(token.getGroup(), container); - // return mapper.map(content, ContentSimpleDTO.class); - // } - @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) @Transactional(type = TransactionType.READ_WRITE) public I18nLanguageDTO setLanguage(final String userHash, final StateToken token, final String languageCode) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); return mapper.map(contentManager.setLanguage(user, contentId, languageCode), I18nLanguageDTO.class); } @@ -373,26 +341,31 @@ public void setPublishedOn(final String userHash, final StateToken token, final Date publishedOn) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); contentManager.setPublishedOn(user, contentId, publishedOn); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor) @Transactional(type = TransactionType.READ_WRITE) - public void setStatus(final String userHash, final StateToken token, final ContentStatusDTO status) { - if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected)) { + public StateAbstractDTO setStatus(final String userHash, final StateToken token, final ContentStatusDTO status) { + if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected) + || status.equals(ContentStatusDTO.inTheDustbin)) { throw new AccessViolationException(); } - contentManager.setStatus(ContentUtils.parseId(token.getDocument()), ContentStatus.valueOf(status.toString())); + Content content = contentManager.setStatus(ContentUtils.parseId(token.getDocument()), + ContentStatus.valueOf(status.toString())); + return getState(getCurrentUser(), content); } @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @Transactional(type = TransactionType.READ_WRITE) - public void setStatusAsAdmin(final String userHash, final StateToken token, final ContentStatusDTO status) { - contentManager.setStatus(ContentUtils.parseId(token.getDocument()), ContentStatus.valueOf(status.toString())); + public StateAbstractDTO setStatusAsAdmin(final String userHash, final StateToken token, + final ContentStatusDTO status) { + Content content = contentManager.setStatus(ContentUtils.parseId(token.getDocument()), + ContentStatus.valueOf(status.toString())); + return getState(getCurrentUser(), content); } @Authenticated @@ -401,8 +374,7 @@ public TagCloudResultDTO setTags(final String userHash, final StateToken token, final String tags) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); final Group group = groupManager.findByShortName(token.getGroup()); contentManager.setTags(user, contentId, tags); return getSummaryTags(group); @@ -413,8 +385,7 @@ @Transactional(type = TransactionType.READ_WRITE) public CommentDTO voteComment(final String userHash, final StateToken token, final Long commentId, final boolean votePositive) throws DefaultException { - final UserSession userSession = getUserSession(); - final User voter = userSession.getUser(); + final User voter = getCurrentUser(); final Long contentId = ContentUtils.parseId(token.getDocument()); final Comment comment = commentManager.vote(voter, contentId, commentId, votePositive); return mapper.map(comment, CommentDTO.class); @@ -422,8 +393,7 @@ private Container createFolder(final String groupShortName, final Long parentFolderId, final String title, final String typeId) throws DefaultException { - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); final Group group = groupManager.findByShortName(groupShortName); final Container container = creationService.createFolder(group, parentFolderId, title, user.getLanguage(), typeId); @@ -437,14 +407,28 @@ Long id = content.getId(); if (id != null) { // Content - return mapStateSiblings(stateService.create(user, content), user, content.getContainer().getOwner()); + return mapState(stateService.create(user, content), user); } else { // Container final Container container = content.getContainer(); - return mapStateSiblings(stateService.create(user, container), user, container.getOwner()); + return mapState(stateService.create(user, container), user); } } + private User getCurrentUser() { + return getUserSession().getUser(); + } + + private StateContainerDTO getState(User user, Container container) { + StateContainer state = stateService.create(user, container); + return mapState(state, user); + } + + private StateContentDTO getState(User user, Content content) { + StateContent state = stateService.create(user, content); + return mapState(state, user); + } + private TagCloudResultDTO getSummaryTags(final Group group) { TagCloudResult result = tagManager.getTagCloudResultByGroup(group); return new TagCloudResultDTO(mapper.mapList(result.getTagCountList(), TagCountDTO.class), result.getMaxValue(), @@ -455,6 +439,10 @@ return userSessionProvider.get(); } + private boolean isUserLoggedIn() { + return getUserSession().isUserLoggedIn(); + } + private void mapContentRightsInstate(final User user, final AccessLists groupAccessList, final ContentSimpleDTO siblingDTO) { final Content sibling = contentManager.find(siblingDTO.getId()); @@ -462,9 +450,9 @@ siblingDTO.setRights(mapper.map(rightsService.get(user, lists), AccessRightsDTO.class)); } - private StateContainerDTO mapStateSiblings(final StateContainer state, final User user, final Group group) { + private StateContainerDTO mapState(final StateContainer state, final User user) { final StateContainerDTO stateDTO = mapper.map(state, StateContainerDTO.class); - final AccessLists groupAccessList = group.getSocialNetwork().getAccessLists(); + final AccessLists groupAccessList = state.getGroup().getSocialNetwork().getAccessLists(); for (final ContentSimpleDTO siblingDTO : stateDTO.getRootContainer().getContents()) { mapContentRightsInstate(user, groupAccessList, siblingDTO); } @@ -474,9 +462,9 @@ return stateDTO; } - private StateContentDTO mapStateSiblings(final StateContent state, final User user, final Group group) { + private StateContentDTO mapState(final StateContent state, final User user) { final StateContentDTO stateDTO = mapper.map(state, StateContentDTO.class); - final AccessLists groupAccessList = group.getSocialNetwork().getAccessLists(); + final AccessLists groupAccessList = state.getGroup().getSocialNetwork().getAccessLists(); for (final ContentSimpleDTO siblingDTO : stateDTO.getRootContainer().getContents()) { mapContentRightsInstate(user, groupAccessList, siblingDTO); } @@ -486,19 +474,17 @@ return stateDTO; } - private String renameContent(final String documentId, final String newName) throws ContentNotFoundException, + private Content renameContent(final String documentId, final String newName) throws ContentNotFoundException, DefaultException { final Long contentId = ContentUtils.parseId(documentId); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); return contentManager.renameContent(user, contentId, newName); } - private String renameFolder(final String groupShortName, final Long folderId, final String newName) + private Container renameFolder(final String groupShortName, final Long folderId, final String newName) throws DefaultException { final Group group = groupManager.findByShortName(groupShortName); - final UserSession userSession = getUserSession(); - final User user = userSession.getUser(); + final User user = getCurrentUser(); final Container container = accessService.accessToContainer(folderId, user, AccessRol.Editor); return containerManager.renameFolder(group, container, newName); } Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientActions.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -40,6 +40,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import com.calclab.suco.client.ioc.Provider; @@ -52,11 +53,12 @@ final ContentActionRegistry contentActionRegistry, final ContextActionRegistry contextActionRegistry, final Provider<FileDownloadUtils> fileDownloadProvider, final EntityHeader entityLogo, final Provider<TextEditor> textEditorProvider, final KuneErrorHandler errorHandler, - final WikiViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider) { + final WikiViewer documentViewer, final Provider<ContextPropEditor> contextProvEditorProvider, + final SitePublicSpaceLink publicLink) { super(session, stateManager, i18n, errorHandler, deferredCommandWrapper, groupServiceProvider, contentServiceProvider, fileUploaderProvider, contextNavigator, contentActionRegistry, contextActionRegistry, fileDownloadProvider, textEditorProvider, contextProvEditorProvider, - documentViewer, entityLogo); + documentViewer, entityLogo, publicLink); } @Override Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/WikiClientModule.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -48,6 +48,7 @@ import org.ourproject.kune.workspace.client.editor.TextEditor; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; @@ -77,7 +78,7 @@ $$(ContentServiceAsync.class), $$(GroupServiceAsync.class), $$(FileUploader.class), $(ContentActionRegistry.class), $(ContextActionRegistry.class), $$(FileDownloadUtils.class), $(EntityHeader.class), $$(TextEditor.class), $(KuneErrorHandler.class), $(WikiViewer.class), - $$(ContextPropEditor.class)); + $$(ContextPropEditor.class), $(SitePublicSpaceLink.class)); } }); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -17,6 +17,7 @@ import org.ourproject.kune.platf.client.dto.ContentStatusDTO; import org.ourproject.kune.platf.client.dto.GroupDTO; import org.ourproject.kune.platf.client.dto.InitDataDTO; +import org.ourproject.kune.platf.client.dto.StateAbstractDTO; import org.ourproject.kune.platf.client.dto.StateContainerDTO; import org.ourproject.kune.platf.client.dto.StateContentDTO; import org.ourproject.kune.platf.client.dto.StateToken; @@ -37,6 +38,7 @@ import org.ourproject.kune.workspace.client.entityheader.EntityHeader; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.site.Site; +import org.ourproject.kune.workspace.client.sitebar.sitepublic.SitePublicSpaceLink; import org.ourproject.kune.workspace.client.socialnet.RadioMustBeChecked; import com.calclab.suco.client.events.Listener; @@ -66,6 +68,7 @@ protected final FoldableContent foldableContent; protected final DeferredCommandWrapper deferredCommandWrapper; protected final EntityHeader entityLogo; + private final SitePublicSpaceLink publicLink; public AbstractFoldableContentActions(Session session, StateManager stateManager, I18nUITranslationService i18n, KuneErrorHandler errorHandler, DeferredCommandWrapper deferredCommandWrapper, @@ -74,7 +77,7 @@ ContentActionRegistry contentActionRegistry, ContextActionRegistry contextActionRegistry, Provider<FileDownloadUtils> fileDownloadProvider, Provider<TextEditor> textEditorProvider, Provider<ContextPropEditor> contextPropEditorProvider, FoldableContent foldableContent, - EntityHeader entityLogo) { + EntityHeader entityLogo, SitePublicSpaceLink publicLink) { this.session = session; this.stateManager = stateManager; this.i18n = i18n; @@ -91,6 +94,7 @@ this.contextPropEditorProvider = contextPropEditorProvider; this.foldableContent = foldableContent; this.entityLogo = entityLogo; + this.publicLink = publicLink; createActions(); session.onInitDataReceived(new Listener<InitDataDTO>() { public void onEvent(InitDataDTO parameter) { @@ -113,7 +117,7 @@ AccessRolDTO.Administrator, i18n.t("Rejected"), parentMenuTitle, ContentStatusDTO.rejected); final ActionToolbarMenuRadioDescriptor<StateToken> setSubmittedForPublishStatus = createSetStatusAction( AccessRolDTO.Administrator, i18n.t("Submitted for publish"), parentMenuTitle, - ContentStatusDTO.publishedOnline); + ContentStatusDTO.submittedForEvaluation); final ActionToolbarMenuRadioDescriptor<StateToken> setInTheDustBinStatus = createSetStatusAction( AccessRolDTO.Administrator, i18n.t("In the rubbish bin"), parentMenuTitle, ContentStatusDTO.inTheDustbin); @@ -247,7 +251,7 @@ foldableContent.attach(); contextPropEditorProvider.get().detach(); contextNavigator.attach(); - if (session.getCurrentStateToken().equals(stateToken)) { + if (session.inSameToken(stateToken)) { contextNavigator.refreshState(); foldableContent.refreshState(); } @@ -440,13 +444,17 @@ final ActionToolbarMenuRadioDescriptor<StateToken> action = new ActionToolbarMenuRadioDescriptor<StateToken>( rol, ActionToolbarPosition.topbar, new Listener<StateToken>() { public void onEvent(final StateToken stateToken) { - final AsyncCallbackSimple<Object> callback = new AsyncCallbackSimple<Object>() { - public void onSuccess(final Object result) { - session.getContentState().setStatus(status); + final AsyncCallbackSimple<StateAbstractDTO> callback = new AsyncCallbackSimple<StateAbstractDTO>() { + public void onSuccess(final StateAbstractDTO state) { + if (session.inSameToken(stateToken)) { + session.setCurrentState(state); + publicLink.setState(state); + } contextNavigator.setItemStatus(stateToken, status); } }; - if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected)) { + if (status.equals(ContentStatusDTO.publishedOnline) || status.equals(ContentStatusDTO.rejected) + || status.equals(ContentStatusDTO.inTheDustbin)) { contentServiceProvider.get().setStatusAsAdmin(session.getUserHash(), stateToken, status, callback); } else { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -138,9 +138,8 @@ presenter.gotoToken(getToken(node)); } }); + setNodeStatus(child, item.getContentStatus()); parent.appendChild(child); - ContentStatusDTO status = item.getContentStatus(); - setNodeStatus(child, status); } else { Log.error("Error building file tree, parent folder " + item.getParentId() + " not found"); } @@ -314,17 +313,18 @@ private void setNodeStatus(final TreeNode node, ContentStatusDTO status) { switch (status) { - // FIXME: while not finished case publishedOnline: - // node.setCls("k-textnormal"); + node.setCls("k-ctn-status-normal"); break; case inTheDustbin: case rejected: - // node.setCls("k-textlinethrough"); + node.setCls("k-ctn-status-rejdel"); break; case editingInProgress: + node.setCls("k-ctn-status-editing"); + break; case submittedForEvaluation: - // node.setCls("k-textunderline"); + node.setCls("k-ctn-status-submitted"); break; } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -86,7 +86,7 @@ this.renameAction = renameAction; actionsByItem = new HashMap<StateToken, ActionItemCollection<StateToken>>(); editOnNextStateChange = false; - confRenameListener(); + addRenameListener(); } public void addFileUploaderListener(FileUploader uploader) { @@ -121,32 +121,15 @@ view.editItem(genId(stateToken)); } - public void gotoToken(final String token) { - stateManager.gotoToken(token); - } - public void init(final ContextNavigatorView view) { this.view = view; - session.onUserSignIn(new Listener<UserInfoDTO>() { - public void onEvent(final UserInfoDTO parameter) { - clear(); - } - }); - session.onUserSignOut(new Listener0() { - public void onEvent() { - clear(); - } - }); + addListeners(); } public boolean isSelected(final StateToken stateToken) { return view.isSelected(genId(stateToken)); } - public boolean mustEditOnNextStateChange() { - return editOnNextStateChange; - } - public void refreshState() { StateAbstractDTO currentState = session.getCurrentState(); if (currentState instanceof StateContainerDTO) { @@ -165,80 +148,16 @@ } public void setItemStatus(final StateToken stateToken, ContentStatusDTO status) { - view.setItemStatus(genId(stateToken), status); + clear(); + refreshState(); } public void setState(final StateContainerDTO state, final boolean select) { setStateContainer(state, select); } - public void setStateContainer(final StateContainerDTO state, final boolean select) { - // TODO: separate in two methods for stateConent and stateContainer - - final StateToken stateToken = state.getStateToken(); - boolean isContent = (state instanceof StateContentDTO); - StateContentDTO stateContent = null; - - final ContainerDTO container = state.getContainer(); - final AccessRightsDTO containerRights = state.getContainerRights(); - AccessRightsDTO rights; - - if (isContent) { - stateContent = (StateContentDTO) state; - rights = stateContent.getContentRights(); - } else { - rights = containerRights; - } - view.setEditable(rights.isEditable()); - - // If root sended (container is not a root folder) process root (add - // childs to view) - final ContainerDTO root = state.getRootContainer(); - if (root != null) { - view.setRootItem(genId(root.getStateToken()), i18n.t(root.getName()), root.getStateToken()); - createChildItems(root, containerRights); - } - - // Do the path to our current content - createTreePath(stateToken, container.getAbsolutePath(), containerRights); - - // Process our current content/container - final ActionItemCollection<StateToken> actionItems = new ActionItemCollection<StateToken>(); - if (isContent) { - rights = stateContent.getContentRights(); - final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), state.getTypeId(), - stateContent.getMimeType(), stateContent.getStatus(), stateToken, container.getStateToken(), - rights, false); - final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions( - container.getStateToken(), container.getTypeId(), session.isLogged(), containerRights, true); - actionItems.addAll(containerActions); - actionItems.addAll(contentActions); - - } else { - rights = containerRights; - final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), - container.getTypeId(), null, ContentStatusDTO.publishedOnline, container.getStateToken(), - container.getStateToken().copy().setFolder(container.getParentFolderId()), containerRights, false); - actionItems.addAll(containerActions); - } - - actionsByItem.put(stateToken, actionItems); - - // Process container childs - createChildItems(container, containerRights); - - // Finaly - if (mustEditOnNextStateChange()) { - // Code smell - selectItem(stateToken); - editItem(stateToken); - setEditOnNextStateChange(false); - } else { - if (select) { - selectItem(stateToken); - } - } - toolbar.attach(); + protected void gotoToken(final String token) { + stateManager.gotoToken(token); } protected void onItemRename(final String token, final String newName, final String oldName) { @@ -263,18 +182,31 @@ return toolbarActions; } - private void confRenameListener() { + private void addListeners() { + session.onUserSignIn(new Listener<UserInfoDTO>() { + public void onEvent(final UserInfoDTO parameter) { + clear(); + } + }); + session.onUserSignOut(new Listener0() { + public void onEvent() { + clear(); + } + }); + } + + private void addRenameListener() { Listener2<StateToken, String> onSuccess = new Listener2<StateToken, String>() { public void onEvent(StateToken token, String newName) { setItemText(token, newName); } }; - renameAction.onSuccess(onSuccess); Listener2<StateToken, String> onFail = new Listener2<StateToken, String>() { public void onEvent(StateToken token, String oldName) { setItemText(token, oldName); } }; + renameAction.onSuccess(onSuccess); renameAction.onFail(onFail); } @@ -306,7 +238,7 @@ } private String genId(final StateToken token) { - return "k-" + token.toString().replace(StateToken.SEPARATOR, "-"); + return "k-cnav-" + token.toString().replace(StateToken.SEPARATOR, "-"); } private String getIcon(final StateToken token, final String contentTypeId, final BasicMimeTypeDTO mimeType) { @@ -328,7 +260,78 @@ } } + private void selectOrEditNode(final boolean select, final StateToken stateToken) { + // Finaly + if (editOnNextStateChange) { + // Code smell + selectItem(stateToken); + editItem(stateToken); + setEditOnNextStateChange(false); + } else { + if (select) { + selectItem(stateToken); + } + } + } + private void setItemText(final StateToken stateToken, final String name) { view.setItemText(genId(stateToken), name); } + + private void setStateContainer(final StateContainerDTO state, final boolean select) { + final StateToken stateToken = state.getStateToken(); + boolean isContent = (state instanceof StateContentDTO); + StateContentDTO stateContent = null; + + final ContainerDTO container = state.getContainer(); + final AccessRightsDTO containerRights = state.getContainerRights(); + AccessRightsDTO rights; + + showRootFolder(state, containerRights); + + // Do the path to our current content + createTreePath(stateToken, container.getAbsolutePath(), containerRights); + + // Process our current content/container + final ActionItemCollection<StateToken> actionItems = new ActionItemCollection<StateToken>(); + + if (isContent) { + stateContent = (StateContentDTO) state; + rights = stateContent.getContentRights(); + final ActionItemCollection<StateToken> contentActions = addItem(state.getTitle(), state.getTypeId(), + stateContent.getMimeType(), stateContent.getStatus(), stateToken, container.getStateToken(), + rights, false); + final ActionItemCollection<StateToken> containerActions = actionRegistry.getCurrentActions( + container.getStateToken(), container.getTypeId(), session.isLogged(), containerRights, true); + actionItems.addAll(containerActions); + actionItems.addAll(contentActions); + } else { + rights = containerRights; + final ActionItemCollection<StateToken> containerActions = addItem(container.getName(), + container.getTypeId(), null, ContentStatusDTO.publishedOnline, container.getStateToken(), + container.getStateToken().copy().setFolder(container.getParentFolderId()), containerRights, false); + actionItems.addAll(containerActions); + } + view.setEditable(rights.isEditable()); + + actionsByItem.put(stateToken, actionItems); + + // Process container childs + createChildItems(container, containerRights); + + selectOrEditNode(select, stateToken); + + toolbar.attach(); + } + + private void showRootFolder(final StateContainerDTO state, final AccessRightsDTO containerRights) { + // If container is not a root folder process root (add + // childs to view) + final ContainerDTO root = state.getRootContainer(); + if (root != null) { + // container is not root + view.setRootItem(genId(root.getStateToken()), i18n.t(root.getName()), root.getStateToken()); + createChildItems(root, containerRights); + } + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLink.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -18,8 +18,12 @@ * */package org.ourproject.kune.workspace.client.sitebar.sitepublic; +import org.ourproject.kune.platf.client.dto.StateAbstractDTO; + public interface SitePublicSpaceLink { + void setState(StateAbstractDTO state); + void setVisible(boolean visible); } 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-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPanel.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -21,7 +21,6 @@ import org.ourproject.kune.platf.client.services.Images; import org.ourproject.kune.platf.client.ui.IconLabel; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; -import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.skel.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; @@ -45,7 +44,7 @@ publicHP = new HorizontalPanel(); gotoPublic = new IconLabel(img.anybody(), i18n.t("Public Space"), false); gotoPublic.ensureDebugId(SITE_GOTO_PUBLIC); - contentNoPublic = new IconLabel(img.anybody(), i18n.t("This content is not public")); + contentNoPublic = new IconLabel(img.anybody(), i18n.t("This is not public")); contentNoPublic.ensureDebugId(SITE_CONTENT_NO_PUBLIC); publicHP.add(gotoPublic); publicHP.add(contentNoPublic); @@ -60,9 +59,10 @@ gotoPublic(); } }); - gotoPublic.setTitle(i18n.t("Leave the workspace and go to this group public space") + Site.IN_DEVELOPMENT); + gotoPublic.setTitle(i18n.t("Leave the workspace and go to this group public space")); gotoPublic.addStyleName("k-sitebar-labellink"); contentNoPublic.addStyleName("k-sitebar-labellink"); + } public void attach() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -19,9 +19,11 @@ */package org.ourproject.kune.workspace.client.sitebar.sitepublic; import org.ourproject.kune.platf.client.View; +import org.ourproject.kune.platf.client.dto.ContentStatusDTO; import org.ourproject.kune.platf.client.dto.GroupListDTO; import org.ourproject.kune.platf.client.dto.StateAbstractDTO; import org.ourproject.kune.platf.client.dto.StateContainerDTO; +import org.ourproject.kune.platf.client.dto.StateContentDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.StateManager; @@ -34,11 +36,7 @@ public SitePublicSpaceLinkPresenter(final StateManager stateManager) { stateManager.onStateChanged(new Listener<StateAbstractDTO>() { public void onEvent(final StateAbstractDTO state) { - if (state instanceof StateContainerDTO) { - setState((StateContainerDTO) state); - } else { - view.detach(); - } + setState(state); } }); } @@ -51,21 +49,34 @@ this.view = view; } + public void setState(final StateAbstractDTO state) { + if (state instanceof StateContainerDTO) { + final StateToken token = state.getStateToken(); + if (((StateContainerDTO) state).getAccessLists().getViewers().getMode().equals(GroupListDTO.EVERYONE)) { + final String publicUrl = token.getPublicUrl(); + view.setContentGotoPublicUrl(publicUrl); + if (state instanceof StateContentDTO) { + StateContentDTO content = (StateContentDTO) state; + if (content.getStatus().equals(ContentStatusDTO.publishedOnline)) { + view.setContentPublic(true); + } else { + view.setContentPublic(false); + } + } else { + view.setContentPublic(true); + } + } else { + view.setContentPublic(false); + } + view.attach(); + view.setVisible(true); + } else { + view.detach(); + } + } + public void setVisible(final boolean visible) { view.setVisible(visible); } - private void setState(final StateContainerDTO state) { - final StateToken token = state.getStateToken(); - if (state.getAccessLists().getViewers().getMode().equals(GroupListDTO.EVERYONE)) { - final String publicUrl = token.getPublicUrl(); - view.setContentGotoPublicUrl(publicUrl); - view.setContentPublic(true); - } else { - view.setContentPublic(false); - } - view.attach(); - view.setVisible(true); - } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -78,5 +78,4 @@ public void setContentTitleVisible(final boolean visible) { titleLabel.setVisible(visible); } - } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -59,7 +59,7 @@ } } }); - createRenameListeners(); + addRenameListeners(); } public View getView() { @@ -83,18 +83,18 @@ renameAction.rename(token, oldName, newName); } - private void createRenameListeners() { + private void addRenameListeners() { Listener2<StateToken, String> onSuccess = new Listener2<StateToken, String>() { public void onEvent(StateToken token, String newName) { view.setContentTitle(newName); } }; - renameAction.onSuccess(onSuccess); Listener2<StateToken, String> onFail = new Listener2<StateToken, String>() { public void onEvent(StateToken token, String oldName) { view.setContentTitle(oldName); } }; + renameAction.onSuccess(onSuccess); renameAction.onFail(onFail); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -1,5 +1,6 @@ package org.ourproject.kune.workspace.client.title; +import org.ourproject.kune.platf.client.dto.StateAbstractDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.errors.NameInUseException; import org.ourproject.kune.platf.client.errors.NameNotPermittedException; @@ -39,7 +40,7 @@ public void rename(final StateToken token, final String oldName, final String newName) { if (!newName.equals(oldName)) { Site.showProgress(i18n.t("Renaming")); - final AsyncCallback<String> asyncCallback = new AsyncCallback<String>() { + final AsyncCallback<StateAbstractDTO> asyncCallback = new AsyncCallback<StateAbstractDTO>() { public void onFailure(final Throwable caught) { Site.hideProgress(); try { @@ -56,9 +57,10 @@ onFail.fire(token, oldName); } - public void onSuccess(final String finalNewName) { + public void onSuccess(final StateAbstractDTO state) { Site.hideProgress(); - onSuccess.fire(token, finalNewName); + session.setCurrentState(state); + onSuccess.fire(token, state.getTitle()); } }; if (token.isComplete()) { Modified: trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2009-01-21 01:38:59 UTC (rev 1036) +++ trunk/src/test/java/org/ourproject/kune/platf/integration/content/ContentServiceVariousTest.java 2009-01-26 17:13:03 UTC (rev 1037) @@ -13,6 +13,7 @@ import org.ourproject.kune.docs.server.DocumentServerTool; import org.ourproject.kune.platf.client.dto.ContainerDTO; import org.ourproject.kune.platf.client.dto.ContentSimpleDTO; +import org.ourproject.kune.platf.client.dto.StateAbstractDTO; import org.ourproject.kune.platf.client.dto.StateContainerDTO; import org.ourproject.kune.platf.client.dto.StateContentDTO; import org.ourproject.kune.platf.client.dto.StateToken; @@ -88,9 +89,9 @@ final StateToken folderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), newFolder.getId().toString(), null); - String result = contentService.renameContainer(getHash(), folderToken, newTitle); + StateAbstractDTO result = contentService.renameContainer(getHash(), folderToken, newTitle); - assertEquals(newTitle, result); + assertEquals(newTitle, result.getTitle()); final StateToken newFolderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), newFolder.getId().toString(), null); @@ -128,9 +129,9 @@ final String newTitle = "folder new name"; final StateToken folderToken = new StateToken(groupShortName, defaultContent.getStateToken().getTool(), folder.getId().toString(), null); - final String result = contentService.renameContainer(getHash(), folderToken, newTitle); + final StateAbstractDTO result = contentService.renameContainer(getHash(), folderToken, newTitle); - assertEquals(newTitle, result); + assertEquals(newTitle, result.getTitle()); final ContainerDTO folderAgain = getSiteDefaultContent().getContainer(); @@ -193,9 +194,9 @@ newTitle = "folder last name"; - final String result = contentService.renameContainer(getHash(), newState.getStateToken(), newTitle); + final StateAbstractDTO result = contentService.renameContainer(getHash(), newState.getStateToken(), newTitle); - assertEquals(newTitle, result); + assertEquals(newTitle, result.getTitle()); final StateContainerDTO folderAgain = (StateContainerDTO) contentService.getContent(getHash(), newState.getStateToken());

1 0

r1036 - trunk
by vjrj 21 Jan '09

21 Jan '09

Author: vjrj Date: 2009-01-21 02:38:59 +0100 (Wed, 21 Jan 2009) New Revision: 1036 Modified: trunk/TODO Log: blog/wiki converters in TODO Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-01-20 20:22:07 UTC (rev 1035) +++ trunk/TODO 2009-01-21 01:38:59 UTC (rev 1036) @@ -349,6 +349,9 @@ CLOSED: [2009-01-03 sáb 01:37] * LONG-TERM +** <s> integrate some blog/wiki converter: + http://code.google.com/p/google-blog-converters-appengine/ + http://toolserver.org/~merphant/wiki2html/ ** Think about recommendations/suggestions http://taste.sourceforge.net/ * IDEAS

1 0

r1035 - trunk/doc
by Javier de la Cueva 20 Jan '09

20 Jan '09

Author: jdelacueva Date: 2009-01-20 21:22:07 +0100 (Tue, 20 Jan 2009) New Revision: 1035 Modified: trunk/doc/kune-ene-09.pdf Log: Reflecting in pdf changes made in odp file: slides 5, 7, 9, 10, 11, 13, 14, 16, 17, 20, 21 and 22 Modified: trunk/doc/kune-ene-09.pdf =================================================================== (Binary files differ)

1 0

r1034 - trunk/doc
by Javier de la Cueva 20 Jan '09

20 Jan '09

Author: jdelacueva Date: 2009-01-20 21:01:35 +0100 (Tue, 20 Jan 2009) New Revision: 1034 Modified: trunk/doc/kune-ene-09.odp Log: Changes made in slides 5, 7, 9, 10, 11, 13, 14, 16, 17, 20, 21 and 22 Modified: trunk/doc/kune-ene-09.odp =================================================================== (Binary files differ)

1 0

19 Jan '09

Author: vjrj Date: 2009-01-19 10:17:59 +0100 (Mon, 19 Jan 2009) New Revision: 1033 Added: trunk/src/main/java/org/ourproject/kune/app/public/css/img/link.gif trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstract.java Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstractPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmail.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExt.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtView.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocal.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java Log: Complete - task Insert link improvements (preview, better url checks, form reset) Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2009-01-19 09:17:59 UTC (rev 1033) @@ -41,4 +41,4 @@ padding: 1px 0px 1px 1px; text-decoration:none; } -*/.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;} \ No newline at end of file +*/.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;} \ No newline at end of file Added: trunk/src/main/java/org/ourproject/kune/app/public/css/img/link.gif =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/css/img/link.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css =================================================================== --- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2009-01-19 09:17:59 UTC (rev 1033) @@ -817,6 +817,10 @@ vertical-align: bottom; } +.k-link-icon { + background-image: url(img/link.gif) !important; +} + .k-options-icon { background-image: url(img/emblem-system.gif) !important; } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/TextEditorInsertElementGroup.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -18,6 +18,8 @@ * */package org.ourproject.kune.platf.client.app; +import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstract; + import com.calclab.suco.client.ioc.Container; import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.ioc.decorator.ProviderCollection; @@ -37,7 +39,7 @@ public void resetAll() { for (final Provider<?> p : getProviders()) { - // (TextEditorInsertAbstractView) p.get().get).clear(); + ((TextEditorInsertAbstract) p.get()).reset(); } } } Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -85,6 +85,7 @@ import org.ourproject.kune.workspace.client.editor.insert.linkext.TextEditorInsertLinkExt; import org.ourproject.kune.workspace.client.editor.insert.linkext.TextEditorInsertLinkExtPanel; import org.ourproject.kune.workspace.client.editor.insert.linkext.TextEditorInsertLinkExtPresenter; +import org.ourproject.kune.workspace.client.editor.insert.linkext.TextEditorInsertLinkExtView; import org.ourproject.kune.workspace.client.editor.insert.linklocal.TextEditorInsertLinkLocal; import org.ourproject.kune.workspace.client.editor.insert.linklocal.TextEditorInsertLinkLocalPanel; import org.ourproject.kune.workspace.client.editor.insert.linklocal.TextEditorInsertLinkLocalPresenter; @@ -403,7 +404,7 @@ public TextEditorInsertLinkExt create() { final TextEditorInsertLinkExtPresenter presenter = new TextEditorInsertLinkExtPresenter( $(TextEditorInsertElement.class)); - final TextEditorInsertLinkExtPanel panel = new TextEditorInsertLinkExtPanel(presenter, + final TextEditorInsertLinkExtView panel = new TextEditorInsertLinkExtPanel(presenter, $(I18nTranslationService.class)); presenter.init(panel); return presenter; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -18,7 +18,6 @@ * */package org.ourproject.kune.platf.client.ui.dialogs; -import com.allen_sauer.gwt.log.client.Log; import com.gwtext.client.core.Position; import com.gwtext.client.widgets.Button; import com.gwtext.client.widgets.PaddedPanel; @@ -93,7 +92,6 @@ } public void reset() { - Log.info("Reset------------------"); form.getForm().reset(); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -15,10 +15,10 @@ public TextEditorInsertElementPanel(final TextEditorInsertElementPresenter presenter, final WorkspaceSkeleton ws, Images images, I18nTranslationService i18n, final TextEditorInsertElementGroup textEditorInsertElementGroup) { - super(TEXT_EDT_INSERT_DIALOG, i18n.tWithNT("Insert an element", + super(TEXT_EDT_INSERT_DIALOG, i18n.tWithNT("Insert a link", "Option in a text editor to insert links and other elements"), 380, HEIGHT + 90, 380, HEIGHT + 90, true, images, TEXT_EDT_INSERT_DIALOG_ERROR_ID); - // super.setIconCls("k-options-icon"); + super.setIconCls("k-link-icon"); this.textEditorInsertElementGroup = textEditorInsertElementGroup; super.addHideListener(new Listener0() { public void onEvent() { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -4,5 +4,5 @@ import org.ourproject.kune.workspace.client.options.AbstractOptionsView; public interface TextEditorInsertElementView extends AbstractOptionsView, View { - int HEIGHT = 200; + int HEIGHT = 225; } Added: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstract.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstract.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstract.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -0,0 +1,7 @@ +package org.ourproject.kune.workspace.client.editor.insert.abstractlink; + +public interface TextEditorInsertAbstract { + + void reset(); + +} Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstractPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstractPresenter.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/abstractlink/TextEditorInsertAbstractPresenter.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -3,7 +3,7 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElement; -public class TextEditorInsertAbstractPresenter { +public class TextEditorInsertAbstractPresenter implements TextEditorInsertAbstract { private TextEditorInsertAbstractView view; private final TextEditorInsertElement editorInsertElement; @@ -23,6 +23,10 @@ public void onInsert(String name, String link) { editorInsertElement.fireOnInsert(name, link); + reset(); + } + + public void reset() { view.reset(); } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmail.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmail.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmail.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -1,5 +1,7 @@ package org.ourproject.kune.workspace.client.editor.insert.linkemail; -public interface TextEditorInsertLinkEmail { +import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstract; +public interface TextEditorInsertLinkEmail extends TextEditorInsertAbstract { + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPresenter.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPresenter.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -10,7 +10,4 @@ super(editorInsertElement); } - public void init(TextEditorInsertLinkEmailView view) { - super.init(view); - } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExt.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExt.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExt.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -1,5 +1,7 @@ package org.ourproject.kune.workspace.client.editor.insert.linkext; -public interface TextEditorInsertLinkExt { +import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstract; +public interface TextEditorInsertLinkExt extends TextEditorInsertAbstract { + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -1,19 +1,24 @@ package org.ourproject.kune.workspace.client.editor.insert.linkext; import org.ourproject.kune.platf.client.services.I18nTranslationService; +import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm; import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementView; +import com.google.gwt.user.client.ui.Frame; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; +import com.gwtext.client.widgets.PaddedPanel; +import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.event.ButtonListenerAdapter; import com.gwtext.client.widgets.form.TextField; -import com.gwtext.client.widgets.form.VType; +import com.gwtext.client.widgets.layout.FitLayout; public class TextEditorInsertLinkExtPanel extends DefaultForm implements TextEditorInsertLinkExtView { public static final String LINK_FIELD = "k-teilep-link-f"; - private final TextField linkField; + final TextField linkField; + final Panel previewPanel; public TextEditorInsertLinkExtPanel(final TextEditorInsertLinkExtPresenter presenter, final I18nTranslationService i18n) { @@ -23,7 +28,8 @@ linkField = new TextField(); linkField.setTabIndex(1); linkField.setFieldLabel(i18n.t("External link (URL)")); - linkField.setVtype(VType.URL); + linkField.setRegex(TextUtils.URL_REGEXP); + linkField.setRegexText(i18n.t("The link should be a URL in the format 'http://www.domain.com'")); linkField.setName(LINK_FIELD); linkField.setWidth(DEF_FIELD_WIDTH); linkField.setAllowBlank(false); @@ -32,19 +38,47 @@ linkField.setValidationEvent(false); linkField.setId(LINK_FIELD); add(linkField); + previewPanel = new Panel(); + previewPanel.setLayout(new FitLayout()); + previewPanel.setHeight(125); + add(new PaddedPanel(previewPanel, 0)); + Button preview = new Button(i18n.t("Preview")); + preview.addListener(new ButtonListenerAdapter() { + @Override + public void onClick(Button button, EventObject e) { + presenter.onPreview(); + } + }); + addButton(preview); + Button insert = new Button(i18n.t("Insert")); insert.addListener(new ButtonListenerAdapter() { @Override public void onClick(Button button, EventObject e) { - if (getFormPanel().getForm().isValid()) { - presenter.onInsert("", linkField.getRawValue()); - } + presenter.onInsert(); } }); addButton(insert); } - public void clear() { + public String getUrl() { + return linkField.getRawValue(); + } + + @Override + public void reset() { super.reset(); + previewPanel.clear(); } + + public void setPreviewUrl(String url) { + Frame previewFrame = new Frame(url); + previewPanel.clear(); + previewPanel.add(previewFrame); + previewPanel.doLayout(); + } + + public void setUrl(String url) { + linkField.setValue(url); + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPresenter.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPresenter.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -1,16 +1,60 @@ package org.ourproject.kune.workspace.client.editor.insert.linkext; +import org.ourproject.kune.platf.client.ui.TextUtils; import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElement; import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstractPresenter; public class TextEditorInsertLinkExtPresenter extends TextEditorInsertAbstractPresenter implements TextEditorInsertLinkExt { + interface Action { + void onValid(String url); + } + + private TextEditorInsertLinkExtView view; + public TextEditorInsertLinkExtPresenter(TextEditorInsertElement editorInsertElement) { super(editorInsertElement); } public void init(TextEditorInsertLinkExtView view) { super.init(view); + this.view = view; } + + public void onInsert() { + doActionIfValid(new Action() { + public void onValid(String url) { + onInsert("", url); + } + }); + } + + public void onPreview() { + doActionIfValid(new Action() { + public void onValid(String url) { + view.setPreviewUrl(url); + } + }); + } + + private void doActionIfValid(Action action) { + String url = view.getUrl(); + if (url.matches(TextUtils.URL_REGEXP)) { + action.onValid(url); + } else { + if (!url.startsWith("http://")) { + url = "http://" + url; + if (url.matches(TextUtils.URL_REGEXP)) { + view.setUrl(url); + action.onValid(url); + } else { + view.isValid(); + } + } else { + // Seems is not valid + view.isValid(); + } + } + } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtView.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtView.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -3,4 +3,12 @@ import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstractView; public interface TextEditorInsertLinkExtView extends TextEditorInsertAbstractView { + + public String getUrl(); + + public boolean isValid(); + + public void setPreviewUrl(String url); + + public void setUrl(String url); } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocal.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocal.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocal.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -1,5 +1,7 @@ package org.ourproject.kune.workspace.client.editor.insert.linklocal; -public interface TextEditorInsertLinkLocal { +import org.ourproject.kune.workspace.client.editor.insert.abstractlink.TextEditorInsertAbstract; +public interface TextEditorInsertLinkLocal extends TextEditorInsertAbstract { + } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPresenter.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPresenter.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -10,7 +10,4 @@ super(editorInsertElement); } - public void init(TextEditorInsertLinkLocalView view) { - super.init(view); - } } Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -137,6 +137,7 @@ private void createDialog() { dialog = new BasicDialog(dialogId, title, modal, true, width, height, minWidth, minHeight); + dialog.setCollapsible(false); messageErrorBar = new MessageToolbar(images, errorLabelId); dialog.setBottomToolbar(messageErrorBar.getToolbar()); tabPanel = new TabPanel(); Modified: trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2009-01-16 13:29:28 UTC (rev 1032) +++ trunk/src/test/java/org/ourproject/kune/platf/client/ui/TextUtilsTest.java 2009-01-19 09:17:59 UTC (rev 1033) @@ -23,4 +23,21 @@ assertTrue(email.matches(TextUtils.EMAIL_REGEXP)); } + @Test + public void matchUrlWithHttp() { + String gnuUrl = "http://gnu.org"; + assertTrue(gnuUrl.matches(TextUtils.URL_REGEXP)); + } + + @Test + public void matchUrlWithoutHttp() { + String gnuUrl = "gnu.org"; + assertTrue(!gnuUrl.matches(TextUtils.URL_REGEXP)); + } + + @Test + public void notMatchWrongUrl() { + String someWrong = "some(a)email.com"; + assertTrue(!someWrong.matches(TextUtils.URL_REGEXP)); + } }

1 0

r1032 - in trunk: . src/main/java/org/ourproject/kune/chat/client src/main/java/org/ourproject/kune/workspace/client/socialnet
by vjrj 16 Jan '09

16 Jan '09

Author: vjrj Date: 2009-01-16 14:29:28 +0100 (Fri, 16 Jan 2009) New Revision: 1032 Modified: trunk/pom.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java Log: Complete - task Add a EmiteDialog option to show "Add a new buddy" dialog Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-01-13 09:42:36 UTC (rev 1031) +++ trunk/pom.xml 2009-01-16 13:29:28 UTC (rev 1032) @@ -94,7 +94,7 @@ <dependency> <groupId>com.calclab.emite</groupId> <artifactId>emite</artifactId> - <version>0.4.3</version> + <version>0.4.4</version> </dependency> <dependency> <groupId>org.jivesoftware.smack</groupId> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java 2009-01-13 09:42:36 UTC (rev 1031) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngine.java 2009-01-16 13:29:28 UTC (rev 1032) @@ -29,6 +29,10 @@ ChatConnectionOptions getChatOptions(); + boolean isBuddie(String localUserName); + + boolean isBuddie(XmppURI jid); + boolean isLoggedIn(); void joinRoom(String roomName, String userAlias); Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2009-01-13 09:42:36 UTC (rev 1031) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2009-01-16 13:29:28 UTC (rev 1032) @@ -19,6 +19,7 @@ */ package org.ourproject.kune.chat.client; +import java.util.Collection; import java.util.Date; import org.ourproject.kune.platf.client.app.Application; @@ -29,11 +30,11 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.ui.WindowUtils; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; +import com.calclab.emite.im.client.roster.RosterItem; import com.calclab.emiteuimodule.client.EmiteUIDialog; import com.calclab.emiteuimodule.client.SubscriptionMode; import com.calclab.emiteuimodule.client.UserChatOptions; @@ -55,6 +56,7 @@ private ToolbarButton traybarButton; private final Provider<EmiteUIDialog> emiteUIProvider; private final Provider<FileDownloadUtils> downloadUtils; + private Collection<RosterItem> roster; public ChatEngineDefault(final I18nTranslationService i18n, final WorkspaceSkeleton ws, Application application, Session session, final Provider<EmiteUIDialog> emiteUIProvider, @@ -97,7 +99,7 @@ } public void addNewBuddie(String shortName) { - Site.important("In development (emite)"); + emiteUIProvider.get().addBuddie(getLocalUserJid(shortName), shortName, ""); } public void chat(XmppURI jid) { @@ -108,6 +110,21 @@ return chatOptions; } + public boolean isBuddie(String shortName) { + return isBuddie(getLocalUserJid(shortName)); + } + + public boolean isBuddie(XmppURI jid) { + if (roster != null) { + for (RosterItem item : roster) { + if (item.getJID().equalsNoResource(jid)) { + return true; + } + } + } + return false; + } + public boolean isLoggedIn() { return emiteUIProvider.get().isLoggedIn(); } @@ -138,6 +155,11 @@ final String initialWindowTitle = Window.getTitle(); chatOptions.userOptions = userChatOptions; if (emiteUIProvider.get().isDialogNotStarted()) { + emiteUIProvider.get().onRosterChanged(new Listener<Collection<RosterItem>>() { + public void onEvent(Collection<RosterItem> rosterChanged) { + roster = rosterChanged; + } + }); emiteUIProvider.get().start(userChatOptions, chatOptions.httpBase, chatOptions.domain, chatOptions.roomHost, avatarProvider, i18n.t("Chat")); } else { @@ -210,6 +232,10 @@ } } + private XmppURI getLocalUserJid(String shortName) { + return XmppURI.jid(shortName + "@" + chatOptions.domain); + } + private UserChatOptions getUserChatOptions(final String jid, final String passwd) { final String resource = "emiteui-" + new Date().getTime() + "-kune"; // + // getGwtMetaProperty(GWT_PROPERTY_RELEASE); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2009-01-16 13:29:28 UTC (rev 1032) @@ -192,8 +192,8 @@ private void registerActions() { final ActionToolbarButtonAndItemDescriptor<UserSimpleDTO> addAsBuddie = new ActionToolbarButtonAndItemDescriptor<UserSimpleDTO>( AccessRolDTO.Viewer, ActionToolbarPosition.bottombar, new Listener<UserSimpleDTO>() { - public void onEvent(final UserSimpleDTO group) { - chatEngineProvider.get().addNewBuddie(group.getShortName()); + public void onEvent(final UserSimpleDTO user) { + chatEngineProvider.get().addNewBuddie(user.getShortName()); } }); addAsBuddie.setMustBeAuthenticated(true);

1 0

13 Jan '09

Author: vjrj Date: 2009-01-13 10:42:36 +0100 (Tue, 13 Jan 2009) New Revision: 1031 Added: trunk/doc/kune-ene-09.pdf Modified: trunk/TODO trunk/img/icons-base.svg trunk/pom.xml trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElement.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstFormView.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdFormView.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdFormView.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java Log: suco/emite updated, minor changes Modified: trunk/TODO =================================================================== --- trunk/TODO 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/TODO 2009-01-13 09:42:36 UTC (rev 1031) @@ -1,6 +1,5 @@ TODO-list for kune -*- mode: org; -*- -#+STARTUP: hidestars #+SEQ_TODO: TODO danigb samer vjrj FEEDBACK VERIFY | FIXED CANCELED WONTFIX * Intro @@ -64,6 +63,8 @@ ** vjrj <v> Login: Follow incubation recomendations. See: http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/e8e1… ** vjrj <v> kune debian package: + Study fat jar + deb package: + http://anydoby.com/fatjar/ Currently we are testing this snapshot: http://mojo.codehaus.org/deb-maven-plugin/ with: mvn package -Dmaven.test.skip=true @@ -74,6 +75,9 @@ http://vafer.org/blog/20070918215154 Related info: http://java.debian.net/building.html +** TODO <v> study different embeded video solutions + - for ogg :: http://www.flumotion.net/cortado/ + - for mp3+ogg :: flowplayer ** TODO <d> Inform to translators when original content changes ** TODO <v> extjs i18n http://extjs.com/deploy/ext/examples/locale/dutch-form.js Added: trunk/doc/kune-ene-09.pdf =================================================================== (Binary files differ) Property changes on: trunk/doc/kune-ene-09.pdf ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/icons-base.svg =================================================================== --- trunk/img/icons-base.svg 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/img/icons-base.svg 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,1796 +20,1806 @@ inkscape:export-filename="/tmp/buttons.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.4119877" + inkscape:cx="342.50815" + inkscape:cy="727.92005" + inkscape:document-units="px" + inkscape:current-layer="layer1" + inkscape:window-width="1270" + inkscape:window-height="773" + inkscape:window-x="1280" + inkscape:window-y="25" + showgrid="false" + showguides="false" + inkscape:guide-bbox="true" + inkscape:grid-points="true" + inkscape:guide-points="true"> + <inkscape:grid + empspacing="1" + empopacity="0.4" + opacity="0.2" + empcolor="#0000ff" + color="#0000ff" + spacingy="1px" + spacingx="1px" + originy="0px" + originx="0px" + type="xygrid" + id="GridFromPre046Settings" /> + </sodipodi:namedview> <defs id="defs21021"> <inkscape:perspective - sodipodi:type="inkscape:persp3d" - inkscape:vp_x="0 : 526.18109 : 1" - inkscape:vp_y="0 : 1000 : 0" - inkscape:vp_z="744.09448 : 526.18109 : 1" + id="perspective511" inkscape:persp3d-origin="372.04724 : 350.78739 : 1" - id="perspective511" /> + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 526.18109 : 1" + sodipodi:type="inkscape:persp3d" /> <linearGradient - inkscape:collect="always" - id="linearGradient14785"> + id="linearGradient14785" + inkscape:collect="always"> <stop - style="stop-color:#e6e6e6;stop-opacity:1;" + id="stop14787" offset="0" - id="stop14787" /> + style="stop-color:#e6e6e6;stop-opacity:1;" /> <stop - style="stop-color:#e6e6e6;stop-opacity:0;" + id="stop14789" offset="1" - id="stop14789" /> + style="stop-color:#e6e6e6;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient11590"> + id="linearGradient11590" + inkscape:collect="always"> <stop - style="stop-color:#ff7f2a;stop-opacity:1;" + id="stop11592" offset="0" - id="stop11592" /> + style="stop-color:#ff7f2a;stop-opacity:1;" /> <stop - style="stop-color:#ff7f2a;stop-opacity:0;" + id="stop11594" offset="1" - id="stop11594" /> + style="stop-color:#ff7f2a;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient11453"> + id="linearGradient11453" + inkscape:collect="always"> <stop - style="stop-color:#4d4d4d;stop-opacity:1;" + id="stop11455" offset="0" - id="stop11455" /> + style="stop-color:#4d4d4d;stop-opacity:1;" /> <stop - style="stop-color:#000000;stop-opacity:0" + id="stop11457" offset="1" - id="stop11457" /> + style="stop-color:#000000;stop-opacity:0" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient2467"> + id="linearGradient2467" + inkscape:collect="always"> <stop - style="stop-color:#f2f2f2;stop-opacity:1;" + id="stop2469" offset="0" - id="stop2469" /> + style="stop-color:#f2f2f2;stop-opacity:1;" /> <stop - style="stop-color:#f2f2f2;stop-opacity:0;" + id="stop2471" offset="1" - id="stop2471" /> + style="stop-color:#f2f2f2;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient14511"> + id="linearGradient14511" + inkscape:collect="always"> <stop - style="stop-color:#803300;stop-opacity:1;" + id="stop14513" offset="0" - id="stop14513" /> + style="stop-color:#803300;stop-opacity:1;" /> <stop - style="stop-color:#803300;stop-opacity:0;" + id="stop14515" offset="1" - id="stop14515" /> + style="stop-color:#803300;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient12483"> + id="linearGradient12483" + inkscape:collect="always"> <stop - style="stop-color:#ffffff;stop-opacity:1;" + id="stop12485" offset="0" - id="stop12485" /> + style="stop-color:#ffffff;stop-opacity:1;" /> <stop - style="stop-color:#ffffff;stop-opacity:0;" + id="stop12487" offset="1" - id="stop12487" /> + style="stop-color:#ffffff;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient12438"> + id="linearGradient12438" + inkscape:collect="always"> <stop - style="stop-color:#000000;stop-opacity:1;" + id="stop12440" offset="0" - id="stop12440" /> + style="stop-color:#000000;stop-opacity:1;" /> <stop - style="stop-color:#000000;stop-opacity:0;" + id="stop12442" offset="1" - id="stop12442" /> + style="stop-color:#000000;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient9075"> + id="linearGradient9075" + inkscape:collect="always"> <stop - style="stop-color:#ffe6d5;stop-opacity:1;" + id="stop9077" offset="0" - id="stop9077" /> + style="stop-color:#ffe6d5;stop-opacity:1;" /> <stop - style="stop-color:#ffe6d5;stop-opacity:0;" + id="stop9079" offset="1" - id="stop9079" /> + style="stop-color:#ffe6d5;stop-opacity:0;" /> </linearGradient> <linearGradient id="linearGradient6085"> <stop - style="stop-color:#ffffff;stop-opacity:1;" + id="stop6087" offset="0" - id="stop6087" /> + style="stop-color:#ffffff;stop-opacity:1;" /> <stop - id="stop9039" + style="stop-color:#ffffff;stop-opacity:0;" offset="1" - style="stop-color:#ffffff;stop-opacity:0;" /> + id="stop9039" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient4946"> + id="linearGradient4946" + inkscape:collect="always"> <stop - style="stop-color:#552200;stop-opacity:1;" + id="stop4948" offset="0" - id="stop4948" /> + style="stop-color:#552200;stop-opacity:1;" /> <stop - style="stop-color:#552200;stop-opacity:0;" + id="stop4950" offset="1" - id="stop4950" /> + style="stop-color:#552200;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - id="linearGradient3148"> + id="linearGradient3148" + inkscape:collect="always"> <stop - style="stop-color:#ffffff;stop-opacity:1;" + id="stop3150" offset="0" - id="stop3150" /> + style="stop-color:#ffffff;stop-opacity:1;" /> <stop - style="stop-color:#ffffff;stop-opacity:0;" + id="stop3152" offset="1" - id="stop3152" /> + style="stop-color:#ffffff;stop-opacity:0;" /> </linearGradient> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient4958" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient3148" - id="linearGradient4960" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(-0.5237505,0,0,0.1325464,-251.07111,685.88221)" - x1="277.00967" - y1="207.41417" - x2="327.60587" - y2="288.36017" /> + id="linearGradient4958" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient6085" - id="linearGradient9063" + y2="288.36017" + x2="327.60587" + y1="207.41417" + x1="277.00967" + gradientTransform="matrix(-0.5237505,0,0,0.1325464,-251.07111,685.88221)" gradientUnits="userSpaceOnUse" - gradientTransform="translate(2,3.0208391)" - x1="-457.16937" - y1="-730.13483" + id="linearGradient4960" + xlink:href="#linearGradient3148" + inkscape:collect="always" /> + <linearGradient + y2="-722.94458" x2="-457.16937" - y2="-722.94458" /> + y1="-730.13483" + x1="-457.16937" + gradientTransform="translate(2,3.0208391)" + gradientUnits="userSpaceOnUse" + id="linearGradient9063" + xlink:href="#linearGradient6085" + inkscape:collect="always" /> <mask - maskUnits="userSpaceOnUse" - id="mask9059"> + id="mask9059" + maskUnits="userSpaceOnUse"> <rect - style="opacity:1;color:#000000;fill:url(#linearGradient9063);fill-opacity:1;fill-rule:nonzero;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect9061" - width="94" - height="12.417624" - x="-463" + mask="none" y="-732.34125" - mask="none" /> + x="-463" + height="12.417624" + width="94" + id="rect9061" + style="opacity:1;color:#000000;fill:url(#linearGradient9063);fill-opacity:1;fill-rule:nonzero;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </mask> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient9071" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient9081" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient9093" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9071" xlink:href="#linearGradient4946" - id="linearGradient9097" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient9425" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> + y1="-768.98633" + x1="-420" + id="linearGradient9081" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient9429" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9093" xlink:href="#linearGradient9075" - id="linearGradient9444" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient9448" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient9471" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9097" xlink:href="#linearGradient4946" - id="linearGradient9475" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient9483" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient9487" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9425" xlink:href="#linearGradient9075" - id="linearGradient12456" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient12460" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12438" - id="linearGradient13514" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-726.11108" - y1="792.6955" - x2="-542.64288" - y2="955.32031" /> + id="linearGradient9429" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12483" - id="linearGradient13522" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="translate(352,-112)" - x1="-715.79846" - y1="924.12555" - x2="-708.1778" - y2="931.88367" /> + id="linearGradient9444" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12438" - id="linearGradient14500" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-726.11108" - y1="792.6955" - x2="-542.64288" - y2="955.32031" /> + id="linearGradient9448" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12483" - id="linearGradient14502" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="translate(352,-112)" - x1="-715.79846" - y1="924.12555" - x2="-708.1778" - y2="931.88367" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9471" xlink:href="#linearGradient9075" - id="linearGradient14553" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14557" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14559" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9475" xlink:href="#linearGradient4946" - id="linearGradient14563" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14565" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14569" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9483" xlink:href="#linearGradient9075" - id="linearGradient14626" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14630" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14632" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient9487" xlink:href="#linearGradient4946" - id="linearGradient14636" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14638" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14642" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient12456" xlink:href="#linearGradient9075" - id="linearGradient14644" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14648" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14650" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient12460" xlink:href="#linearGradient4946" - id="linearGradient14654" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14656" + y2="955.32031" + x2="-542.64288" + y1="792.6955" + x1="-726.11108" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + id="linearGradient13514" + xlink:href="#linearGradient12438" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14660" + y2="931.88367" + x2="-708.1778" + y1="924.12555" + x1="-715.79846" + gradientTransform="translate(352,-112)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient13522" + xlink:href="#linearGradient12483" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14728" + y2="955.32031" + x2="-542.64288" + y1="792.6955" + x1="-726.11108" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + id="linearGradient14500" + xlink:href="#linearGradient12438" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14732" + y2="931.88367" + x2="-708.1778" + y1="924.12555" + x1="-715.79846" + gradientTransform="translate(352,-112)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient14502" + xlink:href="#linearGradient12483" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14734" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14738" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14553" xlink:href="#linearGradient9075" - id="linearGradient14740" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14744" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14746" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14557" xlink:href="#linearGradient4946" - id="linearGradient14750" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14752" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14756" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14559" xlink:href="#linearGradient9075" - id="linearGradient14758" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14762" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14848" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14850" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14563" xlink:href="#linearGradient4946" - id="linearGradient14852" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14854" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14856" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14565" xlink:href="#linearGradient9075" - id="linearGradient14858" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14860" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14862" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14569" xlink:href="#linearGradient4946" - id="linearGradient14864" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14866" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14868" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14626" xlink:href="#linearGradient9075" - id="linearGradient14870" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14876" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14630" xlink:href="#linearGradient4946" - id="linearGradient14880" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14882" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14886" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14632" xlink:href="#linearGradient9075" - id="linearGradient14888" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14892" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14894" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14636" xlink:href="#linearGradient4946" - id="linearGradient14898" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14900" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14904" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14638" xlink:href="#linearGradient9075" - id="linearGradient14906" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14910" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient14912" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient14914" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + id="linearGradient14642" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient2914" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient2918" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14644" xlink:href="#linearGradient9075" - id="linearGradient2920" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient2924" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient2926" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14648" xlink:href="#linearGradient4946" - id="linearGradient2930" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient2932" - gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + y2="-649.43176" x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient2934" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,748.77549,128.95018)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient14650" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient2936" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + y2="672.97479" x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient2938" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14654" xlink:href="#linearGradient4946" - id="linearGradient2940" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,0.8342517,748.77549,268.88484)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient2942" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14656" xlink:href="#linearGradient9075" - id="linearGradient2944" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + id="linearGradient14660" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" x2="-420" - y2="-649.43176" /> + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14728" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14732" xlink:href="#linearGradient4946" - id="linearGradient2946" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,0.7237541,748.77549,366.17365)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient14734" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14738" xlink:href="#linearGradient4946" - id="linearGradient2948" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient14740" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14511" - id="linearGradient2950" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-740.55145" - y1="764.70923" - x2="-563.88892" - y2="958.51544" /> + id="linearGradient14744" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12483" - id="linearGradient2952" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="translate(1107.1739,-474.69155)" - x1="-714.54846" - y1="926.87555" - x2="-708.6778" - y2="932.13367" /> + id="linearGradient14746" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14750" xlink:href="#linearGradient4946" - id="linearGradient2954" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,0.8342517,996.77549,268.88484)" - x1="-505.55423" - y1="814.08978" - x2="-507.6626" - y2="590.54242" /> + id="linearGradient14752" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14511" - id="linearGradient2956" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-740.55145" - y1="764.70923" - x2="-563.88892" - y2="958.51544" /> + id="linearGradient14756" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient12483" - id="linearGradient2958" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="translate(1135.1739,-474.69155)" - x1="-714.54846" - y1="926.87555" - x2="-708.6778" - y2="932.13367" /> + id="linearGradient14758" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient2960" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,0.8342517,996.77549,268.88484)" - x1="-505.55423" - y1="814.08978" - x2="-507.6626" - y2="590.54242" /> + id="linearGradient14762" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14848" xlink:href="#linearGradient4946" - id="linearGradient2964" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,1900.7229,-184.92784)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient14850" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14852" xlink:href="#linearGradient4946" - id="linearGradient2972" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,0.8342517,1900.7229,-44.99318)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient14854" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14856" xlink:href="#linearGradient4946" - id="linearGradient2980" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,0.7237541,1900.7229,52.29563)" - x1="-442.20703" - y1="691.72809" + id="linearGradient14858" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14860" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14862" xlink:href="#linearGradient9075" - id="linearGradient3096" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + id="linearGradient14864" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" x2="-420" - y2="-649.43176" /> + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14866" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14868" xlink:href="#linearGradient4946" - id="linearGradient3100" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient14870" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14876" xlink:href="#linearGradient9075" - id="linearGradient3102" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + id="linearGradient14880" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" x2="-420" - y2="-649.43176" /> + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14882" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14886" xlink:href="#linearGradient4946" - id="linearGradient3106" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + id="linearGradient14888" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14892" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14894" xlink:href="#linearGradient9075" - id="linearGradient3108" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + id="linearGradient14898" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" x2="-420" - y2="-649.43176" /> + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14900" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14904" xlink:href="#linearGradient4946" - id="linearGradient3112" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + id="linearGradient14906" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient14910" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient9075" - id="linearGradient3114" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + id="linearGradient14912" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" x2="-420" - y2="-649.43176" /> + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient14914" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient3118" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + id="linearGradient2914" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient2918" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient2920" xlink:href="#linearGradient9075" - id="linearGradient3120" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" + id="linearGradient2924" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" x2="-420" - y2="-649.43176" /> + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient2926" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient2930" xlink:href="#linearGradient4946" - id="linearGradient3124" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" + id="linearGradient2932" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,748.77549,128.95018)" + gradientUnits="userSpaceOnUse" + id="linearGradient2934" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient2936" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" + gradientUnits="userSpaceOnUse" + id="linearGradient2938" xlink:href="#linearGradient9075" - id="linearGradient3126" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,0.8342517,748.77549,268.88484)" gradientUnits="userSpaceOnUse" - x1="-420" - y1="-768.98633" - x2="-420" - y2="-649.43176" /> + id="linearGradient2940" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient2942" xlink:href="#linearGradient4946" - id="linearGradient3130" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + id="linearGradient2944" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,0.7237541,748.77549,366.17365)" + gradientUnits="userSpaceOnUse" + id="linearGradient2946" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient2948" xlink:href="#linearGradient4946" - id="linearGradient5085" + inkscape:collect="always" /> + <linearGradient + y2="958.51544" + x2="-563.88892" + y1="764.70923" + x1="-740.55145" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient2950" + xlink:href="#linearGradient14511" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient6070" + y2="932.13367" + x2="-708.6778" + y1="926.87555" + x1="-714.54846" + gradientTransform="translate(1107.1739,-474.69155)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient2952" + xlink:href="#linearGradient12483" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="590.54242" + x2="-507.6626" + y1="814.08978" + x1="-505.55423" + gradientTransform="matrix(3.2099661,0,0,0.8342517,996.77549,268.88484)" + gradientUnits="userSpaceOnUse" + id="linearGradient2954" xlink:href="#linearGradient4946" - id="linearGradient6074" + inkscape:collect="always" /> + <linearGradient + y2="958.51544" + x2="-563.88892" + y1="764.70923" + x1="-740.55145" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient2956" + xlink:href="#linearGradient14511" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient6078" + y2="932.13367" + x2="-708.6778" + y1="926.87555" + x1="-714.54846" + gradientTransform="translate(1135.1739,-474.69155)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient2958" + xlink:href="#linearGradient12483" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient4946" - id="linearGradient6094" + y2="590.54242" + x2="-507.6626" + y1="814.08978" + x1="-505.55423" + gradientTransform="matrix(3.2099661,0,0,0.8342517,996.77549,268.88484)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" + id="linearGradient2960" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" + x2="-442.13943" y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,1900.7229,-184.92784)" + gradientUnits="userSpaceOnUse" + id="linearGradient2964" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,0.8342517,1900.7229,-44.99318)" + gradientUnits="userSpaceOnUse" + id="linearGradient2972" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,0.7237541,1900.7229,52.29563)" + gradientUnits="userSpaceOnUse" + id="linearGradient2980" xlink:href="#linearGradient4946" - id="linearGradient6098" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient3096" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient3100" xlink:href="#linearGradient4946" - id="linearGradient6102" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient3102" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient3106" xlink:href="#linearGradient4946" - id="linearGradient7256" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient3108" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient3112" xlink:href="#linearGradient4946" - id="linearGradient7258" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" - x2="-442.13943" - y2="672.97479" /> + id="linearGradient3114" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient3118" xlink:href="#linearGradient4946" - id="linearGradient7260" + inkscape:collect="always" /> + <linearGradient + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" - x1="-442.20703" - y1="691.72809" + id="linearGradient3120" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> + <linearGradient + y2="672.97479" x2="-442.13943" - y2="672.97479" /> + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" + gradientUnits="userSpaceOnUse" + id="linearGradient3124" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2467" - id="linearGradient3560" + y2="-649.43176" + x2="-420" + y1="-768.98633" + x1="-420" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" - x1="376.22385" - y1="247.85413" - x2="376.03351" - y2="236.05252" /> + id="linearGradient3126" + xlink:href="#linearGradient9075" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2467" - id="linearGradient3589" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" - x1="376.22385" - y1="247.85413" - x2="376.03351" - y2="236.05252" /> + id="linearGradient3130" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2467" - id="linearGradient3596" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" - x1="376.22385" - y1="247.85413" - x2="376.03351" - y2="236.05252" /> + id="linearGradient5085" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2467" - id="linearGradient3609" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" - x1="376.22385" - y1="247.85413" - x2="376.03351" - y2="236.05252" /> + id="linearGradient6070" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2467" - id="linearGradient3616" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" - x1="376.22385" - y1="247.85413" - x2="376.03351" - y2="236.05252" /> + id="linearGradient6074" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient11453" - id="linearGradient11483" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="573.5213" - y1="371.54288" - x2="528.61176" - y2="365.01413" /> + id="linearGradient6078" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient11453" - id="linearGradient12735" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="573.5213" - y1="371.54288" - x2="528.61176" - y2="365.01413" /> + id="linearGradient6094" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient11590" - id="linearGradient12744" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="704.70386" - y1="404.07492" - x2="666.4212" - y2="399.03772" - gradientTransform="translate(136.42399,-17.93001)" /> + id="linearGradient6098" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient14783" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" - gradientUnits="userSpaceOnUse" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient14795" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" /> + id="linearGradient6102" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient14808" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" /> + id="linearGradient7256" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient14830" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" /> + id="linearGradient7258" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient14842" + y2="672.97479" + x2="-442.13943" + y1="691.72809" + x1="-442.20703" + gradientTransform="matrix(3.2099661,0,0,1,996.77547,-1412.7742)" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" /> + id="linearGradient7260" + xlink:href="#linearGradient4946" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient14844" + y2="236.05252" + x2="376.03351" + y1="247.85413" + x1="376.22385" + gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" gradientUnits="userSpaceOnUse" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> + id="linearGradient3560" + xlink:href="#linearGradient2467" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15822" + y2="236.05252" + x2="376.03351" + y1="247.85413" + x1="376.22385" + gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" /> + id="linearGradient3589" + xlink:href="#linearGradient2467" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15824" + y2="236.05252" + x2="376.03351" + y1="247.85413" + x1="376.22385" + gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" gradientUnits="userSpaceOnUse" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> + id="linearGradient3596" + xlink:href="#linearGradient2467" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15850" + y2="236.05252" + x2="376.03351" + y1="247.85413" + x1="376.22385" + gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" /> + id="linearGradient3609" + xlink:href="#linearGradient2467" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15852" + y2="365.01413" + x2="528.61176" + y1="371.54288" + x1="573.5213" gradientUnits="userSpaceOnUse" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> + id="linearGradient11483" + xlink:href="#linearGradient11453" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15884" + y2="365.01413" + x2="528.61176" + y1="371.54288" + x1="573.5213" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" - x2="617.25562" - y2="464.67548" /> + id="linearGradient12735" + xlink:href="#linearGradient11453" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15886" + gradientTransform="translate(136.42399,-17.93001)" + y2="399.03772" + x2="666.4212" + y1="404.07492" + x1="704.70386" gradientUnits="userSpaceOnUse" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> + id="linearGradient12744" + xlink:href="#linearGradient11590" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15892" gradientUnits="userSpaceOnUse" - x1="610.60687" - y1="464.84286" + y2="464.67548" x2="617.25562" - y2="464.67548" /> - <linearGradient - inkscape:collect="always" + y1="464.84286" + x1="610.60687" + id="linearGradient14783" xlink:href="#linearGradient14785" - id="linearGradient15894" - gradientUnits="userSpaceOnUse" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15897" + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" gradientUnits="userSpaceOnUse" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14795" xlink:href="#linearGradient14785" - id="linearGradient15910" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15914" + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14808" xlink:href="#linearGradient14785" - id="linearGradient15934" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="610.70831" - y1="463.89062" - x2="617.69531" - y2="463.89062" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15938" + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14830" xlink:href="#linearGradient14785" - id="linearGradient15958" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient15962" + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14842" xlink:href="#linearGradient14785" - id="linearGradient16002" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient16025" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" + y2="463.89062" x2="617.69531" - y2="463.89062" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient16051" + y1="463.89062" + x1="610.70831" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> - <linearGradient - inkscape:collect="always" + id="linearGradient14844" xlink:href="#linearGradient14785" - id="linearGradient16074" + inkscape:collect="always" /> + <linearGradient + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> + id="linearGradient15822" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="463.89062" + x2="617.69531" + y1="463.89062" + x1="610.70831" + gradientUnits="userSpaceOnUse" + id="linearGradient15824" xlink:href="#linearGradient14785" - id="linearGradient16078" + inkscape:collect="always" /> + <linearGradient + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-119.76001,-155.87114)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> + id="linearGradient15850" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="463.89062" + x2="617.69531" + y1="463.89062" + x1="610.70831" + gradientUnits="userSpaceOnUse" + id="linearGradient15852" xlink:href="#linearGradient14785" - id="linearGradient16097" + inkscape:collect="always" /> + <linearGradient + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-119.76001,-155.87114)" - x1="612.25391" - y1="463.89471" + id="linearGradient15884" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" x2="617.69531" - y2="463.89062" /> + y1="463.89062" + x1="610.70831" + gradientUnits="userSpaceOnUse" + id="linearGradient15886" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="464.67548" + x2="617.25562" + y1="464.84286" + x1="610.60687" + gradientUnits="userSpaceOnUse" + id="linearGradient15892" xlink:href="#linearGradient14785" - id="linearGradient16110" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89062" + x1="610.70831" gradientUnits="userSpaceOnUse" + id="linearGradient15894" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" - x1="612.25391" - y1="463.89471" + y2="463.89062" x2="617.69531" - y2="463.89062" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient16114" + y1="463.89062" + x1="610.70831" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> - <linearGradient - inkscape:collect="always" + id="linearGradient15897" xlink:href="#linearGradient14785" - id="linearGradient16131" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" - x1="612.25391" - y1="463.89471" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" x2="617.69531" - y2="463.89062" /> + y1="463.89062" + x1="610.70831" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient15910" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="463.89062" + x2="617.69531" + y1="463.89062" + x1="610.70831" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient15914" xlink:href="#linearGradient14785" - id="linearGradient16135" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89062" + x1="610.70831" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" - x1="612.25391" + id="linearGradient15934" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient15938" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" x2="617.69531" - y2="463.89062" /> + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient15958" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="463.89062" + x2="617.69531" + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient15962" xlink:href="#linearGradient14785" - id="linearGradient16147" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" + id="linearGradient16002" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89471" x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient16025" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient16051" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" x2="617.69531" - y2="463.89062" /> + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient16074" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="463.89062" + x2="617.69531" + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-119.76001,-155.87114)" + gradientUnits="userSpaceOnUse" + id="linearGradient16078" xlink:href="#linearGradient14785" - id="linearGradient16151" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-119.76001,-155.87114)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.8201867,-157.76001,-102.45879)" + id="linearGradient16097" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89471" x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient16110" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" + gradientUnits="userSpaceOnUse" + id="linearGradient16114" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" x2="617.69531" - y2="463.89062" /> + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" + gradientUnits="userSpaceOnUse" + id="linearGradient16131" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="463.89062" + x2="617.69531" + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" + gradientUnits="userSpaceOnUse" + id="linearGradient16135" xlink:href="#linearGradient14785" - id="linearGradient16176" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.8201924,-126.76001,-66.461449)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + id="linearGradient16147" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" + y1="463.89471" x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.8201867,-157.76001,-102.45879)" + gradientUnits="userSpaceOnUse" + id="linearGradient16151" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" + x2="617.69531" y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-13.255319,8.4005142e-2)" + gradientUnits="userSpaceOnUse" + id="linearGradient16176" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> + <linearGradient + y2="463.89062" x2="617.69531" - y2="463.89062" /> + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-264.48402,-155.77997)" + gradientUnits="userSpaceOnUse" + id="linearGradient16192" + xlink:href="#linearGradient14785" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" + y2="463.89062" + x2="617.69531" + y1="463.89471" + x1="612.25391" + gradientTransform="matrix(1.0212766,0,0,0.9976019,-264.48402,-155.77997)" + gradientUnits="userSpaceOnUse" + id="linearGradient16209" xlink:href="#linearGradient14785" - id="linearGradient16192" + inkscape:collect="always" /> + <linearGradient + y2="236.05252" + x2="376.03351" + y1="247.85413" + x1="376.22385" + gradientTransform="matrix(1.2859216,0,0,1,-108.64447,0)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-264.48402,-155.77997)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> + id="linearGradient5115" + xlink:href="#linearGradient2467" + inkscape:collect="always" /> <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient14785" - id="linearGradient16209" + y2="236.05252" + x2="376.03351" + y1="247.85413" + x1="376.22385" + gradientTransform="matrix(1.2859216,0,0,1,-91.647155,-23.371308)" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(1.0212766,0,0,0.9976019,-264.48402,-155.77997)" - x1="612.25391" - y1="463.89471" - x2="617.69531" - y2="463.89062" /> + id="linearGradient5122" + xlink:href="#linearGradient2467" + inkscape:collect="always" /> </defs> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="2.1179816" - inkscape:cx="383.58499" - inkscape:cy="841.23548" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1280" - inkscape:window-height="777" - inkscape:window-x="0" - inkscape:window-y="0" - showgrid="false" - showguides="false" - inkscape:guide-bbox="true" - inkscape:grid-points="true" - inkscape:guide-points="true"> - <inkscape:grid - id="GridFromPre046Settings" - type="xygrid" - originx="0px" - originy="0px" - spacingx="1px" - spacingy="1px" - color="#0000ff" - empcolor="#0000ff" - opacity="0.2" - empopacity="0.4" - empspacing="1" /> - </sodipodi:namedview> <metadata id="metadata21024"> <rdf:RDF> @@ -1822,1166 +1832,1106 @@ </rdf:RDF> </metadata> <g - inkscape:label="Capa 1" + id="layer1" inkscape:groupmode="layer" - id="layer1"> + inkscape:label="Capa 1"> + <g + id="g5126"> + <image + y="214.99088" + x="382.99731" + id="image2407" + height="16" + width="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gkWCzMwrjaF3QAAAEh0RVh0Q29tbWVudAAoYykgMjAw NiBKYWt1YiBTdGVpbmVyCgpjcmVhdGVkIHdpdGggdGhlIEdJTVAgOjogaHR0cDovL2dpbXAub3Jn I/9YQAAAAPxJREFUOMulk0tOw0AQRF+jwD7iigHbSXCCOADeGAUjARHfIE7qRRcLj0cTOQrI9Mat seZVV5fGNk19C1SMq4pNU2tsbZpakx7Vti1mIMAACcwIB33TlQGT0zMAIkBynraPf5p7vbqJFyPA JVZX14mG9jsDU+jdIywCkNi+Pg/UyuU6/E8+ZkOAy1nOy7gHCIouMBDCsGh3AJCLt4+XX/0virIj DwFOkS0Aw0yJ+yQBA+FpIPtL/Px6P6haZPMkTg9QhjHmF3nQ7FduiH4PQrJu+oMWJHbfu6P+s1mO o0Q/jRG4nGVHAQrmlezghH9WnGA6PR8NqO4f7kY/5x8MgaeRISCTrAAAAABJRU5ErkJggg== " /> + <rect + y="217.09651" + x="384.99197" + height="12.012594" + width="12.178165" + id="rect2475" + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + style="fill:url(#linearGradient5122);fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect2449" + width="11.985193" + height="11.822246" + x="384.99197" + y="217.09651" /> + <text + xml:space="preserve" + style="font-size:8.54466915px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Courier New" + x="443.577" + y="193.97751" + id="text2410" + transform="scale(0.8661139,1.1545825)"><tspan + sodipodi:role="line" + id="tspan2412" + x="443.577" + y="193.97751" + style="fill:#1a1a1a;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"><p></tspan></text> + <text + xml:space="preserve" + style="font-size:8.00332165px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Courier New" + x="494.05725" + y="177.30666" + id="text3576" + transform="scale(0.7845744,1.2745764)"><tspan + sodipodi:role="line" + id="tspan3578" + x="494.05725" + y="177.30666" + style="fill:#1a1a1a;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none">l</tspan></text> + </g> <image - style="display:inline" - y="-269.36218" - x="296" - id="image18228" - height="16" - width="16" - sodipodi:absref="/usr/share/icons/Tango/16x16/actions/format-text-underline.png" - xlink:href="/usr/share/icons/Tango/16x16/actions/format-text-underline.png" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/remove-format.png" - inkscape:export-xdpi="90" + transform="scale(1,-1)" inkscape:export-ydpi="90" - transform="scale(1,-1)" /> - <image - style="display:inline" - y="238.36218" - x="296" - id="image18226" - height="16" - width="16" - sodipodi:absref="/usr/share/icons/Tango/16x16/actions/format-text-italic.png" - xlink:href="/usr/share/icons/Tango/16x16/actions/format-text-italic.png" + inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/remove-format.png" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDyMK75EyNwAAAi5JREFUOMut0k9I02EYB/Dv+74/ 98fy56opYymUa61RQ1I6denfpRIMDLzoTcmDHYTA6NhFtB0qFEHsFOQxgyFUsA4aqbHTmC1xiX+a lPsna7r22/u8HbzoXF3sOX+fz/s8vA9DmWruemnjnG0SKQ0AOGdFIlUTGu/MlGa1cgBj6L5xqYF3 tfgAAOOBMH8/H+sG8ORAtszrXBN8x3//umk6/F0BQKOrhj1+MV0oSrKGxjtpb56XAiTlNZezWuhH TZgMLqjJ4IIC5zihWwRJebU0fwDQBJ7eueIRs5ENKCVXlJIrc5E4zrsdQhN49k/A1zFWb9KY1113 HK+DEZnPF/ry+ULfTCgm9WodhlH0+jrG6v8KcODR7cvn2JfVNOI/MiBJUyRpKpHMYjO1A6fDzqDw sCzgbR8xS5LdF9wO9vbToiKSo5GJHiMy0WNIkqPRpXVlr6llUhbvedtHzAe+kaRsazzrZKmcxPJ6 koyC0eu5+7wXAIqGgcxWVtoddcJisSL3K9sG4NU+QHA27DlTx5fi22i+6BMWs0ClWcMRs4BurUCV VROzX9NYP1Yrctns8D7A1er3mSq4TsKKdx8+y2QiKcodWGWVTZ5s8AoFpbta/b7Ymwfh3VNlGHI4 nWJxNYXkZgJEZF4O9Bf2Np9uGTTlttLbxu88bHaHSG6sDQG4yXf3p6ZoJIq5mY9QRAOlzQCwHOgv QKnBWHgeP9e+QRE14X8UO3VrQB0G4Ied4A+X1/MuJnM+zQAAAABJRU5ErkJggg== " + width="16" + height="16" + id="image18228" + x="296" + y="-269.36218" + style="display:inline" /> + <image + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/remove-format.png" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEJFSIFhe7gnAAAAfhJREFUOMvNkk9Ik3EYx7+/5/fu HctiMjLTqFXTlrYtZjGIgg6FUhQkISEaEUVG1CGKDuvoIaQIGlTkISx26xAeaqM/NIkgrAbZwg6b gzIQEabi9N07f8/bwZIKdUKXnvPzfPjwfb7AP45Y7mLD6QdeSfIzsyUBQBKZ/d1tdm05x4GzD106 tIErx3fJ7Z7VGB03cP5GXAcAKnVccyGiO1ikThz02yqcDly6neCJ6SIsZgBASQOX4ezdu8NdGaqv Fpcjzzg3OUPfxmbArFDSIHjyftizztV4bP82utbzhicmjSgrRmYkD1a8NMDffq+pvMzeea4lRD1P P1npr6PfhW6eYlaYmlZLG/ha73h1SU8utu2hV8lh9L39ogqsGj50d8xaSiFvKFhqEUCg+a5LAANn WnbLzEgej2L9bLIKDUY7xgCAmTFlKPBCIdYciOhs51TzvqDN0ux4/jplmQWTACS9R2/NFYck5w1F /NPgD4C+Er3B+g2VVdVrRDI9Drd7vfBt3YxVDhucKzSUl9kgSVA0MTyfwTyg9sjNcFWFszHo30KP X3y0htLZBVsqbTp7fDvp1xc0ANh4uKuJSHTW1tVR4n0WQ5lsURTNtelYOPc3YNOhLmsui98MpBDX C4ZB8dhLCEEKajaQjV/NLfJhc/Bdny6ITPwX8wNOwM9Q5xcsRQAAAABJRU5ErkJggg== " + width="16" + height="16" + id="image18226" + x="296" + y="238.36218" + style="display:inline" /> <image - y="106.79076" - x="67.285713" - id="image21034" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QQaByshe1XNtQAABLRJREFUOMu1lVlsVGUUx393maUt 7XSbaelCp3ZKG0rLKpSICwISooaQ+IAEiInxVX2RRB58MuXFGIn64Jsii5qIRCNoRVQWCUpDFJmW pbbo0OlMt5l779y5c2fu/XzooBSCxAe/5J+cLyffLyfnOwv8T0e6l2P7ngMRYBewQQjRBZQDmiRJ UeAEsP9Q347r/wn87Ksf7vOoyosrFi2gPRwkWFWOz6OSsXKMT+oM/zHJr1djFBx336G+HS/fF7x9 z4E613H6l3e19DyxppO84+J1dLo62jjWfxJ/4xJSRpYSxaXUp3B24BqDw/FzkiRtPdS3I3E7S779 IgrOmXWrO3o29UZIaynS0xMYpsWX3/9MfWQZimsT8Mt0hmQqJIMNq9pYsTi8Rgjx2Z0RK7eMbbvf f29ZV3jjUw93ouk6a5a0k5hK09y2iNrQfGRZxcrqSNkZTDNL18JWQgE/pSU+Zoxcc2P3pqpLp498 NQe8fc+BiMejfrBt8wo6F9TSVFdN/3dnqG9uw+v3oyoyjhDIqo9w0EdbSyOlpSXIsoxH5MBXxuBw vHfx2q0HL50+Mg2gAuRN65WVqzqINFYhyxJHv/6B5b2PIUkgBAhAlmSsqRucuRlH9ldC3uCRBxej qgpNlTLt4TqGhuO7gNf+zrHX73m6rakWyzQ4euxbWrsfQgCuKIIFOK5AVb088+TjrO1poba6ivOX byBJEqprMT9YCbDhVipUAFlVQrWVZfRHDSpDnWRyDn6vik+VEBI4jouppVjZHUEIQShYQyhYQ2xs nOi1UWI34wRCCxFCLJpTFY6L4vGqVDhJbOHFMHMk01mmDRvDtNHMHKY2iRBizs/XVAWIJaapr6nA oyoAFXMilqBgZPOqbuaoUMYIqB5ik1Ba3TCbBschpwkcx0VR/qlQy7Jobw7y6Tc/sWx1CATGHLCT L8wkp7TgeKGG3pZyIuEmFqbSfH5+FKUsSMFxydl+3vroFNm8y/qeOno6wpimiUeRuT4hCGsmSETn pMLOWmdHYpPM80Ek3ARAVWWAnRt78BujzGgmKT2LrlSjiQC/XB9H13UMw+DkjxdpbA4TT6aQJKl/ Dti1869Hh+OEa/ycOH0B13VnnbJEwc4yo2WZ0bOkdYt0xiI2bZNOp9F1HdO0WN3dwsifSYD9cxpk aOB4vH3ppkfzLq1yWQ0FPUFZiY98Pk//ucskc34yVp5M1sbI5vC7GpGQj1Q6TVqdz++xKVIp453D e3cevKulB89/8XF9x7qXKsr9Pq/PR6mS58jxU1ycrsLMFTAtm0x2VkmtQE+9S8IqIZl2uHJ1ZPiT N55/AdDuAgPVdiZzgdKGLbZQPFJJgCtjGRKGQM/YmFYey7JQhU1rsJRgQwvR0Wmi0WvJs0ff3p1J T2iADhTuHJshoBFo3Pxc35u1TeH2BxaEqA9WUlFegkdVydkFUnqGxESK0dgEY8O/DZw8vPdd4GZR Q4BzJ1gBmoF6oL6lo3d129L1WwLBhlZ/2TwvsiwLx3GtjJ6diY+ODA0c/ypxIzoIJIAx4Apg/tsG qQQagJqiPQ8oATzMzqN8EaABU8AIMFn03X/nFZvHV5S/CC4ANmAVlb/X478AYzEct5VYdT4AAAAA SUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/browser.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/browser.png" /> - <image - y="122.79076" - x="202.14284" - id="image21044" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/config-language.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/config-language.png" /> + id="image21034" + x="67.285713" + y="106.79076" /> <image - y="122.79076" - x="138.71426" - id="image21054" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAAAlwSFlz AAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAMzSURB VDiNtZRda1xFGMd/z5xzdk52k6zZbpquScxbaw0Gg8VeiFTQC/Gu9+K14EfwC/gdSkGEeumtFr0Q KVRCb2IgaCRgi8nGmDY9u+fkvOyePTNeZNNuJAmW6AMPzAwzP/7zf+YZsdbyf4R8fP2TGeAdpdT7 Ssl7RWFeVkrawGNjbdMauwasAxvA7/1zzj9y686DW2YQ7AKrV5cvlxqTE+XG9CUZb4yTdVK/HYUT YRAuPX0SfPDnH7tJsNvuxWFSMoUVBCuIFRFjjKkANaB1DCyCs3B1thIHKftbAQe7Ma2oTWZSCilw fSWXFuqVVxYnEYRO3KUbd8mTHnnSY/O3h52T7HSPBkmYoIYVJbeEKQxxGBO0A1rtgKAdoJSD72m0 56M9H9/zGRkZOdVj9cJVGYiz6v5MMfJ8MVcprdFNntQ3SC48wnoJRaZJ4wrdg1HyuI7NLqKZPga7 eVsL/YK6z7mH5Eza/HjlM+YuLvJ6o8Hk+JtcqEySZR2ipE0Yt9h/usfO/hqb8Tdkbx9oxO7fvP3l kTTzDDxovhXLkFfh2lvLxPKY1G3SlG16yoIuoZ0yC6OvMj/9GoKiYyM6EqpcRXSdkNyJnPvfr/Wt OMGrns1pF02G1DCe0qRFStJJSNKENE1J0oTCFPi+pqQ9vJJLyXcpO8One2yxg9Mzw9gCYxUWhR1Q eOKr+C/a3D1SOFytUK1V8WqmX8h/q/kMcJp0QMHu7l4ebu/ldsmWRc4JthZz7+79zAo/xNnBSlbb SUeXis8B77yKP9rc2/hp5dE9AfTlD9XUNakW5wbfeXDr7tFERNTMDcc7bNYXt0IGzhx7FdZaUxmX 3uEmRVmN8ZIzxYS3yKReZlwvUHHHjgFOVXziqrVYY9DJFFGQs9fZzrXSbn1kVubGbjBUr/KwtUoz +pXQ7FCoDEdARJ0NzvJUf/3dV5mg1rsH5ucsMn+5WqZ0RS2La+c8zy83qrN5fWzCr49eUeIZujai k0VEaXgqOLbGfrq1Uny7+kWRAX4/hwAN6LH5bm3m3fU3avO/LJfrcl05MiJCByQTIRUkkLO6TA7v 5vQFeECpnx6HP0x+QhbWWvM3kkBrwVU9mtQAAAAASUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/config-users.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/config-users.png" /> - <image - y="1018.5051" - x="-791" - id="image21064" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-warning.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-warning.png" /> + id="image21044" + x="202.14284" + y="122.79076" /> <image - y="122.79076" - x="11.857142" - id="image21074" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1gcFDBcUmw7QPwAABIpJREFUOMuVlVtsVGUQx3/fOWe3 e2G31+0dbcMlUBBTGiAEjCBIMfHBa6JEDBdtYmLiJUFRY+IzD/iiiRijMUiIRk0kMRIVESEQTYtQ 2hRKuba03e6Fbnf37Nmz5zufD10qtBjqvExmJvln5j+T/wim2fbNgecF6i2FWAogUD0KseeLw+ZB /oeJ24MdmwOf1JaoLe1N/kCdX+oAN0whjw9Zuaum+Orzw7lXZgusT3Xa7t9S52fX9iW+0lSgWksG 6ojrZTgKbU153juSlfOb7vMMnrnknJsNsDbVuhC7Nzf5w4N6hJLKOmqqI1RVViBClVxwwqxtKAkJ Id4GOPZ+uX/WwAoW1/qkbntD+H0+IlWVBAN+SrwecpoPW/Pp6yKq6XSHLx26lsqe3ipk505jrOtF se1uwMbtgVIKp+Bg5fMkEjex8nnsgoOUkrlMsHDJonBk9Sa0QCW2GRe6LESiJ3/e17W1t7VtP6/d lePl8z3Pzis1qkyJZiuBlc+TyZqkM1kaC1GqI3Opad9GLmdiWxkKZoJ8aojQglYdK/vAtvrYlX3d 9MygwlVqz+9DeXehliCbGCMaixGLx3EnYjRgUbPhObLjo+jBOjwVCzCCtaCXkB3+G/+SVhPomMHx o0+ufGg4tGr/sC9kfHNZUqUytGpR5ukZSoQgNe4gdR+uY4MQCKHd2jjSTiOV8CpYeQfHm55Z1wb8 8diGcm6MBMTAwATXr0mUrYAcyqPxaiko5SJzCYRmgO5B5hK4+RRIGykdS0Bw+vI6N6wJ22Oxfm86 G6VlxWryVpr+iz3YNrS0tJC9fAYnE8XNxbDtNEJouIUMTjaK8EfIpOKjQHIGFZouvWPxy7gS8laK iwM9KKCsDOLJPg56ahg9eRRvuBEnO4ad7MfJjqH7KonJGtXfZxl7L3R8e8dVzGtp+qC+xiQev4Gm CRLJGK6CcJlA0zVkrAmzeyMjBR9NshdR24IKNGBplbiBZs6eTYjzV4PlyfHg48sa2lT3cNexKeCG OsVEehiZbEQPpPF4Ba6EQrQZu38tD76xkxPnFDFPBeWXj0PvcfIDfZzvG+PIYCt9crEW3rQRt69v /bKGNm/3cNdvxuQxl6uQr1EkHXALCiEms+rSWlrf3MHXxwfRGhewov1hkhNPcODAUe6P+Fm8fjmP +IN8+OsQ0UujLHvqaZzvv3sXeM9IpzKfnuikY2lztaqqd4UrgsW71kh505y7msKVBRCCcbx0jTrs 2vsyc/wedn95lkX1AuVKXMfh4kiW5iLFxqlfOnev2tBm9BDaMZn7V1+q7RBKuSjp4AIfHzoPQHvr OKUBA+UUOHTqCq6UaPod6uAzgPSfR7peB94BSoqXYgDhF1YsPK1kAYBAcoRsaRUAP/11DdOyuXA9 DUoSTCWmakXzG4ADZACzKPxaUUNMAEvqNDdUUCDHnKoyzLykd3iSmnA4PNmeLGCUlWEY+gx1U4Cc 9lkmbprJz8p//OElAF+xUHEPHZ6wUh8BOXGP7+IDAkWvTReuW/p1m7eKk1piFj9Rm/Yb/wv41uQu oP4BFBADlR+8lIsAAAAASUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" /> - <image - y="122.79076" - x="455.85712" - id="image21084" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/mimetypes/font_truetype.png" - xlink:href="/usr/share/icons/Tango/22x22/mimetypes/font_truetype.png" /> + id="image21054" + x="138.71426" + y="122.79076" /> <image - y="122.79076" - x="646.14282" - id="image21094" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gIQDi0C5tBHpAAAA0dJREFUOMullM9rVFcUxz/nvh/z ZvLe/Miok5mJNkMmSRsdpm1SMqFCF6PSxUDr62yEuBGhkI2LQha11AbcCP0Luu6qUAk03RSkIHUx gdChGgvStChoqAZiaxIzOpnrYiahiZ1kag8c3uXedz73ew+HL1prOsnTYHT6r9YaRQfhi4wfg+Vp w7jni/R3UmN2AHXfgB/fHh0NrNRq4cbNmzeAnv3q9lVswFS4r6/R7ziMJpPKtu1uX+SD/epEa72X 2viwyINSsWjb8/OoSIQ/EwluVCp/3YL4Va03X0mxBZ8fyGR08PFjzOPHUYUCadfFCwaDAudeSbEv kh4W+aNULFp2tYo3MwO2zeqZMzxJp/nh+vWnt5uqn/4nxW/B96/FYiq4vEygXMZIJjHicexSibgI h1zXNOCTtpLbzGz2M6WezZ08qedTKf1btao9z9OZTEb/vrCgf85mdeXECf0p1E5Dd8dz/CZ81zcw oKylJYLnz6PCYVzXxfM8VFcXwYkJutbWOBKNKgumO2qFL5LfNIz+/OHDht7YwJmYAMB1XVzXRUQI nj3L85UVxsbHzUGRj32RI/uC8zCTHRoyjPv3CV64gFgWIoLneYTDYUQEIxDAnZzEfPiQ/njcCMCX e4J9kXcxzfRwMqkkFMIplZqj0wJ7nodSChEh5Ps0Gg3eKRTUoGF86Ivk2o7bFyIPXs/lkoMbG3iX L2OPjW2D19fXsW0bx3EQEUSE2rVrPLlyhduG0fi1Wr13SevMS4p9kfeVZR0YPHgQI5PZAa3X6xSL Rcrl8jZUKUXo1CkIh8n19iplWSlf5L0dYF9EcvD1saNHLe7exZ2a2gEwTZOenh4SicT23tZ57OJF 6nfuMDIyYufgm93uVg7YdrgvGsVKpbAGBpq3tgCmaTI7O7sDuJWhQoGV7m6y8Ti/OE7UF/noqtbf itaaSyLLI/l8vHdtDb24CHsYU7sIDA2xFInw09zco2mtD5mtRlriOBCLYWSziMh2f2Xr+8+9XWul FKI1jdXVltO2WnFL68nNSuWrLIT4H7EIqwst13vJ3UREAZFWujQvCzRdFAU0gOdADVgH/gYe6V0u 19Y2pflep5WBVkoL+mwLrLWu/1v9C3nOQejMt5dkAAAAAElFTkSuQmCC " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/actions/format-justify-center.png" - xlink:href="/usr/share/icons/Tango/22x22/actions/format-justify-center.png" /> - <image - y="122.79076" - x="519.28571" - id="image21104" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/categories/gnome-globe.png" - xlink:href="/usr/share/icons/Tango/22x22/categories/gnome-globe.png" /> + id="image21064" + x="-791" + y="1018.5051" /> <image - y="122.79076" - x="328.99997" - id="image21124" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/actions/gtk-go-forward-ltr.png" - xlink:href="/usr/share/icons/Tango/22x22/actions/gtk-go-forward-ltr.png" /> - <image - y="122.79076" - x="582.71423" - id="image21134" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/internet-web-browser.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/internet-web-browser.png" /> + id="image21074" + x="11.857142" + y="122.79076" /> <image - y="122.79076" - x="392.42856" - id="image21144" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAALpSURBVDiNrZRba1RnFIafb45pMknM2MRq CViatDftjRfOIREUr1oUwd7Yf1GpB/wBgmix2v9QWi+U0gqltaCZmWRSMB5uFEU0yQRzmNHUzMHZ +/v2Xr0YJ86eEwpZsPdasBfPfr93rb2ViPDj5R9+sW37GFsQoWDo1+PfnfhWnTt/NgxUT504sxVc Lv90Ecu2enyAAlBKkZlOA3iyiJDOpHBdh3QmhTGGVHoKrW2mUrewbYup1E0sq1ojq9rd1/i2yYl9 m1lEmEhOvskTiAiJeJIHS6+oRsYRgUQ8gYgQ21vLjeEB15XWm0Sk4QLjuFyfW2WxUAHePqvXjRFo Vvy2EU8NQvphgRdFG6NNAxRP3UVxK1REeFWxefy8SMgHy+sVbON0hLaAa162QkH48+4aB78cZnt/ AK1dVl6+7mpFk+KMp7FeL+YrWLbDJyO9jAyE0MaQK5TbCOgATiYmGqA1X10Rrs+t8PWeEUSEndvC aO2QW6vQfKqO4OmZjAcqItx+ss5oNMxQXxAR4aOhHoxxyOWLTbZ12YpkIumBVm2HP24vEx8b5J97 K7iuS7mq0dowv1Jqsq3L8Gay057dvXF/lT27B9mxrYdof4ihSJBd0Q8IBRS5fAlrc+1oscKjOB5L birIb1jce7rO6aOf4/fhOfaOwTD5l2UW10p8unOgrRUexdnZGUQEV+DnqQX2f/FhC1QEhgfCaOPw bLmId4M6gOOxOCLCzMMC86tlYp9FWwYkImzvD6G1w+Pcf+/2gWRns2QfFbiSXuB11eavO8tYtvEM 8/fsAjfmlnBdl7/nlvhter4F2sbjmuLYeJTGHa0PKBz0cTg+yqHYaFtfOyqe/Tfb9SfU7RNup3iz 48D+g12b3yNEiQgXL124qrU+uhXEQCB47fvjJ79RIoJSSn115PBw1db9jtYRY5s+x5UIuBFX6BPo UyK9IhJQShlRqqKQssJfUX5V8vso+f3+svL5isVCpTA29vHG/ywNVGB1LjtZAAAAAElFTkSuQmCC " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/system-users.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/system-users.png" /> - <image - y="122.79076" - x="265.57141" - id="image21154" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/user-info.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/user-info.png" /> + id="image21084" + x="455.85712" + y="122.79076" /> <image - y="320.36218" - x="141" - id="image21167" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAGMSURBVDiNrZPLasJAFIbPGZNYUqW4s9v6 Ni0KQhZRQ32EUugrFKRXpE9gLdqNq0IfyUVdFEvqJdX5uxATczGJrQeGkGTmm+/8wzAAemzf9R3H MWkPpWna6+XFVY0AUOvmGvuq2/sWAJCyudt8PvuzKQDKZg/cdyVmbmogQEQE3/dIcKfzvBPcshoE pAA3m+exoJWlN6REOnAykIgIoQ1SgdPGYZrmbmDLagQsPVsPBALkbmAhxMZkJuYgnAhgN99E8HoC AOp2X2JCIDIMg7ys/f984GDb9XotovXtYytYSumCoiFRmXsdJhr3ev3YCIJVqVQo9uatjQ3DiLDe Zus9E42FYPfUVwv8C5k5AJVJGfttBoNBbATl8pnvFsYYS1/r1Wo1om0PFI4jpXH41MOgVOBCoRDb elIxsx+squpb++nh9F9UD/5ORMQAqFQ6UYrHxaPRx0ifTKf6j+Poi8VCXy5lTsplTkocAjIPkMrM c2a2hRC2EOI7k8nYiqpMNE2d5HN5ezgcfo7HX7Nft2MSUAePGqIAAAAASUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" /> - <image - y="295.36218" - x="133" - id="image21171" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" /> + id="image21094" + x="646.14282" + y="122.79076" /> <image - y="268.36218" - x="128" - id="image21175" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1gEECzkibQDIygAABQJJREFUOMu9lU1sHOUZx38zs7sz Y+/a6+/1Og6OPxI7kLS1Y2hQKQomAiVtJYQQQoC4gIQQ4gAXPgpSKtRT1apSDj1UKLQqbVX1klYC BRJAEVhgnNgmKQ4bO157119rr3d2Z3dndmbetwdMah+acuojPXpvv+f//vXX8yj8jzp69HkVGDYb ooeqRfvc+PjpLN+hlP8C02J7ku84Zuw+2/Ub7aoX9oXAjISFoeGEkdlyofjsl+//4sJ3Bh8/8dqI 29J+Lltwmnv79pLobCPWEEWPhAipCrZdZmlxja9m54lp8oq5lhkeHz/t3RL80ut/eHU2773pR+qU /gO9DHbHqdegJxEl0dqIpgg6GnVSmS1coXDxi+ssLa16mZX8gbOnn7mxkxUCkFI2ffzxdP8H09lX fnokqSQ72xhMmETr62iI6phhBVUBISSOF1CwHf707gxmPE66IMLpzNYE0LoTrG6/IxNXs2+fOHYo +sixIU6MdBKrM9DCYUBBAaQEuf3F7/W28vKTRxloCdHT3U5bMtHS/+Cbf90J1gAePPnYE1NL1kNh XVcrVQdfqpixGCFVJaJB1QNfCPLFKjeWLT5PbXJjeYuR/R0cPdiONKJMXZ0fiPWNvVNInd+6acXs 3Nq9+bIXmria5Y7+Tvb13kZEA9cHywZVASkEc5kif3vvEla5RrypgYnZNap2iTeePkZ1c5S3z35+ NzB/E3zh0kLfoeEhjo0OkGw2CYUkQkryVYVAgucHrKwX+d0fP8L1fGpewNJKHiGhztR56x+XOT7a G7r42b+GFr71WEqpppatRGdHM93NEdpiYcywguP6WGWXUtnFsh2+Xlih5gcEgUDIbwZ7foCHQnuT yYczy+q9R/of3pkK6QkZ0fUw8XqdkKYQODUW120KjnZTsa7rBEIQCEkgBEJIhBCUijbLm1X8kCn/ /s/LLbvi5ro1N5MrG4oCiqKghzUqJZulTQ/DrMMPBIqmcWR4iJrn8/VcltW1TYSQ/ORHA5j1EbL2 f8IAoCqKIl3Hm22MSMpuwFcLG6RXLfZ3NxOUCkzOXGerWKFQqhIxIqihME3xGMnWBno640TrDdLL eUqlsoKizO5SHAjx5/WV3OCVdLMxc20Zq2gzdW2FXz53nCOVGuevbLBVcnFrPpoK/XuaMLrq2Jds QtNUclZF3pjLKcAHu3LcuP945oEf9j2V3vLN6bSlTHyZpmQ7vPtpirIPj/y4n/ZGndV8mUhI5fC+ OI+OHeTgvnYqTo2lInw6Pi39QDxTSJ3P3wQXUuetDf1wcmG1ONrZ1aHmNiyKdoWwYaAZUSquT1dL HaMDbdzR08RdgwnqjQiaqqBqqkxdzxRy6xtnJ//y4u9PnTq12+zMzHuX1dbhn6mhSNtteztkLrel mLEG3ECSyhT4cDrL1PVVRgfaaY4ZaKqCkFCwbGd+ITPXWL3ym7GxsQzg7wID9Y69cakUxEdRI20/ GLkdHY/Ac9nbYjA60Mz939/D7PwK84s5WfODwLZLxWtz6SW/vHbht7/+1UXLslb4ZqXsWpsa0A0k 9tzzws/1eNfJu+8cYrAvSVVo9CQamF3Mk82uB8W1ZUuXdq4/WbfY3VD75MyZM+9PTk5OAZVbXZA4 kIztvevwyD0nH59bdQ6oIbMLVTMRQTXwylmvtDbp52bOGd5qKpvNXgM2vlV6y9O0I4r6dhtAeNu/ GuBst8f/u/4NYgteFXVEVLYAAAAASUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" /> - <image - y="356.36218" - x="184" - id="image21202" height="22" - width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/accessories-dictionary.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/accessories-dictionary.png" /> + id="image21104" + x="519.28571" + y="122.79076" /> <image - y="342.71912" - x="260.95016" - id="image21212" - height="22" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAM0SURBVDiNtZVbaB1VFIa/NbPn5GLtRSkp KNYnb+2DhQo1idCCVgRBRa36IlKlFHxpSUkLgqJgUaQ+9EVQS2nMQ4haCiliSzSGJqYqmhY1NMZL 1KSxxgTTk+TMZc9ePpw5dZI20Yd0wc/MhjXf2v/ai9miqlyN8K4K9f+CG5uDrvom8+CSg9WxeW3d Le83Nhd2LykYYMfDL1Svu3njq/fsNW9v2yb+koF9P+CRzdtrNq27/+nza03nludl2WL5Jr9oaA7+ wFF3WXUjoXO2+sz5Tho3bK1asWxVw8d9bf2b9sqW06/ryJXAkh+3hj2B7t/ZMidB1aEoTh1dQ60I HnesaWBsfNQd62r521p77+cH4v7/BL+y411O/dSeQRXFkboUpw6nltRZUrXcVnc3Gnsc/eTwTCks PnXqDdsxx+X8SqmzRLZEZEvEaUhkQ5I0IklDYhsSpyGxLfHN7ye4mI7x5AM7r1lx7eq2hj1B06Jg 6xJKSZHJ2TEuFIcZn/6NqdKfhLZIQkgqEU5inMQMXOhhaOILHrvvmdob6256ubHZHKxwzHxwMZxk eOJblHKLxAM/8PCd4Ac+BVPAMz7iBCcpaqLyUxBEblgQnLhoDjSo8jCFsjwjeL4FLM4pt66sZ03h dj48cWR2anriUG9tumtBcD78wMMPPEyVd6mAZwRPPNav2oo/u5y2jsOz01Mz+04fTN8B4KV5YBEJ 6pvKy8c37EMAz0gZbgTfCCfH3qS2poY7r3+I8ZEpPXa8ZWbyl+jZ79pdN1ALGBGJVDUxGdQABYXx t9r2r75s50bi3c+9WKj2l7Pxukc59/25tPOzkxPDvbp9tM8NATX8OwgqImllxz7g9x2w64GqTNWV 9/om0+tS5a6VT9DT3RN/ffbLnwc+sLsujvAXUAAckGaygFm0x/kISyEffdoRDw4O9pw54l5LI2YW SXcVcL6anykGBMoj0n68Nf71h9FDZ99zrVlukinOvsur3ApVtSJCBiJnzQImTfSrH/tHWgaOuu6s kMtBKvAEKAGhquqcf4WU6UHW24Dy1FQcSM6BznMZAZGq2kushS5TEfEpn7SfU8VN/rBSvQLkHy0n h7/z4dY0AAAAAElFTkSuQmCC " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/categories/gnome-applications.png" - xlink:href="/usr/share/icons/Tango/22x22/categories/gnome-applications.png" /> + height="22" + id="image21124" + x="328.99997" + y="122.79076" /> <image - y="354.36218" - x="234" - id="image21226" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QQaByshe1XNtQAABLRJREFUOMu1lVlsVGUUx393maUt 7XSbaelCp3ZKG0rLKpSICwISooaQ+IAEiInxVX2RRB58MuXFGIn64Jsii5qIRCNoRVQWCUpDFJmW pbbo0OlMt5l779y5c2fu/XzooBSCxAe/5J+cLyffLyfnOwv8T0e6l2P7ngMRYBewQQjRBZQDmiRJ UeAEsP9Q347r/wn87Ksf7vOoyosrFi2gPRwkWFWOz6OSsXKMT+oM/zHJr1djFBx336G+HS/fF7x9 z4E613H6l3e19DyxppO84+J1dLo62jjWfxJ/4xJSRpYSxaXUp3B24BqDw/FzkiRtPdS3I3E7S779 IgrOmXWrO3o29UZIaynS0xMYpsWX3/9MfWQZimsT8Mt0hmQqJIMNq9pYsTi8Rgjx2Z0RK7eMbbvf f29ZV3jjUw93ouk6a5a0k5hK09y2iNrQfGRZxcrqSNkZTDNL18JWQgE/pSU+Zoxcc2P3pqpLp498 NQe8fc+BiMejfrBt8wo6F9TSVFdN/3dnqG9uw+v3oyoyjhDIqo9w0EdbSyOlpSXIsoxH5MBXxuBw vHfx2q0HL50+Mg2gAuRN65WVqzqINFYhyxJHv/6B5b2PIUkgBAhAlmSsqRucuRlH9ldC3uCRBxej qgpNlTLt4TqGhuO7gNf+zrHX73m6rakWyzQ4euxbWrsfQgCuKIIFOK5AVb088+TjrO1poba6ivOX byBJEqprMT9YCbDhVipUAFlVQrWVZfRHDSpDnWRyDn6vik+VEBI4jouppVjZHUEIQShYQyhYQ2xs nOi1UWI34wRCCxFCLJpTFY6L4vGqVDhJbOHFMHMk01mmDRvDtNHMHKY2iRBizs/XVAWIJaapr6nA oyoAFXMilqBgZPOqbuaoUMYIqB5ik1Ba3TCbBschpwkcx0VR/qlQy7Jobw7y6Tc/sWx1CATGHLCT L8wkp7TgeKGG3pZyIuEmFqbSfH5+FKUsSMFxydl+3vroFNm8y/qeOno6wpimiUeRuT4hCGsmSETn pMLOWmdHYpPM80Ek3ARAVWWAnRt78BujzGgmKT2LrlSjiQC/XB9H13UMw+DkjxdpbA4TT6aQJKl/ Dti1869Hh+OEa/ycOH0B13VnnbJEwc4yo2WZ0bOkdYt0xiI2bZNOp9F1HdO0WN3dwsifSYD9cxpk aOB4vH3ppkfzLq1yWQ0FPUFZiY98Pk//ucskc34yVp5M1sbI5vC7GpGQj1Q6TVqdz++xKVIp453D e3cevKulB89/8XF9x7qXKsr9Pq/PR6mS58jxU1ycrsLMFTAtm0x2VkmtQE+9S8IqIZl2uHJ1ZPiT N55/AdDuAgPVdiZzgdKGLbZQPFJJgCtjGRKGQM/YmFYey7JQhU1rsJRgQwvR0Wmi0WvJs0ff3p1J T2iADhTuHJshoBFo3Pxc35u1TeH2BxaEqA9WUlFegkdVydkFUnqGxESK0dgEY8O/DZw8vPdd4GZR Q4BzJ1gBmoF6oL6lo3d129L1WwLBhlZ/2TwvsiwLx3GtjJ6diY+ODA0c/ypxIzoIJIAx4Apg/tsG qQQagJqiPQ8oATzMzqN8EaABU8AIMFn03X/nFZvHV5S/CC4ANmAVlb/X478AYzEct5VYdT4AAAAA SUVORK5CYII= " + width="22" height="22" + id="image21134" + x="582.71423" + y="122.79076" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1gcFDBcUmw7QPwAABIpJREFUOMuVlVtsVGUQx3/fOWe3 e2G31+0dbcMlUBBTGiAEjCBIMfHBa6JEDBdtYmLiJUFRY+IzD/iiiRijMUiIRk0kMRIVESEQTYtQ 2hRKuba03e6Fbnf37Nmz5zufD10qtBjqvExmJvln5j+T/wim2fbNgecF6i2FWAogUD0KseeLw+ZB /oeJ24MdmwOf1JaoLe1N/kCdX+oAN0whjw9Zuaum+Orzw7lXZgusT3Xa7t9S52fX9iW+0lSgWksG 6ojrZTgKbU153juSlfOb7vMMnrnknJsNsDbVuhC7Nzf5w4N6hJLKOmqqI1RVViBClVxwwqxtKAkJ Id4GOPZ+uX/WwAoW1/qkbntD+H0+IlWVBAN+SrwecpoPW/Pp6yKq6XSHLx26lsqe3ipk505jrOtF se1uwMbtgVIKp+Bg5fMkEjex8nnsgoOUkrlMsHDJonBk9Sa0QCW2GRe6LESiJ3/e17W1t7VtP6/d lePl8z3Pzis1qkyJZiuBlc+TyZqkM1kaC1GqI3Opad9GLmdiWxkKZoJ8aojQglYdK/vAtvrYlX3d 9MygwlVqz+9DeXehliCbGCMaixGLx3EnYjRgUbPhObLjo+jBOjwVCzCCtaCXkB3+G/+SVhPomMHx o0+ufGg4tGr/sC9kfHNZUqUytGpR5ukZSoQgNe4gdR+uY4MQCKHd2jjSTiOV8CpYeQfHm55Z1wb8 8diGcm6MBMTAwATXr0mUrYAcyqPxaiko5SJzCYRmgO5B5hK4+RRIGykdS0Bw+vI6N6wJ22Oxfm86 G6VlxWryVpr+iz3YNrS0tJC9fAYnE8XNxbDtNEJouIUMTjaK8EfIpOKjQHIGFZouvWPxy7gS8laK iwM9KKCsDOLJPg56ahg9eRRvuBEnO4ad7MfJjqH7KonJGtXfZxl7L3R8e8dVzGtp+qC+xiQev4Gm CRLJGK6CcJlA0zVkrAmzeyMjBR9NshdR24IKNGBplbiBZs6eTYjzV4PlyfHg48sa2lT3cNexKeCG OsVEehiZbEQPpPF4Ba6EQrQZu38tD76xkxPnFDFPBeWXj0PvcfIDfZzvG+PIYCt9crEW3rQRt69v /bKGNm/3cNdvxuQxl6uQr1EkHXALCiEms+rSWlrf3MHXxwfRGhewov1hkhNPcODAUe6P+Fm8fjmP +IN8+OsQ0UujLHvqaZzvv3sXeM9IpzKfnuikY2lztaqqd4UrgsW71kh505y7msKVBRCCcbx0jTrs 2vsyc/wedn95lkX1AuVKXMfh4kiW5iLFxqlfOnev2tBm9BDaMZn7V1+q7RBKuSjp4AIfHzoPQHvr OKUBA+UUOHTqCq6UaPod6uAzgPSfR7peB94BSoqXYgDhF1YsPK1kAYBAcoRsaRUAP/11DdOyuXA9 DUoSTCWmakXzG4ADZACzKPxaUUNMAEvqNDdUUCDHnKoyzLykd3iSmnA4PNmeLGCUlWEY+gx1U4Cc 9lkmbprJz8p//OElAF+xUHEPHZ6wUh8BOXGP7+IDAkWvTReuW/p1m7eKk1piFj9Rm/Yb/wv41uQu oP4BFBADlR+8lIsAAAAASUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/text-editor.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/text-editor.png" /> + height="22" + id="image21144" + x="392.42856" + y="122.79076" /> <image - y="538.36218" - x="171.75" - id="image21159" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAO0SURBVDiNjdVPbxtFGMfx7zO7jmOv46RN 0yaldVqlpDSFckHihhDqweqFY7kgjgi45IC4lztSJd4A6kvoASpxoOoFpB6Aol5AVIkb51+d2I69 6+zuzDwcnLS0SaqMNIeVZj/7e559ViuqynHWYr0cANy+l7jjnJfXwYv1ciDwtQifemUewAh/q3JH 4bvXPeRIeLFeviDCj+PVsfOz52Yq1bEKznvanS4rq5txP44bqtRv30sax4YX62VjhN9na2evzl+s BeJ3QS3WWjLryXyBlfWWW13deOSV927fS/yrhjmikq+iSjR3afZcEGrCeDTC5ESViWqFcjFE7A6n J8eDqBLNA58fBhwKG8MntTfOREZ3KZeKVKtjnJgYZ6xSoTRaZKRQwGcx01OTUWDk5rFhVa5WKhW8 yzHGEAYBo8UiQWAwYjAiqMsolUbxqu8eZoRHtMJZ67DGkaYZ/TghzTLSNCPNM3Jrcc7tp7LHhkV4 1O32Phw9UaQfxzjnCIKA3OYkyYDBIEWlQJwMEPjj2K3wnh+a65tx6gJ2ejHtTpftdodOZ4edXp84 GVAsj9NcezZwnjvHgm/ckOpfZO9v7yYjjdVNrInoDSztnT6dXkxqhdL4aZ6ub9EaJCOPJf/4+o3i woGq/z/HH9RlJpTgwfSZk7WLF8+NsLyE7wozp05SKhUBSAYpa8+28GXFXLhAc21dm6utnkeu3/8p e3gAvnVLzIPfwofnZ6euXVmYD7e2nzBTC3Aty/qfXWzXogpBNeT0O1XCqZClf3JOTc6x8nSZJ/+u tioFO3v3riYvteL+r4Uvoqh0+crC5XBt4zHJoEV7u8fEpQp+zuGvgXsb0prj1FtjtDb7JMk2K81H 1GpzROWRUpyH3xzocWD47M3Ls1Gn0yTNYvJM6WzHbKy18f5Fu7xTmsttWpt9VJU8T+nHW5w9Px0p 3DwAe68LEydO0ulusJsoTsFZYa2xg83BWXAevIeV5S6qAgjWKu3OOlOT06gydwBWCAzhcFZjj6BY y0vbWcU7xTuG24MqZNmAICygiux7L30g3kPcU8QIzgnevzipDBFV0L3k3oMxw9SvrhewoHme42yJ wugA5wRB2JcFeY6jgggEwR4SRHjvDocN/LK81KhfmrtqRvdmVlWHUfcy696F7r9MGZZirWPpScMZ 4eeDiY39cqXZ/L7RaH6EUFR9HnY46vvhddgNBBVFVVCBgRG9q1L49nkDjvo1iUgAjAFVIALKw8JI gQToAx1V3T3s/v8AEVwArj2XavwAAAAASUVORK5CYII= " + width="22" height="22" + id="image21154" + x="265.57141" + y="122.79076" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/user-info.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/user-info.png" /> + height="22" + id="image21167" + x="141" + y="320.36218" /> <image - y="563.36218" - x="171.75" - id="image21161" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " + width="22" height="22" + id="image21171" + x="133" + y="295.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/config-users.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/config-users.png" /> + height="22" + id="image21175" + x="128" + y="268.36218" /> <image - y="588.36218" - x="171.75" - id="image21163" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAQMSURBVDiNtZXLb1VVFIe/te95n3vuvfZd ihJIH8QokyIJVJHGRONQjHUqMTEhkDDDiTNnOjAkwL8gAWVgfBGQaIyUGKhIiZAIlUqLWC29cO5t 7+Ocsxz0IZXijJ3s7GRlr2/99m+/RFV5HM08Fipg/Tdw+MihXhF53XHcN9I06RWRVMRMNxr19wBs 23lfNVuvijFG7qZp+kmWZZ/u33fgxwc5smzF4SOHemzb/gB4bevgc7n+/gEnCEJUlTi+z+j587Xk 8iUZeuttt9DSgqpSq9WYmLieXhy7sNBsNs8lSfLO/n0HJgFkZ/+QEZE7u/ftbn/l5Vfp6+vHmH8d qtVrzM9XcRyXrzZuYvDYx7QObiVNU4wxeJ6HiDAxcYPTp09x8ujJv1S1ywAlx3OLYRAyMLB5FRRA NaNWW2Di5nXuPVFi5twPqCqqSqPRYG5ujrm5OXp7+/D9AMdzi0DJAK1e6CX5MFp7FxR0sQLNdd3E F8dWwMs9SRLSNCUf5vFCLwFaDdDiB74WCoW1uUvJAPX+PmY+/4KFa9cempdlGfl8Hj/wFWgxQIsX eFIoFB8lGFRRoN67icKuF7lx8CBZHK8qmmUZURThhZ48CDaF4sOKV5a7BAfoefcg8a1bxEePrsRW gX3PLINb3cCz1rJiUY0uKV8cnXXddO/dS3l0FPvs2VWK81GEG3jWssetUTFv+b7/Px5nKwAB1u/Z Q9rZSf3MGZyZmRWw7/uEUbgIFqQ7iAJc110TasQsHkEFYwyWZWHZNv727VTLZbzbt1fArusSRAGC dBuELtf3cBxnTX9FhI62Ljo7uhna8QIbNmzEtm1at22jWi6Tm5zE931UFdd18QIXhC4LpM3LO1iW japSqcRc+vknxscvY9s2lmWRy+UY3vUSHe0dHD9+jCRpkiws8Ey5TGV8HPPmCKVSiUajgRe6gLRZ oC1iDDcnf2Ns7AL1ep2Org6Gdu4gl8sBEMcx35w9jaJsfnqAKFq8TH98+BHzd+/y3Zef4dguW57d gskZQFsslFKWpZw69TX3ymXiOObKlSvYlk2xVKRQLDD1+zSNegOAG79OsP6pHuL7MX3lMtVymau/ XCXKR8zO/r3kIyXLWCYaH71KvdKgudCkOZ+QpYrtWzjhHcRSKrNVtLH4hoiTcattGk2EmxsH+fa+ x9T3U9iBheNbuJGLsUwkO/ufnwLtWfOsASZn/hQj1SzJngQwlpnWTMMszdoflQMyLarKyMiIAxRE 0rwaQlWTN0KIZqEiASp+o1rvRMg5oTOLSh3RBUHnEVPNlKpIViHNVYA5oCIP/nnDw8Omvb3dApzM zlwyPEE8FFck81QNRrWZidSNZnURrTVzUtcFbViW1Txx4kSiS0B5XJ/pP+5b6U4DsujpAAAAAElF TkSuQmCC " + width="22" height="22" + id="image21202" + x="184" + y="356.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1gEEBy8Rx1LlbwAABCxJREFUOMud0ltsFFUYB/D/mdnL 7KWzvW6ht+3FAkKFSirFJ0UiCG19MU0wNkKiRSQRgUCkMYZIULnEGl6tPll8sICJLQ8mJk0kwVZQ wKbglq27Rdrdbrvt7uzMzn2OL23Slpa2fslJvnyT/PI/3xzS+kX3p5KGI5pBaSQm5N/uaLHwP+rd 3fxHima1d/aKOgAwooojB17baLzT+Fx2dUl25oWDlwOrRU82F12QLf7YLAoAjEWR9Lidg9f7R7Tm Heuc5WuyhusPXa5YKXp6f+XZltaDR159eUt07pzhOfRd6vqzcmB4Yrj/wTj2bC9ny/xZ9+taOz3L oYf28nWNb7Qczyvf5NQUKTEP7mhrehNAwdpsZ9GUpE+PJjLY+2IFV1aYFatr7SRPg2u31rdnM5Ou v7svIhQM3p4HAwAhBKExoUhIisKEoNLhMQG76wOeMr83umTaPfyWmk2baqXoH+gfiD4am0ifm/vd NtusL/GdCj5OrSMMk7avzXbIqkF2PF9aYP/kWnRnafwOCLFRy4Ku64puGDp5/FOg0KtmDYfimBaV 3s5eMfkEzHNoFhR0VRf7HHaWhoRk+tlRWKS62Mesr/AX3hq37/n6VOO8xL98e1/OxP/CnYgxmb/t 6H5c+fjAE6voaGvq4Tk0mxY9bFooU1QjIggyBiNTCKzxEY/XY7x3vgeh0MN/h4aC4Ts3rowH/DZX PDYKwcxOLLYqZrbpaGvq8bnIW7pJSZFLyEpnNAqGRf+DGGoq81m3x6NcvBosTsbDP0YHrnqVxAPc i+jJk+29JU+F5+D7cmgkf2thWhYnR6nbyeLu8ATZEMhlvbxX/+aGfryqhPdMTosgz7ztIIRxLgbb Fg462pp6zl34DMcP7nONT4lK1w/fuWx2AmMU9nJYli3HoL2j64nGVtGjH57gZFlWFnNsT3mmtDDX +/CD9w9vXuKGJB6Pf+/xeF5fUeIF9Y8oa484h63hel+YCJIMSUqjhr2lE2/5teqa7Q4AxrI7XlAE ALwuR5RSml6jD1Aby4BhOfyerLYKSjaEGYZxANRcLQwALAAxGR+RQC0Uq33gPQ6UFOazP9+beklR ZI4QRl01TCm1A5BiY2G/kzWIYejw64OIpXRmMq0FUqmkm2XZzEphllIasyzLVBQlq+/X61Xy9Bjh 7C7k5ZaCL6jSdm3OpXmc5r772Kg1LdOklMZmV7cUTABwqZTQHQqFwqZp1rjc/E7L0IhsWIDbT1lC mEQiYTbUV/AN9RWcmBY5ScrcA+DCMj8sB8C2M2dPTw8NDQm6rpuaqliaptJMJmNJkmRlMhlLlmXz 5m83x8+cPZ0E8AoAfm5qslhiAEUASk+cPPY57+M3OhwO38IEqqoKyWQq+NWXl84DGAAwAkBdCp6d 2Weu5gXgnumZmXfPANBmjjjnaHOR/wBub+oGiegzigAAAABJRU5ErkJggg== " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/apps/internet-web-browser.png" - xlink:href="/usr/share/icons/Tango/22x22/apps/internet-web-browser.png" /> + height="22" + id="image21212" + x="260.95016" + y="342.71912" /> <image - y="588.36218" - x="196.25" - id="image21165" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gcFDBUEtI+i2QAAAJF0RVh0Q29tbWVudABUb29sYmFy LXNpemVkIGljb24KPT09PT09PT09PT09CgooYykgMjAwMyBKYWt1YiAnamltbWFjJyBTdGVpbmVy LCAKaHR0cDovL2ppbW1hYy5tdXNpY2hhbGwuY3oKCmNyZWF0ZWQgd2l0aCB0aGUgR0lNUCwKaHR0 cDovL3d3dy5naW1wLm9yZxbzvxQAAALTSURBVDjLnZVLTBNBGMd/u1uCoBxaDzR7MBxIiCf0olcO oiacfMRED+CVgyYk3ognQ0JAQvCiMSoEDoTyiB7QkEh8UHpCRCwPU4QCCqXYh7SN3dDd8QBbFlkq 8E8238xk85v/fDPzDVjk7UAcJeaUtwMhhBBHiXY82dpJLQ9vxeknh4oWSWbDAdDY1NA1+C0JXOBN oB6o3RM943d3xZ5Pd4BaXvrv0djkFPmf7wNQ121I2RkamxrEtSs3GB8fx+VyEY1GcTqdrKysoKoq sViM4uJigsEgqqqytraGqqqEw2EmJiZwLzVT0+ZlcaSX931t1HUbksO07na7qaioAMAwDBRFoby8 HEmSEGIrjWVlZciyjGEYAAghcC81c/vRKMsfupicWdcBJZsKgMLCQjRNA0BRFNsNNscVRSEUCvH1 +cUdaCBCdLpfMVORBcvyzj4Gg8GcJ2h9fZ3Zzipq2rwE33Uy5g+RDLzK5ncX2KqSkpJ9oaurqzvQ t518mfu1B7oveD/HWaetW9DpxRjxmQG0sw+gu57/gu0cZ522elkY6WFqIUrE34fz0gtC4Z97/j+Q Y9NpdcsI34famfkRJ+Lvp7J+kvn5+YODrY6FEIy0nKP64UcCQ+3MLMWJzw5QWT8JQCQSsU1bTsdC CDweD5vyeaZ8PhZXfhOfHeB0zWvC4TBCCHRdPzjYdKzrOuqPFobXSunp66NUHuPU9V5SqRTJZJKi oiLS6fS+YNnOsRACTdOo6zZovTnH6OZVTpZd5ozLBYDL5ULTtOwt3OYYVvAxO8dCCIQQ2SXf2l6B efskSSKTyeB2u5kPJtjm/IGtMuoACuyWIkkSkiTZXmlTeXl55Ofnm90CQAN0QHKYRSMWi+Hz+Tis LJNbZxUOIJ3YSAw+ffa4iiMqsZEYBNJmGsx67ABOAEXAcctJkXOwzE3KACkgASS3+7ueEtnycQiw 2Tb+GeMvnmKjxk6hepkAAAAASUVORK5CYII= " + width="22" height="22" + id="image21226" + x="234" + y="354.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABHNCSVQICAgIfAhkiAAAABl0RVh0 U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAO0SURBVDiNjdVPbxtFGMfx7zO7jmOv46RN 0yaldVqlpDSFckHihhDqweqFY7kgjgi45IC4lztSJd4A6kvoASpxoOoFpB6Aol5AVIkb51+d2I69 6+zuzDwcnLS0SaqMNIeVZj/7e559ViuqynHWYr0cANy+l7jjnJfXwYv1ciDwtQifemUewAh/q3JH 4bvXPeRIeLFeviDCj+PVsfOz52Yq1bEKznvanS4rq5txP44bqtRv30sax4YX62VjhN9na2evzl+s BeJ3QS3WWjLryXyBlfWWW13deOSV927fS/yrhjmikq+iSjR3afZcEGrCeDTC5ESViWqFcjFE7A6n J8eDqBLNA58fBhwKG8MntTfOREZ3KZeKVKtjnJgYZ6xSoTRaZKRQwGcx01OTUWDk5rFhVa5WKhW8 yzHGEAYBo8UiQWAwYjAiqMsolUbxqu8eZoRHtMJZ67DGkaYZ/TghzTLSNCPNM3Jrcc7tp7LHhkV4 1O32Phw9UaQfxzjnCIKA3OYkyYDBIEWlQJwMEPjj2K3wnh+a65tx6gJ2ejHtTpftdodOZ4edXp84 GVAsj9NcezZwnjvHgm/ckOpfZO9v7yYjjdVNrInoDSztnT6dXkxqhdL4aZ6ub9EaJCOPJf/4+o3i woGq/z/HH9RlJpTgwfSZk7WLF8+NsLyE7wozp05SKhUBSAYpa8+28GXFXLhAc21dm6utnkeu3/8p e3gAvnVLzIPfwofnZ6euXVmYD7e2nzBTC3Aty/qfXWzXogpBNeT0O1XCqZClf3JOTc6x8nSZJ/+u tioFO3v3riYvteL+r4Uvoqh0+crC5XBt4zHJoEV7u8fEpQp+zuGvgXsb0prj1FtjtDb7JMk2K81H 1GpzROWRUpyH3xzocWD47M3Ls1Gn0yTNYvJM6WzHbKy18f5Fu7xTmsttWpt9VJU8T+nHW5w9Px0p 3DwAe68LEydO0ulusJsoTsFZYa2xg83BWXAevIeV5S6qAgjWKu3OOlOT06gydwBWCAzhcFZjj6BY y0vbWcU7xTuG24MqZNmAICygiux7L30g3kPcU8QIzgnevzipDBFV0L3k3oMxw9SvrhewoHme42yJ wugA5wRB2JcFeY6jgggEwR4SRHjvDocN/LK81KhfmrtqRvdmVlWHUfcy696F7r9MGZZirWPpScMZ 4eeDiY39cqXZ/L7RaH6EUFR9HnY46vvhddgNBBVFVVCBgRG9q1L49nkDjvo1iUgAjAFVIALKw8JI gQToAx1V3T3s/v8AEVwArj2XavwAAAAASUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" /> + height="22" + id="image21159" + x="171.75" + y="538.36218" /> <image - y="563.36218" - x="196.25" - id="image21169" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1gcFDBcUmw7QPwAABIpJREFUOMuVlVtsVGUQx3/fOWe3 e2G31+0dbcMlUBBTGiAEjCBIMfHBa6JEDBdtYmLiJUFRY+IzD/iiiRijMUiIRk0kMRIVESEQTYtQ 2hRKuba03e6Fbnf37Nmz5zufD10qtBjqvExmJvln5j+T/wim2fbNgecF6i2FWAogUD0KseeLw+ZB /oeJ24MdmwOf1JaoLe1N/kCdX+oAN0whjw9Zuaum+Orzw7lXZgusT3Xa7t9S52fX9iW+0lSgWksG 6ojrZTgKbU153juSlfOb7vMMnrnknJsNsDbVuhC7Nzf5w4N6hJLKOmqqI1RVViBClVxwwqxtKAkJ Id4GOPZ+uX/WwAoW1/qkbntD+H0+IlWVBAN+SrwecpoPW/Pp6yKq6XSHLx26lsqe3ipk505jrOtF se1uwMbtgVIKp+Bg5fMkEjex8nnsgoOUkrlMsHDJonBk9Sa0QCW2GRe6LESiJ3/e17W1t7VtP6/d lePl8z3Pzis1qkyJZiuBlc+TyZqkM1kaC1GqI3Opad9GLmdiWxkKZoJ8aojQglYdK/vAtvrYlX3d 9MygwlVqz+9DeXehliCbGCMaixGLx3EnYjRgUbPhObLjo+jBOjwVCzCCtaCXkB3+G/+SVhPomMHx o0+ufGg4tGr/sC9kfHNZUqUytGpR5ukZSoQgNe4gdR+uY4MQCKHd2jjSTiOV8CpYeQfHm55Z1wb8 8diGcm6MBMTAwATXr0mUrYAcyqPxaiko5SJzCYRmgO5B5hK4+RRIGykdS0Bw+vI6N6wJ22Oxfm86 G6VlxWryVpr+iz3YNrS0tJC9fAYnE8XNxbDtNEJouIUMTjaK8EfIpOKjQHIGFZouvWPxy7gS8laK iwM9KKCsDOLJPg56ahg9eRRvuBEnO4ad7MfJjqH7KonJGtXfZxl7L3R8e8dVzGtp+qC+xiQev4Gm CRLJGK6CcJlA0zVkrAmzeyMjBR9NshdR24IKNGBplbiBZs6eTYjzV4PlyfHg48sa2lT3cNexKeCG OsVEehiZbEQPpPF4Ba6EQrQZu38tD76xkxPnFDFPBeWXj0PvcfIDfZzvG+PIYCt9crEW3rQRt69v /bKGNm/3cNdvxuQxl6uQr1EkHXALCiEms+rSWlrf3MHXxwfRGhewov1hkhNPcODAUe6P+Fm8fjmP +IN8+OsQ0UujLHvqaZzvv3sXeM9IpzKfnuikY2lztaqqd4UrgsW71kh505y7msKVBRCCcbx0jTrs 2vsyc/wedn95lkX1AuVKXMfh4kiW5iLFxqlfOnev2tBm9BDaMZn7V1+q7RBKuSjp4AIfHzoPQHvr OKUBA+UUOHTqCq6UaPod6uAzgPSfR7peB94BSoqXYgDhF1YsPK1kAYBAcoRsaRUAP/11DdOyuXA9 DUoSTCWmakXzG4ADZACzKPxaUUNMAEvqNDdUUCDHnKoyzLykd3iSmnA4PNmeLGCUlWEY+gx1U4Cc 9lkmbprJz8p//OElAF+xUHEPHZ6wUh8BOXGP7+IDAkWvTReuW/p1m7eKk1piFj9Rm/Yb/wv41uQu oP4BFBADlR+8lIsAAAAASUVORK5CYII= " + width="22" height="22" + id="image21161" + x="171.75" + y="563.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1QQaByshe1XNtQAABLRJREFUOMu1lVlsVGUUx393maUt 7XSbaelCp3ZKG0rLKpSICwISooaQ+IAEiInxVX2RRB58MuXFGIn64Jsii5qIRCNoRVQWCUpDFJmW pbbo0OlMt5l779y5c2fu/XzooBSCxAe/5J+cLyffLyfnOwv8T0e6l2P7ngMRYBewQQjRBZQDmiRJ UeAEsP9Q347r/wn87Ksf7vOoyosrFi2gPRwkWFWOz6OSsXKMT+oM/zHJr1djFBx336G+HS/fF7x9 z4E613H6l3e19DyxppO84+J1dLo62jjWfxJ/4xJSRpYSxaXUp3B24BqDw/FzkiRtPdS3I3E7S779 IgrOmXWrO3o29UZIaynS0xMYpsWX3/9MfWQZimsT8Mt0hmQqJIMNq9pYsTi8Rgjx2Z0RK7eMbbvf f29ZV3jjUw93ouk6a5a0k5hK09y2iNrQfGRZxcrqSNkZTDNL18JWQgE/pSU+Zoxcc2P3pqpLp498 NQe8fc+BiMejfrBt8wo6F9TSVFdN/3dnqG9uw+v3oyoyjhDIqo9w0EdbSyOlpSXIsoxH5MBXxuBw vHfx2q0HL50+Mg2gAuRN65WVqzqINFYhyxJHv/6B5b2PIUkgBAhAlmSsqRucuRlH9ldC3uCRBxej qgpNlTLt4TqGhuO7gNf+zrHX73m6rakWyzQ4euxbWrsfQgCuKIIFOK5AVb088+TjrO1poba6ivOX byBJEqprMT9YCbDhVipUAFlVQrWVZfRHDSpDnWRyDn6vik+VEBI4jouppVjZHUEIQShYQyhYQ2xs nOi1UWI34wRCCxFCLJpTFY6L4vGqVDhJbOHFMHMk01mmDRvDtNHMHKY2iRBizs/XVAWIJaapr6nA oyoAFXMilqBgZPOqbuaoUMYIqB5ik1Ba3TCbBschpwkcx0VR/qlQy7Jobw7y6Tc/sWx1CATGHLCT L8wkp7TgeKGG3pZyIuEmFqbSfH5+FKUsSMFxydl+3vroFNm8y/qeOno6wpimiUeRuT4hCGsmSETn pMLOWmdHYpPM80Ek3ARAVWWAnRt78BujzGgmKT2LrlSjiQC/XB9H13UMw+DkjxdpbA4TT6aQJKl/ Dti1869Hh+OEa/ycOH0B13VnnbJEwc4yo2WZ0bOkdYt0xiI2bZNOp9F1HdO0WN3dwsifSYD9cxpk aOB4vH3ppkfzLq1yWQ0FPUFZiY98Pk//ucskc34yVp5M1sbI5vC7GpGQj1Q6TVqdz++xKVIp453D e3cevKulB89/8XF9x7qXKsr9Pq/PR6mS58jxU1ycrsLMFTAtm0x2VkmtQE+9S8IqIZl2uHJ1ZPiT N55/AdDuAgPVdiZzgdKGLbZQPFJJgCtjGRKGQM/YmFYey7JQhU1rsJRgQwvR0Wmi0WvJs0ff3p1J T2iADhTuHJshoBFo3Pxc35u1TeH2BxaEqA9WUlFegkdVydkFUnqGxESK0dgEY8O/DZw8vPdd4GZR Q4BzJ1gBmoF6oL6lo3d129L1WwLBhlZ/2TwvsiwLx3GtjJ6diY+ODA0c/ypxIzoIJIAx4Apg/tsG qQQagJqiPQ8oATzMzqN8EaABU8AIMFn03X/nFZvHV5S/CC4ANmAVlb/X478AYzEct5VYdT4AAAAA SUVORK5CYII= " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" /> + height="22" + id="image21163" + x="171.75" + y="588.36218" /> <image - y="538.36218" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " + width="22" + height="22" + id="image21165" x="196.25" - id="image21173" + y="588.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " + width="22" height="22" + id="image21169" + x="196.25" + y="563.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " width="22" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" /> + height="22" + id="image21173" + x="196.25" + y="538.36218" /> <g - style="display:inline" - id="g8781" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/menu-arrow-down.png" - inkscape:export-xdpi="90" + transform="translate(-1548.8005,416.11272)" inkscape:export-ydpi="90" - transform="translate(-1548.8005,416.11272)"> + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/menu-arrow-down.png" + id="g8781" + style="display:inline"> <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/menu-arrow-down.png" - transform="translate(126.81013,-429.87643)" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="2.6129171" - sodipodi:arg1="1.5657195" - sodipodi:r2="0.90551758" - sodipodi:r1="3.7810335" - sodipodi:cy="674.18896" - sodipodi:cx="1563" - sodipodi:sides="3" - id="path8777" + sodipodi:type="star" style="color:#000000;fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:#2b0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> + id="path8777" + sodipodi:sides="3" + sodipodi:cx="1563" + sodipodi:cy="674.18896" + sodipodi:r1="3.7810335" + sodipodi:r2="0.90551758" + sodipodi:arg1="1.5657195" + sodipodi:arg2="2.6129171" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + transform="translate(126.81013,-429.87643)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/menu-arrow-down.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <rect - y="237.74947" - x="1682.3005" - height="14.999998" - width="14.999999" + style="opacity:0.35;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect8779" - style="opacity:0.35;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="14.999999" + height="14.999998" + x="1682.3005" + y="237.74947" /> </g> <path - sodipodi:type="star" - style="color:#000000;fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:#2b0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path4338" - sodipodi:sides="3" - sodipodi:cx="1563" - sodipodi:cy="674.18896" - sodipodi:r1="3.7810335" - sodipodi:r2="0.90551758" - sodipodi:arg1="1.5657195" - sodipodi:arg2="2.6129171" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " - transform="matrix(1.2183231,0,0,0.748639,-1727.2273,161.9366)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + transform="matrix(1.2183231,0,0,0.748639,-1727.2273,161.9366)" + d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6129171" + sodipodi:arg1="1.5657195" + sodipodi:r2="0.90551758" + sodipodi:r1="3.7810335" + sodipodi:cy="674.18896" + sodipodi:cx="1563" + sodipodi:sides="3" + id="path4338" + style="color:#000000;fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:#2b0000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> <g - id="g7279" - transform="translate(-26.8221,-0.526197)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-white.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-white.png" + transform="translate(-26.8221,-0.526197)" + id="g7279"> <rect - transform="matrix(0,-1,1,0,0,0)" - y="358.56131" - x="-712.14917" - height="2.5215814" - width="2.5215812" + style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7274" - style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="2.5215812" + height="2.5215814" + x="-712.14917" + y="358.56131" + transform="matrix(0,-1,1,0,0,0)" /> <g - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + id="g6297" transform="matrix(0,-0.8185892,0.6979611,0,-116.44015,999.03182)" - id="g6297"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"> <rect - style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6299" - width="2.5215812" - height="2.5215814" + y="681.10138" x="350.73923" - y="681.10138" /> + height="2.5215814" + width="2.5215812" + id="rect6299" + style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - sodipodi:type="star" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6301" - sodipodi:sides="3" - sodipodi:cx="1563" - sodipodi:cy="674.18896" - sodipodi:r1="3.7810335" - sodipodi:r2="0.90551758" - sodipodi:arg1="1.5657195" - sodipodi:arg2="2.6129171" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " - transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402137)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402137)" + d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6129171" + sodipodi:arg1="1.5657195" + sodipodi:r2="0.90551758" + sodipodi:r1="3.7810335" + sodipodi:cy="674.18896" + sodipodi:cx="1563" + sodipodi:sides="3" + id="path6301" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> </g> <g - id="g7285" - transform="translate(-1.8221004,-0.526197)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + transform="translate(-1.8221004,-0.526197)" + id="g7285"> <rect - transform="matrix(0,-1,1,0,0,0)" - y="358.56131" - x="-712.14917" - height="2.5215814" - width="2.5215812" + style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7287" - style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="2.5215812" + height="2.5215814" + x="-712.14917" + y="358.56131" + transform="matrix(0,-1,1,0,0,0)" /> <g - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + id="g7289" transform="matrix(0,-0.8185892,0.6979611,0,-116.44015,999.03182)" - id="g7289"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"> <rect - style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7291" - width="2.5215812" - height="2.5215814" + y="681.10138" x="350.73923" - y="681.10138" /> + height="2.5215814" + width="2.5215812" + id="rect7291" + style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - sodipodi:type="star" - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7293" - sodipodi:sides="3" - sodipodi:cx="1563" - sodipodi:cy="674.18896" - sodipodi:r1="3.7810335" - sodipodi:r2="0.90551758" - sodipodi:arg1="1.5657195" - sodipodi:arg2="2.6129171" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " - transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402137)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402137)" + d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6129171" + sodipodi:arg1="1.5657195" + sodipodi:r2="0.90551758" + sodipodi:r1="3.7810335" + sodipodi:cy="674.18896" + sodipodi:cx="1563" + sodipodi:sides="3" + id="path7293" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> </g> <g - id="g7295" - transform="matrix(0,1,-1,0,1043.8884,370.54008)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-down-white.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-down-white.png" + transform="matrix(0,1,-1,0,1043.8884,370.54008)" + id="g7295"> <rect - transform="matrix(0,-1,1,0,0,0)" - y="358.56131" - x="-712.14917" - height="2.5215814" - width="2.5215812" + style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7297" - style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="2.5215812" + height="2.5215814" + x="-712.14917" + y="358.56131" + transform="matrix(0,-1,1,0,0,0)" /> <g - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + id="g7299" transform="matrix(0,-0.8185892,0.6979611,0,-116.44015,999.03182)" - id="g7299"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"> <rect - style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7301" - width="2.5215812" - height="2.5215814" + y="681.10138" x="350.73923" - y="681.10138" /> + height="2.5215814" + width="2.5215812" + id="rect7301" + style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - sodipodi:type="star" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7303" - sodipodi:sides="3" - sodipodi:cx="1563" - sodipodi:cy="674.18896" - sodipodi:r1="3.7810335" - sodipodi:r2="0.90551758" - sodipodi:arg1="1.5657195" - sodipodi:arg2="2.6129171" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " - transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402134)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402134)" + d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6129171" + sodipodi:arg1="1.5657195" + sodipodi:r2="0.90551758" + sodipodi:r1="3.7810335" + sodipodi:cy="674.18896" + sodipodi:cx="1563" + sodipodi:sides="3" + id="path7303" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> </g> <g - id="g7305" - transform="matrix(0,1,-1,0,1068.8884,370.54008)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-down-black.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-down-black.png" + transform="matrix(0,1,-1,0,1068.8884,370.54008)" + id="g7305"> <rect - transform="matrix(0,-1,1,0,0,0)" - y="358.56131" - x="-712.14917" - height="2.5215814" - width="2.5215812" + style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect7307" - style="opacity:0;color:#000000;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:13.47841835;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="2.5215812" + height="2.5215814" + x="-712.14917" + y="358.56131" + transform="matrix(0,-1,1,0,0,0)" /> <g - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + id="g7309" transform="matrix(0,-0.8185892,0.6979611,0,-116.44015,999.03182)" - id="g7309"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/arrow-right-black.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"> <rect - style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7311" - width="2.5215812" - height="2.5215814" + y="681.10138" x="350.73923" - y="681.10138" /> + height="2.5215814" + width="2.5215812" + id="rect7311" + style="opacity:0;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.09088254;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - sodipodi:type="star" - style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7313" - sodipodi:sides="3" - sodipodi:cx="1563" - sodipodi:cy="674.18896" - sodipodi:r1="3.7810335" - sodipodi:r2="0.90551758" - sodipodi:arg1="1.5657195" - sodipodi:arg2="2.6129171" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " - transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402134)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/button-sitebar-arrow-down.png" + transform="matrix(1.7115632,0,0,1.0517267,-2323.1568,-28.402134)" + d="M 1563.0192,677.96995 L 1559.716,672.3151 L 1566.2648,672.28185 L 1563.0192,677.96995 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6129171" + sodipodi:arg1="1.5657195" + sodipodi:r2="0.90551758" + sodipodi:r1="3.7810335" + sodipodi:cy="674.18896" + sodipodi:cx="1563" + sodipodi:sides="3" + id="path7313" + style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81307399;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> </g> <image - y="705.36218" - x="524" - id="image10476" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> - <image - y="705.36218" - x="540" - id="image10549" height="16" - width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-grey.png" - xlink:href="icons/star-grey.png" /> + id="image10476" + x="524" + y="705.36218" /> <image - xlink:href="icons/star-yellow.png" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAA CxMAAAsTAQCanBgAAAAHdElNRQfXBBoVNDn3CY1oAAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0 aCBUaGUgR0lNUO9kJW4AAAFwSURBVCjPjZAxaBNhGIaf//7ESwzUHkQKicaiQguhUEGl0MHiIIQu OklBCh2bOlkHB4slJZTSpYOTIrg4OQRqCEfjoItgKR3c1GAxpoK1SSU9Wu+/3J1DQpuUDL7L9/G+ D3y8n6SLlsSsLrxP3aKvj4qV1yPtjna83hWFvp0JGdUedwHuy3viYtBI2YmYXr9UCMB0qJnI5lj3 R43b5wMrZ+JR7Xu49s6ovThoJgI2w40BW+q4Tw+vXZDws7GRP73ouQrn98OygI+VYNxFQ6AjsJH8 2LV+OckGdWqTGjjputVLgh5cLBSKWO/w4JhvUF1VOQGwdtnJxwZC7OPi43PKA9N3nmSyrRa3Surq l5yDxMPDR9fMPyqVybbVvGOpYhWJhkTgY1sLxROPssejhIjwF4MIRuLBUAfwPKxunqPMm9L7lx/Y ox9nvANQN86GTdafqSvzU59Tr7a9IyDQOhD/tqXScybAsjmTfLvSuM7/6R8xvn+6qCX/bgAAAABJ RU5ErkJggg== " width="16" height="16" - id="image10552" - x="508" + id="image10549" + x="540" y="705.36218" /> <image y="705.36218" - x="476" - id="image10554" + x="508" + id="image10552" height="16" width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " /> <image - y="705.36218" - x="492" - id="image10556" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> - <image - y="744.36218" - x="524" - id="image10560" height="16" - width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> + id="image10554" + x="476" + y="705.36218" /> <image - y="744.36218" - x="540" - id="image10562" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-grey.png" - xlink:href="icons/star-grey.png" /> + height="16" + id="image10556" + x="492" + y="705.36218" /> <image - xlink:href="icons/star-yellow.png" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" height="16" - id="image10564" - x="508" + id="image10560" + x="524" y="744.36218" /> <image - y="744.36218" - x="476" - id="image10566" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAA CxMAAAsTAQCanBgAAAAHdElNRQfXBBoVNDn3CY1oAAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0 aCBUaGUgR0lNUO9kJW4AAAFwSURBVCjPjZAxaBNhGIaf//7ESwzUHkQKicaiQguhUEGl0MHiIIQu OklBCh2bOlkHB4slJZTSpYOTIrg4OQRqCEfjoItgKR3c1GAxpoK1SSU9Wu+/3J1DQpuUDL7L9/G+ D3y8n6SLlsSsLrxP3aKvj4qV1yPtjna83hWFvp0JGdUedwHuy3viYtBI2YmYXr9UCMB0qJnI5lj3 R43b5wMrZ+JR7Xu49s6ovThoJgI2w40BW+q4Tw+vXZDws7GRP73ouQrn98OygI+VYNxFQ6AjsJH8 2LV+OckGdWqTGjjputVLgh5cLBSKWO/w4JhvUF1VOQGwdtnJxwZC7OPi43PKA9N3nmSyrRa3Surq l5yDxMPDR9fMPyqVybbVvGOpYhWJhkTgY1sLxROPssejhIjwF4MIRuLBUAfwPKxunqPMm9L7lx/Y ox9nvANQN86GTdafqSvzU59Tr7a9IyDQOhD/tqXScybAsjmTfLvSuM7/6R8xvn+6qCX/bgAAAABJ RU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> + height="16" + id="image10562" + x="540" + y="744.36218" /> <image y="744.36218" - x="492" - id="image10568" + x="508" + id="image10564" height="16" width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " /> <image - y="784.36218" - x="538" - id="image10572" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " + width="16" height="16" + id="image10566" + x="476" + y="744.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-grey.png" - xlink:href="icons/star-grey.png" /> + height="16" + id="image10568" + x="492" + y="744.36218" /> <image - xlink:href="icons/star-yellow.png" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAA CxMAAAsTAQCanBgAAAAHdElNRQfXBBoVNDn3CY1oAAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0 aCBUaGUgR0lNUO9kJW4AAAFwSURBVCjPjZAxaBNhGIaf//7ESwzUHkQKicaiQguhUEGl0MHiIIQu OklBCh2bOlkHB4slJZTSpYOTIrg4OQRqCEfjoItgKR3c1GAxpoK1SSU9Wu+/3J1DQpuUDL7L9/G+ D3y8n6SLlsSsLrxP3aKvj4qV1yPtjna83hWFvp0JGdUedwHuy3viYtBI2YmYXr9UCMB0qJnI5lj3 R43b5wMrZ+JR7Xu49s6ovThoJgI2w40BW+q4Tw+vXZDws7GRP73ouQrn98OygI+VYNxFQ6AjsJH8 2LV+OckGdWqTGjjputVLgh5cLBSKWO/w4JhvUF1VOQGwdtnJxwZC7OPi43PKA9N3nmSyrRa3Surq l5yDxMPDR9fMPyqVybbVvGOpYhWJhkTgY1sLxROPssejhIjwF4MIRuLBUAfwPKxunqPMm9L7lx/Y ox9nvANQN86GTdafqSvzU59Tr7a9IyDQOhD/tqXScybAsjmTfLvSuM7/6R8xvn+6qCX/bgAAAABJ RU5ErkJggg== " width="16" height="16" - id="image10574" - x="506" + id="image10572" + x="538" y="784.36218" /> <image y="784.36218" - x="474" - id="image10576" + x="506" + id="image10574" height="16" width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " /> <image - y="784.36218" - x="490" - id="image10578" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> - <image - y="820.36218" - x="535" - id="image10582" height="16" + id="image10576" + x="474" + y="784.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-grey.png" - xlink:href="icons/star-grey.png" /> + height="16" + id="image10578" + x="490" + y="784.36218" /> <image - xlink:href="icons/star-yellow.png" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAAAmJLR0QA/4ePzL8AAAAJcEhZcwAA CxMAAAsTAQCanBgAAAAHdElNRQfXBBoVNDn3CY1oAAAAHXRFWHRDb21tZW50AENyZWF0ZWQgd2l0 aCBUaGUgR0lNUO9kJW4AAAFwSURBVCjPjZAxaBNhGIaf//7ESwzUHkQKicaiQguhUEGl0MHiIIQu OklBCh2bOlkHB4slJZTSpYOTIrg4OQRqCEfjoItgKR3c1GAxpoK1SSU9Wu+/3J1DQpuUDL7L9/G+ D3y8n6SLlsSsLrxP3aKvj4qV1yPtjna83hWFvp0JGdUedwHuy3viYtBI2YmYXr9UCMB0qJnI5lj3 R43b5wMrZ+JR7Xu49s6ovThoJgI2w40BW+q4Tw+vXZDws7GRP73ouQrn98OygI+VYNxFQ6AjsJH8 2LV+OckGdWqTGjjputVLgh5cLBSKWO/w4JhvUF1VOQGwdtnJxwZC7OPi43PKA9N3nmSyrRa3Surq l5yDxMPDR9fMPyqVybbVvGOpYhWJhkTgY1sLxROPssejhIjwF4MIRuLBUAfwPKxunqPMm9L7lx/Y ox9nvANQN86GTdafqSvzU59Tr7a9IyDQOhD/tqXScybAsjmTfLvSuM7/6R8xvn+6qCX/bgAAAABJ RU5ErkJggg== " width="16" height="16" - id="image10584" - x="503" + id="image10582" + x="535" y="820.36218" /> <image y="820.36218" - x="471" - id="image10586" + x="503" + id="image10584" height="16" width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " /> <image - y="820.36218" - x="487" - id="image10588" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow.png" - xlink:href="icons/star-yellow.png" /> - <image - y="820.36218" - x="519" - id="image10645" height="16" + id="image10586" + x="471" + y="820.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaESwFXXTBagAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACaElEQVQ4y62STUhUcRTFz33vzRs1ndIxdcYkbTSHxFD6sEUr CSpEyGhRCEK4iKRaFFSotCrSIoRwE0gtIghqk4QoFkGh9mFlTjia6DRiztNpvhyn5n39/y0iUVBw 0dmdw72/xT0X2KDuPLmEwGQHmpobsGEx1nWVPXXOfvzUdmC9GWGt8ErzccyNt+XCe+sUXK7sTMPf uiHA5dtnca6lHu5iB/IsPSegO/J4Sb3MFhd2R8evAwBa2s+sAogrzUD/MGprq3C+xu7G/NA9nlud xWmLJcOMpU1Mhl5tdpfPtLXeXwUgAGDqXUALVVBsQeQ2DgRfdCJZWsXTK8EZiIix1z0vu8t3Zt4k pppJzYCu68HCurczfwHe7bPYgXxMJoGCFCAMgI6BGxbAMMEtNlDInyRZWjB/RwoM0UqhgA/hWKJB AgDKaWyC/8sjXlSXjmQEEBVAjUIwDXCugbQEuKMihYlpBZCyYNUCCHk93UtJ4SEtV/b9YjEUz3OU lJUiHDfAIRLTicMEcQKX7NxkUZr75mPhn5Frlac9N5ZvsAz5fBKI+fu4s7CaTE0CUwEOkJgORoRF ZVidmkqt3ds42r9mjULlY5ia9AakA7IMUJxDWAK3GoBMUIIZsZXLaz6Sak05zOQizuUcQCACj3CD oMFqwyZZzO7rKCtfF/Drfd2+RDSyR7QfsYAZbCk4Fk9Epn2G8kNmkps7i11M1c2adQFRRbFvzXOm wtOJiYGhLt90ri3jYNw1+CFxdOzd4DwXtomGwVYBpJXGYJTvmwn4VE1v2lU/0vsvP3RhtPdZu+qY +jryIKlq+/E/9QcTeReAar7qwwAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-small-yellow.png" - xlink:href="icons/star-small-yellow.png" /> + height="16" + id="image10588" + x="487" + y="820.36218" /> <image - y="784.36218" - x="522" - id="image10688" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQaES01YrbAhwAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAABvklEQVQ4y9VTPUhbYRQ93/deni+xhmr86WBKhxRLFNGhuElB Fze1oyBVl7qKIhTaKSmFLGIp4qSjgxQcnbWLokYNRCGlkZhYbWLz9OXvy3vfdXFQU5Fu7d3u5ZzD uYd7gf+m9sOfsPkt8Hek8unbLrn+cju6OTlyH0a9O5gKjcMqCfibNPBMpI+aO547fiQnsgeBhdBK AsHp+Vt4flcgNDWHOo1htOfxCwg+TrrP2Vxb3RLZi7WJfL7CAbvZyMOWQXjcPtg2g5kdI/uVj5RG BqZQIrK7/MSjbQhJSvZX6tAwCzvtw3tHt1fQnrVDVL+D5nVAyYBJFyAuAK4yr7+rn7hzQLUv1ZPj +BdbIlrhAADkVv8b1HtmIeCElApIMBCDVGook4wjFT9+3zmyH7w3A+L6In2PfiAyAfmbwUoDXEDk 4nb+4mjiJvmPAkrnEorMyaVaR6S5AG6Q7ZCWzV2sWNArUqwQyG8MVOXMy17e8NphiZwwMwep8mlS 1Wv9DLq7+8E7OD/5WV/zyK1bOzNrsUQyWLa8q2kj1/HUiAXOzkptDwpIYlr63CiURPpz61B49Xoc /vqxGBKiHPj3nuwK1KPCBtCktkMAAAAASUVORK5CYII= " + width="16" height="16" + id="image10645" + x="519" + y="820.36218" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1wQeFxAJrN4fWwAAAB10RVh0Q29tbWVudABDcmVhdGVk IHdpdGggVGhlIEdJTVDvZCVuAAACMElEQVQ4y7WTX0hTYRjGn2/fztl0a3AS5/4UzagUIjBKoqCb IPImaFEXoytTzCQIukhZhBcRlBddhASSRESDSIiIrEm7EKItihklqKHmCrcO07a1Y+Ps/Pm+7qyL HSio9/Z53x8878MD/M9hbHTgeWLciE0+6bbasVkJublrTZgdiog2B0XVdvWvAT7h2Qnofl8wsAnK t7L0x4ArQ90CW4q2Ip/t5xv3eiRJQp3NLtyP3eqrBSDrfpXBNvI9T7mHAyuJYagt+7h7NzJGJ8nm cki/S33d5V29RJimVzUdpqEtHO2+/ZoAAJvdsoytCGJeBTY7gQIAcgzcEPBBOQVK7cguZ7iprhql iiAYhoFyuYwN+tSIHQCIt6sPn9/HeHPYDbUIUBmolmAzDWiaBkpNNPmDxFW/Q3C56pFOT6Gceyt3 Ru/2/rKQubAN8vRTbN/ZgoJigIMSppNUoRecc4iiCIBjIh5Ho5hJnOm/cxgA7OvfDN1YANDKJtcm eCB0iJga4awKxhgAwOFwID7+EAHH0sDpi7HrlimYmv0liA6IIkAUTikFIQScc+iaav5+XBNQdTiP MLGZc9EL2AhRVRWSJMHlcsHp9tObg+HjloDKm3D7j1JxD23oEMAMtrYyo8hzI0oymUSxWEQoFIKi 2nssASVZbmj0BeowPYyPr1KjnoN5T+TsA08l++Lyo7F7JmMMpYq437I8Xx4f6Foca/80E2vrqKVH z5+cP9cTUf9pY38CkcnuhkcPfW0AAAAASUVORK5CYII= " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/star-yellow-grey.png" - xlink:href="icons/star-yellow-grey.png" /> + height="16" + id="image10688" + x="522" + y="784.36218" /> <g - style="opacity:0.5;display:inline" - id="g4822" - transform="translate(-156.9822,555.56514)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-org-home-draft-0.5.png" + inkscape:export-ydpi="90.000000" inkscape:export-xdpi="90.000000" - inkscape:export-ydpi="90.000000"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-org-home-draft-0.5.png" + transform="translate(-156.9822,555.56514)" + id="g4822" + style="opacity:0.5;display:inline"> <rect - style="fill:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.63039398pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - id="rect4824" - width="15.999997" - height="15.999997" - x="405.52979" - y="8.8522816" + ry="3.7996395" rx="3.7996395" - ry="3.7996395" /> + y="8.8522816" + x="405.52979" + height="15.999997" + width="15.999997" + id="rect4824" + style="fill:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.63039398pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <g - transform="matrix(1.635216,0,0,1.635216,-260.6467,-12.57016)" - id="g4826"> + id="g4826" + transform="matrix(1.635216,0,0,1.635216,-260.6467,-12.57016)"> <path - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.74907231;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.37500004;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" + id="path4828" d="M 409.34583,20.876719 L 413.22395,17.041177" - id="path4828" /> + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.74907231;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.37500004;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> <g id="g4830"> <path - transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" - d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" - sodipodi:ry="26.82268" - sodipodi:rx="26.82268" - sodipodi:cy="332.62314" - sodipodi:cx="250.53525" - id="path4832" + sodipodi:type="arc" style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - sodipodi:type="arc" /> - <path - transform="matrix(5.245387e-2,0,0,5.245387e-2,400.1808,-0.554549)" - d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" - sodipodi:ry="26.82268" - sodipodi:rx="26.82268" - sodipodi:cy="332.62314" + id="path4832" sodipodi:cx="250.53525" - id="path4834" + sodipodi:cy="332.62314" + sodipodi:rx="26.82268" + sodipodi:ry="26.82268" + d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" + transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" /> + <path + sodipodi:type="arc" style="fill:#dd8a3d;fill-opacity:1;fill-rule:evenodd;stroke:#dd8a3d;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" - sodipodi:type="arc" /> + id="path4834" + sodipodi:cx="250.53525" + sodipodi:cy="332.62314" + sodipodi:rx="26.82268" + sodipodi:ry="26.82268" + d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" + transform="matrix(5.245387e-2,0,0,5.245387e-2,400.1808,-0.554549)" /> </g> </g> </g> <g - id="g3316" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/kune-search-ico-push.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/kune-search-ico-push.png" + id="g3316"> <rect - style="opacity:1;fill:#eec59e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.63039398pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - id="rect3279" - width="15.999997" - height="15.999997" - x="311" - y="564.36218" + ry="3.7996395" rx="3.7996395" - ry="3.7996395" /> + y="564.36218" + x="311" + height="15.999997" + width="15.999997" + id="rect3279" + style="opacity:1;fill:#eec59e;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:12.63039398pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path - transform="matrix(0.1668983,0,0,0.1668983,278.88098,515.04891)" - d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" - sodipodi:ry="26.82268" - sodipodi:rx="26.82268" - sodipodi:cy="332.62314" - sodipodi:cx="250.53525" - id="path3287" + sodipodi:type="arc" style="opacity:1;fill:#a02c2c;fill-opacity:1;fill-rule:evenodd;stroke:#a02c2c;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - sodipodi:type="arc" /> + id="path3287" + sodipodi:cx="250.53525" + sodipodi:cy="332.62314" + sodipodi:rx="26.82268" + sodipodi:ry="26.82268" + d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" + transform="matrix(0.1668983,0,0,0.1668983,278.88098,515.04891)" /> <path - id="path3283" + style="opacity:1;color:#000000;fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:#a02c2c;stroke-width:2.860111;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.37500004;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" d="M 314.19237,577.07768 L 320.53393,570.80575" - style="opacity:1;color:#000000;fill:#800000;fill-opacity:1;fill-rule:nonzero;stroke:#a02c2c;stroke-width:2.860111;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.37500004;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + id="path3283" /> <path - transform="matrix(8.5773407e-2,0,0,8.5773407e-2,299.20557,542.03293)" - d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" - sodipodi:ry="26.82268" - sodipodi:rx="26.82268" - sodipodi:cy="332.62314" - sodipodi:cx="250.53525" - id="path3289" + sodipodi:type="arc" style="opacity:1;fill:#eec59e;fill-opacity:1;fill-rule:evenodd;stroke:#dd8a3d;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" - sodipodi:type="arc" /> + id="path3289" + sodipodi:cx="250.53525" + sodipodi:cy="332.62314" + sodipodi:rx="26.82268" + sodipodi:ry="26.82268" + d="M 277.35793 332.62314 A 26.82268 26.82268 0 1 1 223.71257,332.62314 A 26.82268 26.82268 0 1 1 277.35793 332.62314 z" + transform="matrix(8.5773407e-2,0,0,8.5773407e-2,299.20557,542.03293)" /> </g> <rect - y="444.71695" - x="134.19844" - height="12.989063" - width="0" + style="opacity:1;color:#000000;fill:#592704;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect17021" - style="opacity:1;color:#000000;fill:#592704;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - y="444.71695" - x="134.19844" - height="12.989063" width="0" - id="rect17023" - style="opacity:1;color:#000000;fill:#592704;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - y="444.71695" - x="134.19844" height="12.989063" + x="134.19844" + y="444.71695" /> + <rect + style="opacity:1;color:#000000;fill:#592704;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect17023" width="0" + height="12.989063" + x="134.19844" + y="444.71695" /> + <rect + style="opacity:1;color:#000000;fill:#592704;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect17025" - style="opacity:1;color:#000000;fill:#592704;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="0" + height="12.989063" + x="134.19844" + y="444.71695" /> <image - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-org-home-draft-def-0.1.png" - xlink:href="/usr/share/icons/Tango/16x16/actions/format-text-italic.png" - sodipodi:absref="/usr/share/icons/Tango/16x16/actions/format-text-italic.png" - width="16" - height="16" - id="image5902" - x="315.33337" + style="display:inline" y="239.36218" - style="display:inline" /> - <image - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-org-home-draft-def-0.1.png" - xlink:href="/usr/share/icons/Tango/16x16/actions/format-text-underline.png" - sodipodi:absref="/usr/share/icons/Tango/16x16/actions/format-text-underline.png" - width="16" + x="315.33337" + id="image5902" height="16" - id="image5906" - x="334.66663" + width="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QAAAAAAAD5Q7t/AAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEJFSIFhe7gnAAAAfhJREFUOMvNkk9Ik3EYx7+/5/fu HctiMjLTqFXTlrYtZjGIgg6FUhQkISEaEUVG1CGKDuvoIaQIGlTkISx26xAeaqM/NIkgrAbZwg6b gzIQEabi9N07f8/bwZIKdUKXnvPzfPjwfb7AP45Y7mLD6QdeSfIzsyUBQBKZ/d1tdm05x4GzD106 tIErx3fJ7Z7VGB03cP5GXAcAKnVccyGiO1ikThz02yqcDly6neCJ6SIsZgBASQOX4ezdu8NdGaqv Fpcjzzg3OUPfxmbArFDSIHjyftizztV4bP82utbzhicmjSgrRmYkD1a8NMDffq+pvMzeea4lRD1P P1npr6PfhW6eYlaYmlZLG/ha73h1SU8utu2hV8lh9L39ogqsGj50d8xaSiFvKFhqEUCg+a5LAANn WnbLzEgej2L9bLIKDUY7xgCAmTFlKPBCIdYciOhs51TzvqDN0ux4/jplmQWTACS9R2/NFYck5w1F /NPgD4C+Er3B+g2VVdVrRDI9Drd7vfBt3YxVDhucKzSUl9kgSVA0MTyfwTyg9sjNcFWFszHo30KP X3y0htLZBVsqbTp7fDvp1xc0ANh4uKuJSHTW1tVR4n0WQ5lsURTNtelYOPc3YNOhLmsui98MpBDX C4ZB8dhLCEEKajaQjV/NLfJhc/Bdny6ITPwX8wNOwM9Q5xcsRQAAAABJRU5ErkJggg== " + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-org-home-draft-def-0.1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <image + style="display:inline" y="239.36218" - style="display:inline" /> + x="334.66663" + id="image5906" + height="16" + width="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1gEEDyMK75EyNwAAAi5JREFUOMut0k9I02EYB/Dv+74/ 98fy56opYymUa61RQ1I6denfpRIMDLzoTcmDHYTA6NhFtB0qFEHsFOQxgyFUsA4aqbHTmC1xiX+a lPsna7r22/u8HbzoXF3sOX+fz/s8vA9DmWruemnjnG0SKQ0AOGdFIlUTGu/MlGa1cgBj6L5xqYF3 tfgAAOOBMH8/H+sG8ORAtszrXBN8x3//umk6/F0BQKOrhj1+MV0oSrKGxjtpb56XAiTlNZezWuhH TZgMLqjJ4IIC5zihWwRJebU0fwDQBJ7eueIRs5ENKCVXlJIrc5E4zrsdQhN49k/A1zFWb9KY1113 HK+DEZnPF/ry+ULfTCgm9WodhlH0+jrG6v8KcODR7cvn2JfVNOI/MiBJUyRpKpHMYjO1A6fDzqDw sCzgbR8xS5LdF9wO9vbToiKSo5GJHiMy0WNIkqPRpXVlr6llUhbvedtHzAe+kaRsazzrZKmcxPJ6 koyC0eu5+7wXAIqGgcxWVtoddcJisSL3K9sG4NU+QHA27DlTx5fi22i+6BMWs0ClWcMRs4BurUCV VROzX9NYP1Yrctns8D7A1er3mSq4TsKKdx8+y2QiKcodWGWVTZ5s8AoFpbta/b7Ymwfh3VNlGHI4 nWJxNYXkZgJEZF4O9Bf2Np9uGTTlttLbxu88bHaHSG6sDQG4yXf3p6ZoJIq5mY9QRAOlzQCwHOgv QKnBWHgeP9e+QRE14X8UO3VrQB0G4Ied4A+X1/MuJnM+zQAAAABJRU5ErkJggg== " + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-org-home-draft-def-0.1.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <text - xml:space="preserve" - style="font-size:15.52210426px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans" - x="-263.55829" - y="287.6709" - id="text18232" - transform="matrix(0,-0.9431834,1.0602392,0,0,0)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/remove-format.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"><tspan - sodipodi:role="line" - id="tspan18234" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/remove-format.png" + transform="matrix(0,-0.9431834,1.0602392,0,0,0)" + id="text18232" + y="287.6709" + x="-263.55829" + style="font-size:15.52210426px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;color:#000000;fill:#ff0000;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans" + xml:space="preserve"><tspan + y="287.6709" x="-263.55829" - y="287.6709">x</tspan></text> + id="tspan18234" + sodipodi:role="line">x</tspan></text> <g - id="g3620" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/edit-html.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <image - xlink:href="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/src/main/java/org/ourproject/kune/client/ui/ed/alignleft.png" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/src/main/java/org/ourproject/kune/client/ui/ed/alignleft.png" - width="16" - height="16" - id="image2407" - x="366" - y="238.36218" /> - <rect - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect2475" - width="12.178165" - height="12.012594" - x="367.99466" - y="240.46782" /> - <rect - y="240.46782" - x="367.99466" - height="11.822246" - width="11.985193" - id="rect2449" - style="color:#000000;fill:url(#linearGradient3616);fill-opacity:1;fill-rule:evenodd;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <text - transform="scale(0.8661139,1.1545825)" - id="text2410" - y="214.21973" - x="423.95221" - style="font-size:8.54466915px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Courier New" - xml:space="preserve"><tspan - style="fill:#1a1a1a;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" - y="214.21973" - x="423.95221" - id="tspan2412" - sodipodi:role="line"><p></tspan></text> - <text - transform="scale(0.7845744,1.2745764)" - id="text3576" - y="195.64319" - x="472.39288" - style="font-size:8.00332165px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#000000;fill:#1a1a1a;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Courier New" - xml:space="preserve"><tspan - style="fill:#1a1a1a;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" - y="195.64319" - x="472.39288" - id="tspan3578" - sodipodi:role="line">l</tspan></text> - </g> - <g id="g3483"> <g id="g3389"> <rect - style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect2416" - width="2" - height="2" - x="412" - y="327.36218" /> - <rect - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect2418" - width="1" - height="1" - x="413" - y="328.36218" /> - </g> - <g - transform="translate(0,5)" - id="g3393"> - <rect y="327.36218" x="412" height="2" width="2" - id="rect3395" + id="rect2416" style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect y="328.36218" x="413" height="1" width="1" - id="rect3397" + id="rect2418" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g - transform="translate(0,10)" - id="g3399"> + id="g3393" + transform="translate(0,5)"> <rect - y="327.36218" - x="412" - height="2" + style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3395" width="2" - id="rect3401" - style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + height="2" + x="412" + y="327.36218" /> <rect - y="328.36218" - x="413" - height="1" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3397" width="1" - id="rect3403" - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + height="1" + x="413" + y="328.36218" /> </g> <g - id="g3405" - transform="translate(0,15)"> + id="g3399" + transform="translate(0,10)"> <rect style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3407" + id="rect3401" width="2" height="2" x="412" y="327.36218" /> <rect style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3409" + id="rect3403" width="1" height="1" x="413" y="328.36218" /> </g> <g - transform="translate(0,20)" - id="g3411"> + transform="translate(0,15)" + id="g3405"> <rect y="327.36218" x="412" height="2" width="2" - id="rect3413" + id="rect3407" style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect y="328.36218" x="413" height="1" width="1" - id="rect3415" + id="rect3409" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g - id="g3417" - transform="translate(0,25)"> + id="g3411" + transform="translate(0,20)"> <rect style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3419" + id="rect3413" width="2" height="2" x="412" y="327.36218" /> <rect style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3421" + id="rect3415" width="1" height="1" x="413" y="328.36218" /> </g> <g - id="g3423" - transform="translate(0,30)"> + transform="translate(0,25)" + id="g3417"> <rect - style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3425" - width="2" - height="2" + y="327.36218" x="412" - y="327.36218" /> + height="2" + width="2" + id="rect3419" + style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3427" - width="1" - height="1" + y="328.36218" x="413" - y="328.36218" /> + height="1" + width="1" + id="rect3421" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g - transform="translate(0,35)" - id="g3429"> + transform="translate(0,30)" + id="g3423"> <rect y="327.36218" x="412" height="2" width="2" - id="rect3431" + id="rect3425" style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect y="328.36218" x="413" height="1" width="1" - id="rect3433" + id="rect3427" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g - id="g3435" - transform="translate(0,40)"> + id="g3429" + transform="translate(0,35)"> <rect style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3437" + id="rect3431" width="2" height="2" x="412" y="327.36218" /> <rect style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3439" + id="rect3433" width="1" height="1" x="413" y="328.36218" /> </g> <g - transform="translate(0,45)" - id="g3441"> + transform="translate(0,40)" + id="g3435"> <rect y="327.36218" x="412" height="2" width="2" - id="rect3443" + id="rect3437" style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect y="328.36218" x="413" height="1" width="1" - id="rect3445" + id="rect3439" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g - transform="translate(0,50)" - id="g3447"> + id="g3441" + transform="translate(0,45)"> <rect - y="327.36218" - x="412" - height="2" + style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3443" width="2" - id="rect3449" - style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + height="2" + x="412" + y="327.36218" /> <rect - y="328.36218" - x="413" - height="1" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3445" width="1" - id="rect3451" - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + height="1" + x="413" + y="328.36218" /> </g> <g - id="g3453" - transform="translate(0,55)"> + id="g3447" + transform="translate(0,50)"> <rect style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3455" + id="rect3449" width="2" height="2" x="412" y="327.36218" /> <rect style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3457" + id="rect3451" width="1" height="1" x="413" y="328.36218" /> </g> <g - transform="translate(0,60)" - id="g3459"> + transform="translate(0,55)" + id="g3453"> <rect y="327.36218" x="412" height="2" width="2" - id="rect3461" + id="rect3455" style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect y="328.36218" x="413" height="1" width="1" - id="rect3463" + id="rect3457" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g - id="g3465" - transform="translate(0,65)"> + id="g3459" + transform="translate(0,60)"> <rect style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3467" + id="rect3461" width="2" height="2" x="412" y="327.36218" /> <rect style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3469" + id="rect3463" width="1" height="1" x="413" y="328.36218" /> </g> <g - id="g3471" - transform="translate(0,70)"> + transform="translate(0,65)" + id="g3465"> <rect - style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3473" - width="2" - height="2" + y="327.36218" x="412" - y="327.36218" /> + height="2" + width="2" + id="rect3467" + style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect - style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect3475" - width="1" - height="1" + y="328.36218" x="413" - y="328.36218" /> + height="1" + width="1" + id="rect3469" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g - transform="translate(0,75)" - id="g3477"> + transform="translate(0,70)" + id="g3471"> <rect y="327.36218" x="412" height="2" width="2" - id="rect3479" + id="rect3473" style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect y="328.36218" x="413" height="1" width="1" - id="rect3481" + id="rect3475" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> - </g> - <g - id="g6617" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/splitter-vert-bar.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> <g - id="g6583"> + id="g3477" + transform="translate(0,75)"> <rect - style="fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect6439" + style="fill:#c5c5c5;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="rect3479" width="2" height="2" - x="429" + x="412" y="327.36218" /> <rect style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" - id="rect6441" + id="rect3481" width="1" height="1" - x="430" + x="413" y="328.36218" /> </g> + </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/splitter-vert-bar.png" + id="g6617"> + <g + id="g6583"> + <rect + y="327.36218" + x="429" + height="2" + width="2" + id="rect6439" + style="fill:#999999;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + <rect + y="328.36218" + x="430" + height="1" + width="1" + id="rect6441" + style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> <use - height="1052.3622" - width="744.09448" - transform="translate(0,5)" - id="use6587" - xlink:href="#g6583" - y="0" - x="0" /> - <use x="0" y="0" xlink:href="#g6583" - id="use6589" - transform="translate(0,10)" + id="use6587" + transform="translate(0,5)" width="744.09448" height="1052.3622" /> <use height="1052.3622" width="744.09448" - transform="translate(0,15)" - id="use6591" + transform="translate(0,10)" + id="use6589" xlink:href="#g6583" y="0" x="0" /> @@ -2989,15 +2939,15 @@ x="0" y="0" xlink:href="#g6583" - id="use6593" - transform="translate(0,20)" + id="use6591" + transform="translate(0,15)" width="744.09448" height="1052.3622" /> <use height="1052.3622" width="744.09448" - transform="translate(0,25)" - id="use6595" + transform="translate(0,20)" + id="use6593" xlink:href="#g6583" y="0" x="0" /> @@ -3005,23 +2955,23 @@ x="0" y="0" xlink:href="#g6583" - id="use6597" - transform="translate(0,30)" + id="use6595" + transform="translate(0,25)" width="744.09448" height="1052.3622" /> <use - x="0" - y="0" - xlink:href="#g6583" - id="use6599" - transform="translate(0,35)" + height="1052.3622" width="744.09448" - height="1052.3622" /> + transform="translate(0,30)" + id="use6597" + xlink:href="#g6583" + y="0" + x="0" /> <use height="1052.3622" width="744.09448" - transform="translate(0,40)" - id="use6601" + transform="translate(0,35)" + id="use6599" xlink:href="#g6583" y="0" x="0" /> @@ -3029,15 +2979,15 @@ x="0" y="0" xlink:href="#g6583" - id="use6603" - transform="translate(0,45)" + id="use6601" + transform="translate(0,40)" width="744.09448" height="1052.3622" /> <use height="1052.3622" width="744.09448" - transform="translate(0,50)" - id="use6605" + transform="translate(0,45)" + id="use6603" xlink:href="#g6583" y="0" x="0" /> @@ -3045,15 +2995,15 @@ x="0" y="0" xlink:href="#g6583" - id="use6607" - transform="translate(0,55)" + id="use6605" + transform="translate(0,50)" width="744.09448" height="1052.3622" /> <use height="1052.3622" width="744.09448" - transform="translate(0,60)" - id="use6609" + transform="translate(0,55)" + id="use6607" xlink:href="#g6583" y="0" x="0" /> @@ -3061,15 +3011,15 @@ x="0" y="0" xlink:href="#g6583" - id="use6611" - transform="translate(0,65)" + id="use6609" + transform="translate(0,60)" width="744.09448" height="1052.3622" /> <use height="1052.3622" width="744.09448" - transform="translate(0,70)" - id="use6613" + transform="translate(0,65)" + id="use6611" xlink:href="#g6583" y="0" x="0" /> @@ -3077,398 +3027,385 @@ x="0" y="0" xlink:href="#g6583" - id="use6615" - transform="translate(0,75)" + id="use6613" + transform="translate(0,70)" width="744.09448" height="1052.3622" /> + <use + height="1052.3622" + width="744.09448" + transform="translate(0,75)" + id="use6615" + xlink:href="#g6583" + y="0" + x="0" /> </g> <g - id="g14270" - transform="translate(487,-9)"> + transform="translate(487,-9)" + id="g14270"> <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" + transform="matrix(0.6,0,0,0.6249999,-25.304096,101.58627)" + d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path12582" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path12582" + style="opacity:1;color:#000000;fill:#f46f36;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path12584" sodipodi:cx="-55.5" sodipodi:cy="242.36218" sodipodi:rx="12.5" sodipodi:ry="12" d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" - transform="matrix(0.6,0,0,0.6249999,-25.304096,101.58627)" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(0.28,0,0,0.2916666,-44.46,180.67323)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + <g + id="g18381"> + <path + transform="matrix(0.6,0,0,0.6249999,492.30736,91.885844)" d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" sodipodi:ry="12" sodipodi:rx="12.5" sodipodi:cy="242.36218" sodipodi:cx="-55.5" - id="path12584" - style="opacity:1;color:#000000;fill:#f46f36;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - </g> - <g - id="g18381"> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" + id="path17249" + style="color:#000000;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="color:#000000;fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 459.00736,235.875 C 457.08757,235.875 455.15858,236.59879 453.69486,238.0625 C 450.78889,240.96847 450.76899,245.66144 453.63236,248.59375 C 453.22489,246.80976 453.74378,244.85733 455.13236,243.46875 C 457.27946,241.32165 460.73526,241.32165 462.88236,243.46875 C 464.27093,244.85733 464.78983,246.80976 464.38236,248.59375 C 467.24574,245.66143 467.22585,240.96847 464.31986,238.0625 C 462.85615,236.59879 460.92715,235.875 459.00736,235.875 z " + id="path17234" /> + <path sodipodi:type="arc" - style="color:#000000;fill:#eeaaff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path17249" + style="color:#000000;fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path17236" sodipodi:cx="-55.5" sodipodi:cy="242.36218" sodipodi:rx="12.5" sodipodi:ry="12" d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" - transform="matrix(0.6,0,0,0.6249999,492.30736,91.885844)" /> - <path - id="path17234" - d="M 459.00736,235.875 C 457.08757,235.875 455.15858,236.59879 453.69486,238.0625 C 450.78889,240.96847 450.76899,245.66144 453.63236,248.59375 C 453.22489,246.80976 453.74378,244.85733 455.13236,243.46875 C 457.27946,241.32165 460.73526,241.32165 462.88236,243.46875 C 464.27093,244.85733 464.78983,246.80976 464.38236,248.59375 C 467.24574,245.66143 467.22585,240.96847 464.31986,238.0625 C 462.85615,236.59879 460.92715,235.875 459.00736,235.875 z " - style="color:#000000;fill:#dbdee3;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" transform="matrix(0.1979899,0.1979899,-0.2062394,0.2062394,519.98096,202.36546)" - d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" - sodipodi:ry="12" - sodipodi:rx="12.5" - sodipodi:cy="242.36218" - sodipodi:cx="-55.5" - id="path17236" - style="color:#000000;fill:#ffe680;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> </g> <image - y="238.36218" - x="480" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA9hAAAPYQGoP6dpAAAA 8UlEQVQ4jaWSvwqCUBjFTxYEBe41NTSbodFUU/goSnuLTk0N9QS6Ngbt7S1RQ1Ob6RD0BkogfA16 LcXsUj+4073fn3POrRAR4Q+E0lvfig9XA9+CY6hwDDVTdN3sSxtUmATHUHE+RgAAeVCDbp+KNwKA zoJTQo7CbYjhmWTrCtm6QuSZxAtYobsccRe9U22H4RwAtrsQctOFKGnfpazGCLwLREmDMOk2cD5G kAc1PO4HLi/qreHrLRHRbT37WUIaI4DCmL6StkrMnPZ7H1NIU3oj8w+YF59gfhVvkGyRTueMNzsu pz2eFkAvsSBrYh4OU5/Dym1USbwrzAAAAABJRU5ErkJggg== " + width="16" + height="16" id="image17393" + x="480" + y="238.36218" /> + <image + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nobody.png" + y="244.08676" + x="525.88586" + id="image18392" height="16" width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/group-def-icon2.png" - xlink:href="icons/group-def-icon2.png" /> + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QQaBywH5hnejwAAADV0RVh0Q29tbWVudAAoYykgMjAw NCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJTVCQ2YtvAAAC7ElEQVQ4y62TXWhb ZRyHn/ec95xjkzRpm+ajjW3W0KIsuHWyyMSrKagwFG+UKd1FZTgQb4ShoLdSEMX7XYgVR0HE6Y1M hjezMLWzlo12K67rXD+znCwfTXKSc5Kc1wvZxO3W5/r/ey7+/H6CBzj+3uwp4C1dyv0KLOX7DaVY 0HTt7NzM1BcP3ov7wfe/nDR17ceJsWTiyIE0Y6koAcuiXG+ytmmzuLLJjY3CZSHEybmZqav/Ebz2 7ue5YLjnt1eOHhQHJ+KU603snQ1kKA49/eDYpBJRFla2OT+/chchnr0nkQDRaOin55/JiicyA5SK eQZHs0QGh3BabfKb60jfQ+s2eS6Xoeur6IVL188ATwNob3741UfJeH/4aG4cQ/PpyBBoAkNKTEMS sCSJaC9D8RixviC57KOkhweOvPHB2WkALRwJnDycHaVSLnLHDRAf3odS4CtAaAjfY7fU4PuLy1yY XyRiKfaPDwO8CiBrTjuWTvazcKNAZiKOr/79bL1S4qnJLEIIlFJs796h1WwyFIsAHAbQWl5HsywT LRSnUm9h1zwct0vN8fDqNkL8oxNCkIhFubp6E8uQAAMAUtc1v9poacHWDiFpUWgMUjRMOl2fVqnD ZLuN63r0hoI4jsO+VIxC0wMoAUhD0/K3torDh8aTZEaGuL25zfzaHh4mTS/Ip99ewRJd3n75ALVa jaVrN6E3DfA7gKa63XNLq1t4vgQgPZLi2KEYu4USd6sNqq7gdtnHtm2q1SqP9KdYXc8DfAOgL/18 7vx47qXTQtfNSNCgx9T5ZXGZ5byi1nDZa7jsOS65EZ3CnsdW2efa2s6vczNT79wvUqVQPHHxsv+d 78OTjyX44UqVsmfidbq4XgfLEGxUFH8V2lz6Y60shDj10BaOTX/8+mhmZDYc6TMfzyRJDoaxLAOn 1WbXrvDnrTxbO8XrQpfHH9rCPfoGxswXTpye1a3Ai+iyD4RQyu+oTntdCe2zrz+ZPsP/zd9wbDf3 MdodlQAAAABJRU5ErkJggg== " /> <image - xlink:href="/usr/share/icons/Tango/16x16/apps/browser.png" - sodipodi:absref="/usr/share/icons/Tango/16x16/apps/browser.png" - width="16" - height="16" - id="image18392" - x="525.88586" - y="244.08676" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nobody.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <image - y="243.15987" - x="533.07184" - id="image18398" - height="10.062655" - width="10.062655" - sodipodi:absref="/usr/share/icons/Tango/22x22/status/dialog-error.png" - xlink:href="/usr/share/icons/Tango/22x22/status/dialog-error.png" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nobody.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QsKCTQviWADaAAAAypJREFUOMvVlD9oG2cYxn+nu9M/ JyS2hIWlEpk0aWjBiEyph5ZCh9B6z2TSqUuGjoFACoUEMmRPSro6a4dCvCRbhkIhISROLIiKnYJk BVu2zq6kk3T3vh30nXJxVeqO/eDj+3f3vM/3vM/7wf+tWf90sAJZ4AqwBCwA08Ae8AJ4ANxZhu5/ Al6Bb4FbZyqVXPHcOY7l8ziuw7DXw2u+ZatWY+PVqxZwbRl+OhLwCtyYKRSun794kaznEb55g/a6 qCiqirguiVKJ7tQUzx8/xtvdvbkM3x/GsQ8znSkUbi9euoTz7BlSb6DDAaqKiiIqaBAguy1sz6O4 uMhuvf75ku83foanExkbTf/48vLlXHp9HTk4QEUgAlQzioIqqoKmM/TL8/z66GELOBXXPBELcuVM pZLLem10fx8VQVUQFUQVMUEwcxFFOh3SBx4fzM/nTKKZBLw0d/Yjwo1NJGIUjnRVNYAqiIxYj7ow qDeYLc5h3DNuTmy+cCyfQ577qAj516//1aubhQLa75OdOo6x5ETG047jjK95lBbdxrYTGJ9PBN4b +r6xlRwJWGSk98D3McUzUYoX+83mF9mkg/g+W+UyYoKoKMo7bcc5UEVtmz/bbUxF/p2xwGqjVsMq lkY/i4KKATAuUBMg2hfBzufZbm4hsBq3bwRsNeDuZrXa6mYykMmgGo701ncMERnnQEXRVIpuOk2z +bZVgx8NsBVVngUkHoF+DV53Z2dp7sIFZLtlqk7GlReVtapipZIkTn9I9eUarWFw7So8AdR0bMPa BpK/wPpnvp/qNBqfTn/yMW46TdjposHQ6K2oY+PMzuLPzFBdW2Oz17v7HdwzgBKBR4xtIAlkHsBa ud/v9jY2FsRxUslSkVS5jFssIfkcPcelvrNDtVY7+C0I7v0A94EAGJoxiN6KiHGa0XtRAE6dhNlv 4Kt5qJyAogvZAfTa0PwdXt6HVQ/qwDbQAtpABxgAoRUDdw34CaAInDTrpDlzzXcho8fGM97dA/bN 3sAwFiuWyYTpKWAKyBifO2Y/slJoAIZAH/BjMoSRztah5zMewI6t36vkQz2IJS465y8YtvDGyaeW /wAAAABJRU5ErkJggg== " + width="10.062655" + height="10.062655" + id="image18398" + x="533.07184" + y="243.15987" /> <rect - y="314.43216" - x="742.42401" - height="130" - width="130" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.96201754;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect12715" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.96201754;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="130" + height="130" + x="742.42401" + y="314.43216" /> <image - xlink:href="/usr/share/icons/Tango/16x16/apps/browser.png" - sodipodi:absref="/usr/share/icons/Tango/16x16/apps/browser.png" - width="11" - height="9.5411644" - id="image16010" - x="467.44022" - y="269.82104" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nobody.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nobody.png" + y="269.82104" + x="467.44022" + id="image16010" + height="9.5411644" + width="11" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QQaBywH5hnejwAAADV0RVh0Q29tbWVudAAoYykgMjAw NCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJTVCQ2YtvAAAC7ElEQVQ4y62TXWhb ZRyHn/ec95xjkzRpm+ajjW3W0KIsuHWyyMSrKagwFG+UKd1FZTgQb4ShoLdSEMX7XYgVR0HE6Y1M hjezMLWzlo12K67rXD+znCwfTXKSc5Kc1wvZxO3W5/r/ey7+/H6CBzj+3uwp4C1dyv0KLOX7DaVY 0HTt7NzM1BcP3ov7wfe/nDR17ceJsWTiyIE0Y6koAcuiXG+ytmmzuLLJjY3CZSHEybmZqav/Ebz2 7ue5YLjnt1eOHhQHJ+KU603snQ1kKA49/eDYpBJRFla2OT+/chchnr0nkQDRaOin55/JiicyA5SK eQZHs0QGh3BabfKb60jfQ+s2eS6Xoeur6IVL188ATwNob3741UfJeH/4aG4cQ/PpyBBoAkNKTEMS sCSJaC9D8RixviC57KOkhweOvPHB2WkALRwJnDycHaVSLnLHDRAf3odS4CtAaAjfY7fU4PuLy1yY XyRiKfaPDwO8CiBrTjuWTvazcKNAZiKOr/79bL1S4qnJLEIIlFJs796h1WwyFIsAHAbQWl5HsywT LRSnUm9h1zwct0vN8fDqNkL8oxNCkIhFubp6E8uQAAMAUtc1v9poacHWDiFpUWgMUjRMOl2fVqnD ZLuN63r0hoI4jsO+VIxC0wMoAUhD0/K3torDh8aTZEaGuL25zfzaHh4mTS/Ip99ewRJd3n75ALVa jaVrN6E3DfA7gKa63XNLq1t4vgQgPZLi2KEYu4USd6sNqq7gdtnHtm2q1SqP9KdYXc8DfAOgL/18 7vx47qXTQtfNSNCgx9T5ZXGZ5byi1nDZa7jsOS65EZ3CnsdW2efa2s6vczNT79wvUqVQPHHxsv+d 78OTjyX44UqVsmfidbq4XgfLEGxUFH8V2lz6Y60shDj10BaOTX/8+mhmZDYc6TMfzyRJDoaxLAOn 1WbXrvDnrTxbO8XrQpfHH9rCPfoGxswXTpye1a3Ai+iyD4RQyu+oTntdCe2zrz+ZPsP/zd9wbDf3 MdodlQAAAABJRU5ErkJggg== " /> <rect - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect16122" - width="10.366666" - height="6.9999518" + y="273.36224" x="467.1333" - y="273.36224" /> + height="6.9999518" + width="10.366666" + id="rect16122" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - id="path14699" + style="color:#000000;fill:#6f6f91;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f91;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="M 466.99531,273.21821 L 471.68281,277.30042 L 472.49531,283.27256 L 473.30781,277.30042 L 477.99531,273.21821 L 466.99531,273.21821 z " - style="color:#000000;fill:#6f6f91;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f91;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="path14699" /> <path - sodipodi:nodetypes="ccccccccccc" - id="path14769" + style="color:#000000;fill:url(#linearGradient16151);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="M 466.87829,272.67412 L 466.49531,273.36616 L 471.1868,277.41583 L 471.98467,283.25966 L 471.98467,283.36218 L 473.00595,283.36218 L 473.00595,283.25966 L 473.80382,277.41583 L 478.49531,273.36616 L 478.11233,272.67412 L 466.87829,272.67412 z " - style="color:#000000;fill:url(#linearGradient16151);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="path14769" + sodipodi:nodetypes="ccccccccccc" /> <path - style="color:#000000;fill:#aa4400;fill-opacity:0;fill-rule:nonzero;stroke:#6f6f91;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path12750" d="M 467.04079,273.17413 L 477.94987,273.17413" - id="path12750" /> + style="color:#000000;fill:#aa4400;fill-opacity:0;fill-rule:nonzero;stroke:#6f6f91;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <g - transform="translate(487,-9)" - id="g16004"> + id="g16004" + transform="translate(487,-9)"> <path - transform="matrix(0.6,0,0,0.6249999,-25.304096,101.58627)" - d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" - sodipodi:ry="12" - sodipodi:rx="12.5" - sodipodi:cy="242.36218" - sodipodi:cx="-55.5" - id="path16006" - style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#f46f36;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path16008" + style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#954f2c;stroke-width:1.63299322;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path16006" sodipodi:cx="-55.5" sodipodi:cy="242.36218" sodipodi:rx="12.5" sodipodi:ry="12" d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" - transform="matrix(0.28,0,0,0.2916666,-44.46,180.67323)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(0.6,0,0,0.6249999,-25.304096,101.58627)" /> + <path + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/group-def-icon.png" + transform="matrix(0.28,0,0,0.2916666,-44.46,180.67323)" + d="M -43 242.36218 A 12.5 12 0 1 1 -68,242.36218 A 12.5 12 0 1 1 -43 242.36218 z" + sodipodi:ry="12" + sodipodi:rx="12.5" + sodipodi:cy="242.36218" + sodipodi:cx="-55.5" + id="path16008" + style="opacity:1;color:#000000;fill:#f46f36;fill-opacity:1;fill-rule:nonzero;stroke:#784421;stroke-width:3.49927115;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> </g> <image - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nobody.png" - y="266.4982" - x="428.7713" - id="image16029" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH1QQaBywH5hnejwAAADV0RVh0Q29tbWVudAAoYykgMjAw NCBKYWt1YiBTdGVpbmVyCgpDcmVhdGVkIHdpdGggVGhlIEdJTVCQ2YtvAAAC7ElEQVQ4y62TXWhb ZRyHn/ec95xjkzRpm+ajjW3W0KIsuHWyyMSrKagwFG+UKd1FZTgQb4ShoLdSEMX7XYgVR0HE6Y1M hjezMLWzlo12K67rXD+znCwfTXKSc5Kc1wvZxO3W5/r/ey7+/H6CBzj+3uwp4C1dyv0KLOX7DaVY 0HTt7NzM1BcP3ov7wfe/nDR17ceJsWTiyIE0Y6koAcuiXG+ytmmzuLLJjY3CZSHEybmZqav/Ebz2 7ue5YLjnt1eOHhQHJ+KU603snQ1kKA49/eDYpBJRFla2OT+/chchnr0nkQDRaOin55/JiicyA5SK eQZHs0QGh3BabfKb60jfQ+s2eS6Xoeur6IVL188ATwNob3741UfJeH/4aG4cQ/PpyBBoAkNKTEMS sCSJaC9D8RixviC57KOkhweOvPHB2WkALRwJnDycHaVSLnLHDRAf3odS4CtAaAjfY7fU4PuLy1yY XyRiKfaPDwO8CiBrTjuWTvazcKNAZiKOr/79bL1S4qnJLEIIlFJs796h1WwyFIsAHAbQWl5HsywT LRSnUm9h1zwct0vN8fDqNkL8oxNCkIhFubp6E8uQAAMAUtc1v9poacHWDiFpUWgMUjRMOl2fVqnD ZLuN63r0hoI4jsO+VIxC0wMoAUhD0/K3torDh8aTZEaGuL25zfzaHh4mTS/Ip99ewRJd3n75ALVa jaVrN6E3DfA7gKa63XNLq1t4vgQgPZLi2KEYu4USd6sNqq7gdtnHtm2q1SqP9KdYXc8DfAOgL/18 7vx47qXTQtfNSNCgx9T5ZXGZ5byi1nDZa7jsOS65EZ3CnsdW2efa2s6vczNT79wvUqVQPHHxsv+d 78OTjyX44UqVsmfidbq4XgfLEGxUFH8V2lz6Y60shDj10BaOTX/8+mhmZDYc6TMfzyRJDoaxLAOn 1WbXrvDnrTxbO8XrQpfHH9rCPfoGxswXTpye1a3Ai+iyD4RQyu+oTntdCe2zrz+ZPsP/zd9wbDf3 MdodlQAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/usr/share/icons/Tango/16x16/apps/browser.png" - xlink:href="/usr/share/icons/Tango/16x16/apps/browser.png" /> + height="16" + id="image16029" + x="428.7713" + y="266.4982" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nobody.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <g - id="g16203" - transform="translate(0.2286987,-0.1360168)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/filter.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/filter.png" + transform="translate(0.2286987,-0.1360168)" + id="g16203"> <rect - style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.96201754;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect16158" - width="16" - height="16" + y="298.4982" x="357.7713" - y="298.4982" /> + height="16" + width="16" + id="rect16158" + style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.96201754;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - style="color:#000000;fill:#6f6f91;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f91;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path16170" d="M 360.2713,301.04227 L 364.9588,306.10477 L 365.7713,313.51102 L 366.5838,306.10477 L 371.2713,301.04227 L 360.2713,301.04227 z " - id="path16170" /> + style="color:#000000;fill:#6f6f91;fill-opacity:1;fill-rule:nonzero;stroke:#6f6f91;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - style="color:#000000;fill:url(#linearGradient16209);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="M 360.15428,300.49819 L 359.7713,301.33992 L 364.46279,306.26558 L 365.26066,313.37349 L 365.26066,313.49819 L 366.28194,313.49819 L 366.28194,313.37349 L 367.07981,306.26558 L 371.7713,301.33992 L 371.38832,300.49819 L 360.15428,300.49819 z " + sodipodi:nodetypes="ccccccccccc" id="path16172" - sodipodi:nodetypes="ccccccccccc" /> + d="M 360.15428,300.49819 L 359.7713,301.33992 L 364.46279,306.26558 L 365.26066,313.37349 L 365.26066,313.49819 L 366.28194,313.49819 L 366.28194,313.37349 L 367.07981,306.26558 L 371.7713,301.33992 L 371.38832,300.49819 L 360.15428,300.49819 z " + style="color:#000000;fill:url(#linearGradient16209);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00000012;stroke-linecap:square;stroke-linejoin:miter;marker:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> <path - id="path16174" + style="color:#000000;fill:#aa4400;fill-opacity:0;fill-rule:nonzero;stroke:#6f6f91;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" d="M 360.31678,300.9982 L 371.22586,300.9982" - style="color:#000000;fill:#aa4400;fill-opacity:0;fill-rule:nonzero;stroke:#6f6f91;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:1;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + id="path16174" /> </g> <g - id="g7067" - transform="translate(-28,-25.000002)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step1.png" + inkscape:export-ydpi="89.910126" inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step1.png" + transform="translate(-28,-25.000002)" + id="g7067"> <path - transform="translate(835.07499,-335.32678)" - d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" - sodipodi:ry="11.5" - sodipodi:rx="11.5" - sodipodi:cy="554.68896" - sodipodi:cx="-226.5" - id="path3311" + sodipodi:type="arc" style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" - sodipodi:type="arc" /> + id="path3311" + sodipodi:cx="-226.5" + sodipodi:cy="554.68896" + sodipodi:rx="11.5" + sodipodi:ry="11.5" + d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" + transform="translate(835.07499,-335.32678)" /> <text - sodipodi:linespacing="100%" - id="text3313" - y="225.77936" - x="608.74896" + xml:space="preserve" style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" - xml:space="preserve"><tspan - style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed" - y="225.77936" - x="608.74896" + x="608.74896" + y="225.77936" + id="text3313" + sodipodi:linespacing="100%"><tspan + id="tspan3315" sodipodi:role="line" - id="tspan3315">1</tspan></text> + x="608.74896" + y="225.77936" + style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed">1</tspan></text> </g> <path - id="path2260" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:15.58434105;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" d="M 651.79255,27.362653 L 699.73458,51.788553" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:15.58434105;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + id="path2260" /> <path - id="path2262" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:15.58433628;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" d="M 651.81421,87.649453 L 676.27112,39.768853" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:15.58433628;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + id="path2262" /> <path - id="path2264" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:15.58433819;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" d="M 664.2661,63.352453 L 712.20783,87.778253" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:15.58433819;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + id="path2264" /> <path - id="path2266" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:15.58433628;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" d="M 687.75041,75.288153 L 712.20752,27.407153" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:15.58433628;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + id="path2266" /> <path - id="path2268" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:15.58433247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" d="M 691.58494,47.520753 L 699.84215,51.727653" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:15.58433247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + id="path2268" /> <g - id="g7072" - transform="translate(-28,-25.000002)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step2.png" + inkscape:export-ydpi="89.910126" inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step2.png" + transform="translate(-28,-25.000002)" + id="g7072"> <path - sodipodi:type="arc" - style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" - id="path7018" - sodipodi:cx="-226.5" - sodipodi:cy="554.68896" - sodipodi:rx="11.5" - sodipodi:ry="11.5" + transform="translate(865.07499,-335.32678)" d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" - transform="translate(865.07499,-335.32678)" /> + sodipodi:ry="11.5" + sodipodi:rx="11.5" + sodipodi:cy="554.68896" + sodipodi:cx="-226.5" + id="path7018" + style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" + sodipodi:type="arc" /> <text - xml:space="preserve" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" - x="638.72003" - y="225.47498" + sodipodi:linespacing="100%" id="text7020" - sodipodi:linespacing="100%"><tspan - id="tspan7022" - sodipodi:role="line" - x="638.72003" + y="225.47498" + x="638.72003" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" + xml:space="preserve"><tspan + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed" y="225.47498" - style="font-size:18px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed">2</tspan></text> - </g> - <g - id="g7077" - transform="translate(-28,-25.000002)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step3.png" - inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126"> - <path - sodipodi:type="arc" - style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" - id="path7026" - sodipodi:cx="-226.5" - sodipodi:cy="554.68896" - sodipodi:rx="11.5" - sodipodi:ry="11.5" - d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" - transform="translate(895.07499,-335.32678)" /> - <text - xml:space="preserve" - style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" - x="668.65021" - y="225.77936" - id="text7028" - sodipodi:linespacing="100%"><tspan - id="tspan7030" + x="638.72003" sodipodi:role="line" - x="668.65021" - y="225.77936" - style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed">3</tspan></text> + id="tspan7022">2</tspan></text> </g> <g - id="g7082" - transform="translate(-28,-25.000002)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step4.png" + inkscape:export-ydpi="89.910126" inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step3.png" + transform="translate(-28,-25.000002)" + id="g7077"> <path - transform="translate(925.07499,-335.32678)" + transform="translate(895.07499,-335.32678)" d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" sodipodi:ry="11.5" sodipodi:rx="11.5" sodipodi:cy="554.68896" sodipodi:cx="-226.5" - id="path7034" + id="path7026" style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" sodipodi:type="arc" /> <text sodipodi:linespacing="100%" - id="text7036" + id="text7028" y="225.77936" - x="698.58911" + x="668.65021" style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" xml:space="preserve"><tspan style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed" y="225.77936" - x="698.58911" + x="668.65021" sodipodi:role="line" - id="tspan7038">4</tspan></text> + id="tspan7030">3</tspan></text> </g> <g - id="g7087" - transform="translate(-28,-25.000002)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step5.png" + inkscape:export-ydpi="89.910126" inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step4.png" + transform="translate(-28,-25.000002)" + id="g7082"> <path sodipodi:type="arc" style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" - id="path7042" + id="path7034" sodipodi:cx="-226.5" sodipodi:cy="554.68896" sodipodi:rx="11.5" sodipodi:ry="11.5" d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" - transform="translate(953.07499,-335.32678)" /> + transform="translate(925.07499,-335.32678)" /> <text xml:space="preserve" style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" - x="726.63141" - y="225.65712" - id="text7044" + x="698.58911" + y="225.77936" + id="text7036" sodipodi:linespacing="100%"><tspan - id="tspan7046" + id="tspan7038" sodipodi:role="line" - x="726.63141" + x="698.58911" + y="225.77936" + style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed">4</tspan></text> + </g> + <g + inkscape:export-ydpi="89.910126" + inkscape:export-xdpi="89.910126" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step5.png" + transform="translate(-28,-25.000002)" + id="g7087"> + <path + transform="translate(953.07499,-335.32678)" + d="M -215 554.68896 A 11.5 11.5 0 1 1 -238,554.68896 A 11.5 11.5 0 1 1 -215 554.68896 z" + sodipodi:ry="11.5" + sodipodi:rx="11.5" + sodipodi:cy="554.68896" + sodipodi:cx="-226.5" + id="path7042" + style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" + sodipodi:type="arc" /> + <text + sodipodi:linespacing="100%" + id="text7044" + y="225.65712" + x="726.63141" + style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" + xml:space="preserve"><tspan + style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed" y="225.65712" - style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed">5</tspan></text> + x="726.63141" + sodipodi:role="line" + id="tspan7046">5</tspan></text> </g> <g - id="g8079" - transform="matrix(0.4565425,0,0,0.4565425,311.40113,199.37826)"> + transform="matrix(0.4565425,0,0,0.4565425,311.40113,199.37826)" + id="g8079"> <path - transform="matrix(1.0090586,0,0,0.5666999,-5.5815934,146.26264)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="2.6179939" - sodipodi:arg1="1.5707963" - sodipodi:r2="9.0138779" - sodipodi:r1="18.027756" - sodipodi:cy="340.36218" - sodipodi:cx="589" - sodipodi:sides="3" - id="path7092" - style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <path sodipodi:type="star" - style="opacity:1;color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path7094" + style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path7092" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3480,25 +3417,25 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(-1.0090586,0,0,-0.5666999,1186.9923,552.46172)" /> + transform="matrix(1.0090586,0,0,0.5666999,-5.5815934,146.26264)" /> <path - sodipodi:type="star" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8067" - sodipodi:sides="3" - sodipodi:cx="589" - sodipodi:cy="340.36218" - sodipodi:r1="18.027756" - sodipodi:r2="9.0138779" - sodipodi:arg1="1.5707963" - sodipodi:arg2="2.6179939" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" + transform="matrix(-1.0090586,0,0,-0.5666999,1186.9923,552.46172)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0,1.0090586,-0.5666999,0,793.77505,-246.75759)" /> + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6179939" + sodipodi:arg1="1.5707963" + sodipodi:r2="9.0138779" + sodipodi:r1="18.027756" + sodipodi:cy="340.36218" + sodipodi:cx="589" + sodipodi:sides="3" + id="path7094" + style="opacity:1;color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> <path - transform="matrix(0,1.0090586,0.5666999,0,387.80334,-243.21941)" + transform="matrix(0,1.0090586,-0.5666999,0,793.77505,-246.75759)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" @@ -3510,17 +3447,13 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8069" - style="opacity:1;color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8067" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> - </g> - <g - id="g8085" - transform="matrix(0.35301,0,0,0.35301,376.57009,234.8756)"> <path sodipodi:type="star" - style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8071" + style="opacity:1;color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8069" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3532,9 +3465,13 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(1.0090586,0,0,-0.5666999,34.910563,528.13723)" /> + transform="matrix(0,1.0090586,0.5666999,0,387.80334,-243.21941)" /> + </g> + <g + transform="matrix(0.35301,0,0,0.35301,376.57009,234.8756)" + id="g8085"> <path - transform="matrix(-1.0090586,0,0,0.5666999,1223.0894,167.26264)" + transform="matrix(1.0090586,0,0,-0.5666999,34.910563,528.13723)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" @@ -3546,29 +3483,29 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8073" - style="opacity:1;color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8071" + style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path - transform="matrix(0,-1.0090586,0.5666999,0,448.81872,941.94378)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="2.6179939" - sodipodi:arg1="1.5707963" - sodipodi:r2="9.0138779" - sodipodi:r1="18.027756" - sodipodi:cy="340.36218" - sodipodi:cx="589" + sodipodi:type="star" + style="opacity:1;color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8073" sodipodi:sides="3" - id="path8075" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> + sodipodi:cx="589" + sodipodi:cy="340.36218" + sodipodi:r1="18.027756" + sodipodi:r2="9.0138779" + sodipodi:arg1="1.5707963" + sodipodi:arg2="2.6179939" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + transform="matrix(-1.0090586,0,0,0.5666999,1223.0894,167.26264)" /> <path sodipodi:type="star" - style="opacity:1;color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8077" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8075" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3580,27 +3517,27 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0,1.0090586,-0.5666999,0,809.09954,-246.21941)" /> + transform="matrix(0,-1.0090586,0.5666999,0,448.81872,941.94378)" /> + <path + transform="matrix(0,1.0090586,-0.5666999,0,809.09954,-246.21941)" + d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6179939" + sodipodi:arg1="1.5707963" + sodipodi:r2="9.0138779" + sodipodi:r1="18.027756" + sodipodi:cy="340.36218" + sodipodi:cx="589" + sodipodi:sides="3" + id="path8077" + style="opacity:1;color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> <path - sodipodi:type="star" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8093" - sodipodi:sides="3" - sodipodi:cx="589" - sodipodi:cy="340.36218" - sodipodi:r1="18.027756" - sodipodi:r2="9.0138779" - sodipodi:arg1="1.5707963" - sodipodi:arg2="2.6179939" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" + transform="matrix(0.3562078,0,0,0.2000507,405.7549,286.64898)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0.3562078,0,0,0.2000507,405.7549,286.64898)" /> - <path - transform="matrix(0,-0.3562078,-0.2000507,0,687.75164,568.18374)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3611,13 +3548,13 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8097" - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8093" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" - style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8099" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8097" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3629,19 +3566,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0,0.3562078,0.2000507,0,544.27178,149.24752)" /> + transform="matrix(0,-0.3562078,-0.2000507,0,687.75164,568.18374)" /> <path - sodipodi:type="arc" - style="opacity:1;color:#000000;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8105" - sodipodi:cx="618.72345" - sodipodi:cy="359.40164" - sodipodi:rx="2.0394468" - sodipodi:ry="2.0394468" - d="M 620.7629 359.40164 A 2.0394468 2.0394468 0 1 1 616.684,359.40164 A 2.0394468 2.0394468 0 1 1 620.7629 359.40164 z" - transform="translate(-3.8695022,-25.000012)" /> - <path - transform="matrix(-0.3562078,0,0,-0.2000507,826.09217,430.90041)" + transform="matrix(0,0.3562078,0.2000507,0,544.27178,149.24752)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" @@ -3653,13 +3580,23 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8095" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8099" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path + transform="translate(-3.8695022,-25.000012)" + d="M 620.7629 359.40164 A 2.0394468 2.0394468 0 1 1 616.684,359.40164 A 2.0394468 2.0394468 0 1 1 620.7629 359.40164 z" + sodipodi:ry="2.0394468" + sodipodi:rx="2.0394468" + sodipodi:cy="359.40164" + sodipodi:cx="618.72345" + id="path8105" + style="opacity:1;color:#000000;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path sodipodi:type="star" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8107" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8095" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3671,9 +3608,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0,0.3562078,-0.2000507,0,701.36763,145.38003)" /> + transform="matrix(-0.3562078,0,0,-0.2000507,826.09217,430.90041)" /> <path - transform="matrix(0.3562078,0,0,-0.2000507,425.76897,426.91479)" + transform="matrix(0,0.3562078,-0.2000507,0,701.36763,145.38003)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" @@ -3685,13 +3622,13 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8109" - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8107" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" - style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8111" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8109" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3703,9 +3640,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(-0.3562078,0,0,0.2000507,839.88451,289.60873)" /> + transform="matrix(0.3562078,0,0,-0.2000507,425.76897,426.91479)" /> <path - transform="matrix(0,-0.3562078,0.2000507,0,564.1095,571.26162)" + transform="matrix(-0.3562078,0,0,0.2000507,839.88451,289.60873)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" @@ -3717,29 +3654,29 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8113" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8111" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path - transform="matrix(-0.3562078,0,0,-0.2000507,864.17298,424.65678)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="2.6179939" - sodipodi:arg1="1.5707963" - sodipodi:r2="9.0138779" - sodipodi:r1="18.027756" - sodipodi:cy="340.36218" - sodipodi:cx="589" + sodipodi:type="star" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8113" sodipodi:sides="3" - id="path8115" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> + sodipodi:cx="589" + sodipodi:cy="340.36218" + sodipodi:r1="18.027756" + sodipodi:r2="9.0138779" + sodipodi:arg1="1.5707963" + sodipodi:arg2="2.6179939" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + transform="matrix(0,-0.3562078,0.2000507,0,564.1095,571.26162)" /> <path sodipodi:type="star" - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8117" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8115" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3751,9 +3688,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0,0.3562078,0.2000507,0,588.57432,148.59614)" /> + transform="matrix(-0.3562078,0,0,-0.2000507,864.17298,424.65678)" /> <path - transform="matrix(0,-0.3562078,-0.2000507,0,721.0597,568.88548)" + transform="matrix(0,0.3562078,0.2000507,0,588.57432,148.59614)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" @@ -3765,13 +3702,13 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8119" - style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8117" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8121" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8119" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3783,29 +3720,29 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0.3562078,0,0,0.2000507,445.28469,292.94297)" /> + transform="matrix(0,-0.3562078,-0.2000507,0,721.0597,568.88548)" /> + <path + transform="matrix(0.3562078,0,0,0.2000507,445.28469,292.94297)" + d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6179939" + sodipodi:arg1="1.5707963" + sodipodi:r2="9.0138779" + sodipodi:r1="18.027756" + sodipodi:cy="340.36218" + sodipodi:cx="589" + sodipodi:sides="3" + id="path8121" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> <g - transform="matrix(0.4565425,0,0,0.4565425,311.40113,199.37826)" - id="g8123"> + id="g8123" + transform="matrix(0.4565425,0,0,0.4565425,311.40113,199.37826)"> <path - sodipodi:type="star" - style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8125" - sodipodi:sides="3" - sodipodi:cx="589" - sodipodi:cy="340.36218" - sodipodi:r1="18.027756" - sodipodi:r2="9.0138779" - sodipodi:arg1="1.5707963" - sodipodi:arg2="2.6179939" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" + transform="matrix(1.0090586,0,0,0.5666999,-5.5815934,146.26264)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(1.0090586,0,0,0.5666999,-5.5815934,146.26264)" /> - <path - transform="matrix(-1.0090586,0,0,-0.5666999,1186.9923,552.46172)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3816,29 +3753,29 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8127" - style="opacity:1;color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8125" + style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path - transform="matrix(0,1.0090586,-0.5666999,0,793.77505,-246.75759)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="2.6179939" - sodipodi:arg1="1.5707963" - sodipodi:r2="9.0138779" - sodipodi:r1="18.027756" - sodipodi:cy="340.36218" - sodipodi:cx="589" + sodipodi:type="star" + style="opacity:1;color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8127" sodipodi:sides="3" - id="path8129" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> + sodipodi:cx="589" + sodipodi:cy="340.36218" + sodipodi:r1="18.027756" + sodipodi:r2="9.0138779" + sodipodi:arg1="1.5707963" + sodipodi:arg2="2.6179939" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + transform="matrix(-1.0090586,0,0,-0.5666999,1186.9923,552.46172)" /> <path sodipodi:type="star" - style="opacity:1;color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8131" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8129" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3850,27 +3787,27 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0,1.0090586,0.5666999,0,387.80334,-243.21941)" /> + transform="matrix(0,1.0090586,-0.5666999,0,793.77505,-246.75759)" /> + <path + transform="matrix(0,1.0090586,0.5666999,0,387.80334,-243.21941)" + d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="2.6179939" + sodipodi:arg1="1.5707963" + sodipodi:r2="9.0138779" + sodipodi:r1="18.027756" + sodipodi:cy="340.36218" + sodipodi:cx="589" + sodipodi:sides="3" + id="path8131" + style="opacity:1;color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> <path - sodipodi:type="star" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8133" - sodipodi:sides="3" - sodipodi:cx="589" - sodipodi:cy="340.36218" - sodipodi:r1="18.027756" - sodipodi:r2="9.0138779" - sodipodi:arg1="1.5707963" - sodipodi:arg2="2.6179939" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" + transform="matrix(0.3562078,0,0,0.2000507,371.74208,311.19511)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0.3562078,0,0,0.2000507,371.74208,311.19511)" /> - <path - transform="matrix(0,-0.3562078,-0.2000507,0,653.73882,592.72987)" - d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -3881,13 +3818,13 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8135" - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8133" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" - style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8137" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8135" sodipodi:sides="3" sodipodi:cx="589" sodipodi:cy="340.36218" @@ -3899,9 +3836,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " - transform="matrix(0,0.3562078,0.2000507,0,510.25896,173.79365)" /> + transform="matrix(0,-0.3562078,-0.2000507,0,653.73882,592.72987)" /> <path - transform="matrix(-0.3562078,0,0,-0.2000507,792.07935,455.44654)" + transform="matrix(0,0.3562078,0.2000507,0,510.25896,173.79365)" d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " inkscape:randomized="0" inkscape:rounded="0" @@ -3913,32 +3850,32 @@ sodipodi:cy="340.36218" sodipodi:cx="589" sodipodi:sides="3" - id="path8139" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8137" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8139" + sodipodi:sides="3" + sodipodi:cx="589" + sodipodi:cy="340.36218" + sodipodi:r1="18.027756" + sodipodi:r2="9.0138779" + sodipodi:arg1="1.5707963" + sodipodi:arg2="2.6179939" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 589,358.38994 L 573.38751,331.34831 L 604.61249,331.3483 L 589,358.38994 z " + transform="matrix(-0.3562078,0,0,-0.2000507,792.07935,455.44654)" /> <g - id="g8149" - transform="translate(0.3979259,101.86903)"> + transform="translate(0.3979259,101.86903)" + id="g8149"> <path - transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.0471976" - sodipodi:arg1="0" - sodipodi:r2="2.4374068" - sodipodi:r1="4.8748136" - sodipodi:cy="360.58118" - sodipodi:cx="530.69507" - sodipodi:sides="3" - id="path8145" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <path sodipodi:type="star" - style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8147" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8145" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -3950,44 +3887,28 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" /> + transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> + <path + transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" + d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="2.4374068" + sodipodi:r1="4.8748136" + sodipodi:cy="360.58118" + sodipodi:cx="530.69507" + sodipodi:sides="3" + id="path8147" + style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> <path - transform="matrix(-1.0940589,0,0,1.8949657,1120.945,-294.43916)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.0471976" - sodipodi:arg1="0" - sodipodi:r2="2.4374068" - sodipodi:r1="4.8748136" - sodipodi:cy="360.58118" - sodipodi:cx="530.69507" - sodipodi:sides="3" - id="path8155" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <path sodipodi:type="star" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8157" - sodipodi:sides="3" - sodipodi:cx="530.69507" - sodipodi:cy="360.58118" - sodipodi:r1="4.8748136" - sodipodi:r2="2.4374068" - sodipodi:arg1="0" - sodipodi:arg2="1.0471976" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-294.43916)" /> - <path - sodipodi:type="star" style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8161" + id="path8155" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -3999,9 +3920,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-276.23817)" /> + transform="matrix(-1.0940589,0,0,1.8949657,1120.945,-294.43916)" /> <path - transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-276.23817)" + transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-294.43916)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" @@ -4013,7 +3934,7 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8163" + id="path8157" style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path @@ -4029,13 +3950,13 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8169" + id="path8161" style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8171" + id="path8163" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4049,8 +3970,24 @@ d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-276.23817)" /> <path - transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-255.88745)" + sodipodi:type="star" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8169" + sodipodi:sides="3" + sodipodi:cx="530.69507" + sodipodi:cy="360.58118" + sodipodi:r1="4.8748136" + sodipodi:r2="2.4374068" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-276.23817)" /> + <path + transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-276.23817)" + d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4061,29 +3998,13 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8181" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8171" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8183" - sodipodi:sides="3" - sodipodi:cx="530.69507" - sodipodi:cy="360.58118" - sodipodi:r1="4.8748136" - sodipodi:r2="2.4374068" - sodipodi:arg1="0" - sodipodi:arg2="1.0471976" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-255.88745)" /> - <path - sodipodi:type="star" style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8185" + id="path8181" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4109,11 +4030,11 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8187" + id="path8183" style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path - transform="matrix(0,1.0940589,-1.8949657,0,1226.289,-158.54349)" + transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-255.88745)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" @@ -4125,13 +4046,13 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8189" - style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8185" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8191" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8187" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4143,11 +4064,11 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(0,-1.0940589,-1.8949657,0,1226.289,1013.3465)" /> + transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-255.88745)" /> <path sodipodi:type="star" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8199" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8189" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4159,9 +4080,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-232.88745)" /> + transform="matrix(0,1.0940589,-1.8949657,0,1226.289,-158.54349)" /> <path - transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-232.88745)" + transform="matrix(0,-1.0940589,-1.8949657,0,1226.289,1013.3465)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" @@ -4173,8 +4094,8 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8201" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8191" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-232.88745)" @@ -4189,13 +4110,13 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8203" + id="path8199" style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8205" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8201" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4210,8 +4131,8 @@ transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-232.88745)" /> <path sodipodi:type="star" - style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8207" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8203" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4223,9 +4144,9 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(0,1.0940589,-1.8949657,0,1226.289,-135.54349)" /> + transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-232.88745)" /> <path - transform="matrix(0,-1.0940589,-1.8949657,0,1226.289,1036.3465)" + transform="matrix(-1.0940589,0,0,1.8949657,1128.945,-232.88745)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" @@ -4237,31 +4158,47 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8209" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8205" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> + <path + transform="matrix(0,1.0940589,-1.8949657,0,1226.289,-135.54349)" + d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="2.4374068" + sodipodi:r1="4.8748136" + sodipodi:cy="360.58118" + sodipodi:cx="530.69507" + sodipodi:sides="3" + id="path8207" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8209" + sodipodi:sides="3" + sodipodi:cx="530.69507" + sodipodi:cy="360.58118" + sodipodi:r1="4.8748136" + sodipodi:r2="2.4374068" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + transform="matrix(0,-1.0940589,-1.8949657,0,1226.289,1036.3465)" /> <g - id="g8211" - transform="translate(0.3979259,101.86903)"> + transform="translate(0.3979259,101.86903)" + id="g8211"> <path - sodipodi:type="star" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8213" - sodipodi:sides="3" - sodipodi:cx="530.69507" - sodipodi:cy="360.58118" - sodipodi:r1="4.8748136" - sodipodi:r2="2.4374068" - sodipodi:arg1="0" - sodipodi:arg2="1.0471976" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" + transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> - <path - transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4272,17 +4209,13 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8215" - style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8213" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> - </g> - <g - transform="translate(1.9896296,122.67525)" - id="g8225"> <path sodipodi:type="star" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8227" + style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8215" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4294,27 +4227,11 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> - <path - transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.0471976" - sodipodi:arg1="0" - sodipodi:r2="2.4374068" - sodipodi:r1="4.8748136" - sodipodi:cy="360.58118" - sodipodi:cx="530.69507" - sodipodi:sides="3" - id="path8229" - style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> + transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" /> </g> <g - transform="matrix(-1,0,0,1,1085.6021,164.8554)" - id="g8231"> + id="g8225" + transform="translate(1.9896296,122.67525)"> <path transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " @@ -4328,13 +4245,13 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8233" + id="path8227" style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> <path sodipodi:type="star" style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8235" + id="path8229" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4349,11 +4266,27 @@ transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" /> </g> <g - id="g8237" - transform="matrix(0,1,-1,0,913.76011,-28.768788)"> + id="g8231" + transform="matrix(-1,0,0,1,1085.6021,164.8554)"> <path - transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" + sodipodi:type="star" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8233" + sodipodi:sides="3" + sodipodi:cx="530.69507" + sodipodi:cy="360.58118" + sodipodi:r1="4.8748136" + sodipodi:r2="2.4374068" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> + <path + transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" + d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="true" @@ -4364,13 +4297,17 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8239" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8235" + style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> + </g> + <g + transform="matrix(0,1,-1,0,913.76011,-28.768788)" + id="g8237"> <path sodipodi:type="star" - style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8241" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8239" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4382,28 +4319,28 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" /> + transform="matrix(1.0940589,0,0,1.8949657,-42.944996,-312.92678)" /> + <path + transform="matrix(1.0940589,0,0,1.8949657,-34.944996,-312.92678)" + d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="2.4374068" + sodipodi:r1="4.8748136" + sodipodi:cy="360.58118" + sodipodi:cx="530.69507" + sodipodi:sides="3" + id="path8241" + style="opacity:1;color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> </g> <path - transform="matrix(0,1.0940589,-1.8949657,0,1254.1438,-111.10845)" - d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - inkscape:randomized="0" - inkscape:rounded="0" - inkscape:flatsided="true" - sodipodi:arg2="1.0471976" - sodipodi:arg1="0" - sodipodi:r2="2.4374068" - sodipodi:r1="4.8748136" - sodipodi:cy="360.58118" - sodipodi:cx="530.69507" - sodipodi:sides="3" - id="path8245" - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="star" /> - <path sodipodi:type="star" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8247" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8245" sodipodi:sides="3" sodipodi:cx="530.69507" sodipodi:cy="360.58118" @@ -4415,25 +4352,25 @@ inkscape:rounded="0" inkscape:randomized="0" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(0,1.0940589,-1.8949657,0,1254.1438,-103.10845)" /> + transform="matrix(0,1.0940589,-1.8949657,0,1254.1438,-111.10845)" /> <path - sodipodi:type="star" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path8251" - sodipodi:sides="3" - sodipodi:cx="530.69507" - sodipodi:cy="360.58118" - sodipodi:r1="4.8748136" - sodipodi:r2="2.4374068" - sodipodi:arg1="0" - sodipodi:arg2="1.0471976" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" + transform="matrix(0,1.0940589,-1.8949657,0,1254.1438,-103.10845)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " - transform="matrix(0,-1.0940589,1.8949657,0,-112.43412,1052.7815)" /> + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.0471976" + sodipodi:arg1="0" + sodipodi:r2="2.4374068" + sodipodi:r1="4.8748136" + sodipodi:cy="360.58118" + sodipodi:cx="530.69507" + sodipodi:sides="3" + id="path8247" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="star" /> <path - transform="matrix(0,-1.0940589,1.8949657,0,-112.43412,1060.7815)" + transform="matrix(0,-1.0940589,1.8949657,0,-112.43412,1052.7815)" d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " inkscape:randomized="0" inkscape:rounded="0" @@ -4445,124 +4382,138 @@ sodipodi:cy="360.58118" sodipodi:cx="530.69507" sodipodi:sides="3" - id="path8253" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8251" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" sodipodi:type="star" /> + <path + sodipodi:type="star" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.16018164;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:2.32036328, 2.32036328;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path8253" + sodipodi:sides="3" + sodipodi:cx="530.69507" + sodipodi:cy="360.58118" + sodipodi:r1="4.8748136" + sodipodi:r2="2.4374068" + sodipodi:arg1="0" + sodipodi:arg2="1.0471976" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="M 535.56988,360.58118 L 528.25766,364.80289 L 528.25766,356.35946 L 535.56988,360.58118 z " + transform="matrix(0,-1.0940589,1.8949657,0,-112.43412,1060.7815)" /> <g id="g25293"> <path - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:63.55226517;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + id="path7073" d="M 623.5965,290.84288 C 626.0307,292.68811 629.5389,292.20422 631.3838,289.7696 C 633.2288,287.33497 632.746,283.82696 630.3118,281.98173 C 627.8776,280.13641 624.3692,280.6186 622.5242,283.05322 L 624.5436,284.58489 C 625.5604,283.24305 627.4396,282.98351 628.7811,284.00049 C 630.1227,285.01746 630.3804,286.89719 629.3636,288.23893 C 628.3469,289.58076 626.4684,289.83931 625.1269,288.82233 C 624.8076,288.58029 624.6288,288.38725 624.4118,288.0504 L 622.2827,289.42404 C 622.6369,289.97363 623.0755,290.44782 623.5965,290.84288 z " - id="path7073" /> + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:63.55226517;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> <path - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.49518967;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - id="path7075" - d="M 627,278.3608 C 622.5888,278.3608 619,281.95023 619,286.3622 C 619,290.77427 622.5888,294.3608 627,294.3608 C 631.4112,294.3608 635,290.77427 635,286.3622 C 635,281.95023 631.4112,278.3608 627,278.3608 z M 627,279.22175 C 630.9442,279.22175 634.1364,282.41741 634.1364,286.3622 C 634.1364,290.30709 630.9442,293.49985 627,293.49985 C 623.0558,293.49985 619.8636,290.30709 619.8636,286.3622 C 619.8636,282.41741 623.0558,279.22175 627,279.22175 z " - inkscape:export-xdpi="90" + inkscape:export-ydpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/imagenesNuevas/copyleft-300.png" - inkscape:export-ydpi="90" /> + inkscape:export-xdpi="90" + d="M 627,278.3608 C 622.5888,278.3608 619,281.95023 619,286.3622 C 619,290.77427 622.5888,294.3608 627,294.3608 C 631.4112,294.3608 635,290.77427 635,286.3622 C 635,281.95023 631.4112,278.3608 627,278.3608 z M 627,279.22175 C 630.9442,279.22175 634.1364,282.41741 634.1364,286.3622 C 634.1364,290.30709 630.9442,293.49985 627,293.49985 C 623.0558,293.49985 619.8636,290.30709 619.8636,286.3622 C 619.8636,282.41741 623.0558,279.22175 627,279.22175 z " + id="path7075" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.49518967;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> </g> <g - id="g25311" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/copyleft.png" + inkscape:export-ydpi="89.910126" inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/copyleft.png" + id="g25311"> <path - id="path25287" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:63.55226517;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" d="M 652.79103,292.76391 C 655.22523,294.60914 658.73343,294.12525 660.57833,291.69063 C 662.42333,289.256 661.94053,285.74799 659.50633,283.90276 C 657.07213,282.05744 653.56373,282.53963 651.71873,284.97425 L 653.73813,286.50592 C 654.75493,285.16408 656.63413,284.90454 657.97563,285.92152 C 659.31723,286.93849 659.57493,288.81822 658.55813,290.15996 C 657.54143,291.50179 655.66293,291.76034 654.32143,290.74336 C 654.00213,290.50132 653.82333,290.30828 653.60633,289.97143 L 651.47723,291.34507 C 651.83143,291.89466 652.27003,292.36885 652.79103,292.76391 z " - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:63.55226517;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + id="path25287" /> <path - inkscape:export-ydpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/imagenesNuevas/copyleft-300.png" - inkscape:export-xdpi="90" - d="M 656.19453,280.28183 C 651.78333,280.28183 648.19453,283.87126 648.19453,288.28323 C 648.19453,292.6953 651.78333,296.28183 656.19453,296.28183 C 660.60573,296.28183 664.19453,292.6953 664.19453,288.28323 C 664.19453,283.87126 660.60573,280.28183 656.19453,280.28183 z M 656.19453,281.14278 C 660.13873,281.14278 663.33093,284.33844 663.33093,288.28323 C 663.33093,292.22812 660.13873,295.42088 656.19453,295.42088 C 652.25033,295.42088 649.05813,292.22812 649.05813,288.28323 C 649.05813,284.33844 652.25033,281.14278 656.19453,281.14278 z " + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.49518967;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" id="path25289" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.49518967;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="M 656.19453,280.28183 C 651.78333,280.28183 648.19453,283.87126 648.19453,288.28323 C 648.19453,292.6953 651.78333,296.28183 656.19453,296.28183 C 660.60573,296.28183 664.19453,292.6953 664.19453,288.28323 C 664.19453,283.87126 660.60573,280.28183 656.19453,280.28183 z M 656.19453,281.14278 C 660.13873,281.14278 663.33093,284.33844 663.33093,288.28323 C 663.33093,292.22812 660.13873,295.42088 656.19453,295.42088 C 652.25033,295.42088 649.05813,292.22812 649.05813,288.28323 C 649.05813,284.33844 652.25033,281.14278 656.19453,281.14278 z " + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/imagenesNuevas/copyleft-300.png" + inkscape:export-ydpi="90" /> </g> <g - id="g25325" - transform="translate(0.1768559,-2.4759825)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/no-copyleft.png" + inkscape:export-ydpi="89.910126" inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/no-copyleft.png" + transform="translate(0.1768559,-2.4759825)" + id="g25325"> <g - transform="translate(0.1526418,21.91209)" - id="g25315"> + id="g25315" + transform="translate(0.1526418,21.91209)"> <path - id="path25317" + style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:63.55226517;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" d="M 652.79103,292.76391 C 655.22523,294.60914 658.73343,294.12525 660.57833,291.69063 C 662.42333,289.256 661.94053,285.74799 659.50633,283.90276 C 657.07213,282.05744 653.56373,282.53963 651.71873,284.97425 L 653.73813,286.50592 C 654.75493,285.16408 656.63413,284.90454 657.97563,285.92152 C 659.31723,286.93849 659.57493,288.81822 658.55813,290.15996 C 657.54143,291.50179 655.66293,291.76034 654.32143,290.74336 C 654.00213,290.50132 653.82333,290.30828 653.60633,289.97143 L 651.47723,291.34507 C 651.83143,291.89466 652.27003,292.36885 652.79103,292.76391 z " - style="color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:63.55226517;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + id="path25317" /> <path - inkscape:export-ydpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/imagenesNuevas/copyleft-300.png" - inkscape:export-xdpi="90" - d="M 656.19453,280.28183 C 651.78333,280.28183 648.19453,283.87126 648.19453,288.28323 C 648.19453,292.6953 651.78333,296.28183 656.19453,296.28183 C 660.60573,296.28183 664.19453,292.6953 664.19453,288.28323 C 664.19453,283.87126 660.60573,280.28183 656.19453,280.28183 z M 656.19453,281.14278 C 660.13873,281.14278 663.33093,284.33844 663.33093,288.28323 C 663.33093,292.22812 660.13873,295.42088 656.19453,295.42088 C 652.25033,295.42088 649.05813,292.22812 649.05813,288.28323 C 649.05813,284.33844 652.25033,281.14278 656.19453,281.14278 z " + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.49518967;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" id="path25319" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.49518967;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="M 656.19453,280.28183 C 651.78333,280.28183 648.19453,283.87126 648.19453,288.28323 C 648.19453,292.6953 651.78333,296.28183 656.19453,296.28183 C 660.60573,296.28183 664.19453,292.6953 664.19453,288.28323 C 664.19453,283.87126 660.60573,280.28183 656.19453,280.28183 z M 656.19453,281.14278 C 660.13873,281.14278 663.33093,284.33844 663.33093,288.28323 C 663.33093,292.22812 660.13873,295.42088 656.19453,295.42088 C 652.25033,295.42088 649.05813,292.22812 649.05813,288.28323 C 649.05813,284.33844 652.25033,281.14278 656.19453,281.14278 z " + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/imagenesNuevas/copyleft-300.png" + inkscape:export-ydpi="90" /> </g> <path - d="M 664.34717,302.42865 C 662.85858,303.85497 661.52504,305.47517 660.13496,307.02278 C 657.89637,309.57849 655.70899,312.19035 653.53915,314.82211 C 652.61186,315.99594 651.62556,317.10023 650.62937,318.19392 L 648.34717,317.96771 C 649.38459,316.90278 650.41143,315.82623 651.34186,314.63078 C 653.53858,312.02625 655.71669,309.40155 657.93701,306.82337 C 659.29429,305.27989 660.60311,303.68279 662.00686,302.19392 L 664.34717,302.42865 z " + style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" id="path25265" - style="fill:#ff0000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + d="M 664.34717,302.42865 C 662.85858,303.85497 661.52504,305.47517 660.13496,307.02278 C 657.89637,309.57849 655.70899,312.19035 653.53915,314.82211 C 652.61186,315.99594 651.62556,317.10023 650.62937,318.19392 L 648.34717,317.96771 C 649.38459,316.90278 650.41143,315.82623 651.34186,314.63078 C 653.53858,312.02625 655.71669,309.40155 657.93701,306.82337 C 659.29429,305.27989 660.60311,303.68279 662.00686,302.19392 L 664.34717,302.42865 z " /> </g> <g - id="g2689" - transform="translate(-262.57536,171.54205)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nt.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/nt.png" + transform="translate(-262.57536,171.54205)" + id="g2689"> <rect - ry="2.323848" - y="309.08121" - x="899.96295" - height="8.1000004" - width="11.860715" + style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect2678" - style="opacity:1;color:#000000;fill:#cc6633;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + width="11.860715" + height="8.1000004" + x="899.96295" + y="309.08121" + ry="2.323848" /> <path - sodipodi:nodetypes="cccc" - id="path2680" + style="fill:#cc6633;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0" d="M 903.55433,311.5335 L 900.38545,320.61763 C 902.63888,318.99798 913.62805,313.14089 906.51195,315.1249 C 900.94078,315.4562 904.5402,312.73064 903.55433,311.5335 z " - style="fill:#cc6633;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0" /> + id="path2680" + sodipodi:nodetypes="cccc" /> <text - sodipodi:linespacing="100%" - id="text2685" - y="315.53394" - x="905.71832" + xml:space="preserve" style="font-size:8.02623177px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:HoratioDMed" - xml:space="preserve"><tspan - style="font-size:8.02623177px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed" - y="315.53394" - x="905.71832" + x="905.71832" + y="315.53394" + id="text2685" + sodipodi:linespacing="100%"><tspan + id="tspan2687" sodipodi:role="line" - id="tspan2687">NT</tspan></text> + x="905.71832" + y="315.53394" + style="font-size:8.02623177px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:HoratioDMed">NT</tspan></text> </g> <image - y="189.6981" - x="332.64905" - id="image2770" - height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0 U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAJvSURBVDjLpZPrS5NhGIf9W7YvBYOkhlko qCklWChv2WyKik7blnNris72bi6dus0DLZ0TDxW1odtopDs4D8MDZuLU0kXq61CijSIIasOvv94V TUfLiB74fXngup7nvrnvJABJ/5PfLnTTdcwOj4RsdYmo5glBWP6iOtzwvIKSWstI0Wgx80SBblpK tE9KQs/We7EaWoT/8wbWP61gMmCH0lMDvokT4j25TiQU/ITFkek9Ow6+7WH2gwsmahCPdwyw75uw 9HEO2gUZSkfyI9zBPCJOoJ2SMmg46N61YO/rNoa39Xi41oFuXysMfh36/Fp0b7bAfWAH6RGi0Hgl WNCbzYgJaFjRv6zGuy+b9It96N3SQvNKiV9HvSaDfFEIxXItnPs23BzJQd6DDEVM0OKsoVwBG/1V MzpXVWhbkUM2K4oJBDYuGmbKIJ0qxsAbHfRLzbjcnUbFBIpx/qH3vQv9b3U03IQ/HfFkERTzfFj8 w8jSpR7GBE123uFEYAzaDRIqX/2JAtJbDat/COkd7CNBva2cMvq0MGxp0PRSCPF8BXjWG3FgNHc9 XPT71Ojy3sMFdfJRCeKxEsVtKwFHwALZfCUk3tIfNR8XiJwc1LmL4dg141JPKtj3WUdNFJqLGFVP C4OkR4BxajTWsChY64wmCnMxsWPCHcutKBxMVp5mxA1S+aMComToaqTRUQknLTH62kHOVEE+VQnj ahscNCy0cMBWsSI0TCQcZc5ALkEYckL5A5noWSBhfm2AecMAjbcRWV0pUTh0HE64TNf0mczcnnQy u/MilaFJCae1nw2fbz1DnVOxyGTlKeZft/Ff8x1BRssfACjTwQAAAABJRU5ErkJggg== " width="16" - sodipodi:absref="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/add.png" - xlink:href="icons/add.png" /> - <image - y="165.33966" - x="308.50156" - id="image2828" height="16" + id="image2770" + x="332.64905" + y="189.6981" /> + <image + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBI WXMAAA3XAAAN1wFCKJt4AAAAB3RJTUUH1gcMCxkL8MKpSwAAAgFJREFUOMulk09IVFEUh7/73lPe jGZjk2ZODghKlkQYaJvatLGhTFTIVYvatwyzaGUb120CwcBdQtailZumRNq0KQumMmEMybHhDYz/ Zl7OOS2ksYeBA33rc7/zO/fca6iQnUy/wbhHseO9purUScSbUcktOFROPVZs1IQHb5mqtrD67xNs vbhtnkxNzGRW1wYOOh1rXCdxqYX65hsYq4ZSMU0hNzntZFbXBkbu3DuwvfqfkO1ZTCkNNGOVUqQz jdcDIxRWvzI7Poy3/IH6ljP03p3GbWpHVRGrFXW6KBXmMbiICHNvswQEs+PDnDt/GOtKAslu8HKs n8FHH0mlUjiOw+JinrbWdo43RXCqG8hvTmH9Lch9X8A6UgM/f2G5IdZ/fEZEyGazJJNJPC/Pl29b pFeqURNF1QQT1J04jXibWKEQUtjGicQQEXp6euju7t4dRQRVxXVdgD3B05lR3hWqWHk+T6i4Q97Y pKMd6LMRhq49ZGlpCVUFQETo7OwMCl4lJ4h1hMlpAyvbPjvFEuIv82ZuksG+MeLx+N5GVLFtOyi4 eOEmr+cmKPqFcqGUlK6zQ4gInufh+345RW1tbVDQd/kBV3vvs7GZLQtqwlEsy0ZViUQiqGr5Howx QYGIYNs2dYeO7X9EqlhWYGH7BX8iVYqI7Ioq/Qv/IhqNPuZ/+Q2N/+QVMyJUGwAAAABJRU5ErkJg gg== " width="16" - sodipodi:absref="/usr/share/icons/Tango/16x16/actions/contact-new.png" - xlink:href="/usr/share/icons/Tango/16x16/actions/contact-new.png" /> + height="16" + id="image2828" + x="308.50156" + y="165.33966" /> <rect - style="opacity:1;fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect2884" - width="14" - height="13.999999" - x="208.21712" - y="225.32394" - ry="2.5" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/group-def-icon.png" + inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/group-def-icon.png" + ry="2.5" + y="225.32394" + x="208.21712" + height="13.999999" + width="14" + id="rect2884" + style="opacity:1;fill:#ffe6d5;fill-opacity:1;fill-rule:nonzero;stroke:#d45500;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> </g> </svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/pom.xml 2009-01-13 09:42:36 UTC (rev 1031) @@ -82,7 +82,7 @@ <dependency> <groupId>com.calclab</groupId> <artifactId>suco</artifactId> - <version>0.5.13</version> + <version>0.5.2.2</version> </dependency> <dependency> <groupId>jmagick</groupId> Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatClientActions.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -33,8 +33,8 @@ import org.ourproject.kune.wiki.client.WikiClientTool; import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; public class ChatClientActions { Modified: trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/chat/client/ChatEngineDefault.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -39,9 +39,9 @@ import com.calclab.emiteuimodule.client.UserChatOptions; import com.calclab.emiteuimodule.client.params.AvatarProvider; import com.calclab.emiteuimodule.client.status.OwnPresence.OwnStatus; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.user.client.Window; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.Button; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; import org.ourproject.kune.platf.client.services.ImageDescriptor; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; /** * The Class ActionDescriptor. Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; public class ActionManager { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionMenuItemDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ActionMenuItemDescriptor<T> extends ActionDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonAndItemDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ActionToolbarButtonAndItemDescriptor<T> extends ActionToolbarButtonDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarButtonDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ActionToolbarButtonDescriptor<T> extends ActionToolbarDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public abstract class ActionToolbarDescriptor<T> extends ActionDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuAndItemDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ActionToolbarMenuAndItemDescriptor<T> extends ActionToolbarMenuDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ActionToolbarMenuDescriptor<T> extends ActionToolbarDescriptor<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionToolbarMenuRadioDescriptor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -3,7 +3,7 @@ import org.ourproject.kune.platf.client.dto.AccessRolDTO; import org.ourproject.kune.workspace.client.socialnet.RadioMustBeChecked; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ActionToolbarMenuRadioDescriptor<T> extends ActionToolbarMenuDescriptor<T> { private final String group; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/MenuItemsContainer.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import java.util.HashMap; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.gwtext.client.core.EventObject; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/Application.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.app; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; public interface Application { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/app/ApplicationDefault.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -27,8 +27,8 @@ import org.ourproject.kune.workspace.client.site.Site; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Event0; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.Timer; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/rpc/SocialNetworkService.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.platf.client.rpc; +import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; import org.ourproject.kune.platf.client.dto.SocialNetworkRequestResult; -import org.ourproject.kune.platf.client.dto.SocialNetworkDataDTO; import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.errors.DefaultException; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneErrorHandler.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -35,9 +35,9 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Event0; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.IncompatibleRemoteServiceException; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneModule.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -131,11 +131,11 @@ import org.ourproject.kune.workspace.client.title.EntitySubTitle; import org.ourproject.kune.workspace.client.title.RenameAction; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.decorator.NoDecoration; import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.AbstractModule; import com.calclab.suco.client.ioc.module.Factory; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.History; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/Session.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -54,8 +54,8 @@ import org.ourproject.kune.platf.client.dto.UserSimpleDTO; import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; public interface Session { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/SessionDefault.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -38,11 +38,11 @@ import org.ourproject.kune.workspace.client.site.rpc.UserServiceAsync; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Event; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Event; -import com.calclab.suco.client.listener.Event0; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; public class SessionDefault implements Session { private String userHash; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManager.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -24,9 +24,9 @@ import org.ourproject.kune.platf.client.dto.StateAbstractDTO; import org.ourproject.kune.platf.client.dto.StateToken; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.events.Listener2; public interface StateManager { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/state/StateManagerDefault.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -32,11 +32,11 @@ import org.ourproject.kune.workspace.client.site.Site; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Event; -import com.calclab.suco.client.listener.Event2; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Event; +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.events.Listener2; import com.google.gwt.user.client.HistoryListener; public class StateManagerDefault implements StateManager, HistoryListener { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorItemPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -23,7 +23,7 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener2; public class ToolSelectorItemPresenter implements ToolSelectorItem { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/tool/ToolSelectorPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -26,8 +26,8 @@ import org.ourproject.kune.workspace.client.themes.WsThemePresenter; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; public class ToolSelectorPresenter implements ToolSelector { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/IconLabelEditable.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.platf.client.ui; -import com.calclab.suco.client.listener.Event2; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener2; import com.google.gwt.user.client.ui.AbstractImagePrototype; import com.google.gwt.user.client.ui.ChangeListener; import com.google.gwt.user.client.ui.ClickListener; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/MenuItem.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -18,7 +18,7 @@ * */package org.ourproject.kune.platf.client.ui; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class MenuItem<T> { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/BasicDialogExtended.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui.dialogs; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Ext; import com.gwtext.client.core.Position; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridDropConfiguration.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -39,8 +39,8 @@ * */package org.ourproject.kune.platf.client.ui.gridmenu; -import com.calclab.suco.client.listener.Event; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Event; +import com.calclab.suco.client.events.Listener; public class GridDropConfiguration { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/gridmenu/GridMenuPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -22,8 +22,8 @@ import java.util.HashMap; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Event; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Event; +import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.Ext; import com.gwtext.client.core.SortDir; Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalette.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -18,7 +18,7 @@ * */package org.ourproject.kune.platf.client.ui.palette; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public interface ColorWebSafePalette { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/palette/ColorWebSafePalettePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -19,7 +19,7 @@ */ package org.ourproject.kune.platf.client.ui.palette; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ColorWebSafePalettePresenter implements ColorWebSafePalette { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RateItPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -30,8 +30,8 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.site.Site; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; public class RateItPresenter implements RateIt { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/rate/RatePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -24,7 +24,7 @@ import org.ourproject.kune.platf.client.registry.ContentCapabilitiesRegistry; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class RatePresenter { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploader.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.platf.client.dto.StateToken; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public interface FileUploader { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/upload/FileUploaderPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -22,9 +22,9 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.tool.FoldableAbstractClientTool; -import com.calclab.suco.client.listener.Event; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Event; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; public class FileUploaderPresenter implements FileUploader { Modified: trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/platf/client/utils/DeferredCommandWrapper.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -1,6 +1,6 @@ package org.ourproject.kune.platf.client.utils; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; Modified: trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/wiki/client/ctx/WikiContextPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.wiki.client.ctx; +import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.wiki.client.WikiClientTool; -import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; import org.ourproject.kune.workspace.client.cxt.ContextPropEditor; import org.ourproject.kune.workspace.client.cxt.FoldableContextPresenter; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/AbstractFoldableContentActions.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -39,9 +39,9 @@ import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.socialnet.RadioMustBeChecked; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.user.client.rpc.AsyncCallback; public abstract class AbstractFoldableContentActions { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cnt/FoldableContentPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -15,8 +15,8 @@ import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.platf.client.ui.download.ImageSize; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; public abstract class FoldableContentPresenter extends AbstractContentPresenter implements FoldableContent { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -29,7 +29,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; import com.gwtext.client.core.EventObject; import com.gwtext.client.core.ExtElement; import com.gwtext.client.data.Node; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/ctxnav/ContextNavigatorPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -48,10 +48,10 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.title.RenameAction; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; -import com.calclab.suco.client.listener.Listener2; public class ContextNavigatorPresenter implements ContextNavigator { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/cxt/FoldableContextPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -6,8 +6,8 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.ctxnav.ContextNavigator; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; public abstract class FoldableContextPresenter { private final Provider<ContextNavigator> contextNavigatorProvider; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditor.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -19,8 +19,8 @@ */ package org.ourproject.kune.workspace.client.editor; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; public interface TextEditor { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -34,8 +34,8 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; public class TextEditorPresenter implements TextEditor { public static final int AUTOSAVE_AFTER_FAILS_IN_MILLISECONS = 20000; 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-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/TextEditorToolbar.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -24,8 +24,8 @@ import org.ourproject.kune.platf.client.ui.palette.ColorWebSafePalette; import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElement; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.ui.AbstractImagePrototype; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElement.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElement.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElement.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -2,7 +2,7 @@ import org.ourproject.kune.workspace.client.options.AbstractOptions; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener2; public interface TextEditorInsertElement extends AbstractOptions { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -6,7 +6,7 @@ import org.ourproject.kune.workspace.client.options.AbstractOptionsPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; public class TextEditorInsertElementPanel extends AbstractOptionsPanel implements TextEditorInsertElementView { public static final String TEXT_EDT_INSERT_DIALOG = "k-ted-iep-dialog"; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -2,8 +2,8 @@ import org.ourproject.kune.workspace.client.options.AbstractOptionsPresenter; -import com.calclab.suco.client.listener.Event2; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener2; public class TextEditorInsertElementPresenter extends AbstractOptionsPresenter implements TextEditorInsertElement { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -9,7 +9,7 @@ import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class TextEditorInsertLinkLocalPanel extends AbstractLiveSearcherPanel implements TextEditorInsertLinkLocalView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/entityheader/EntityHeaderPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -26,7 +26,7 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener2; public class EntityHeaderPresenter implements EntityHeader { int GROUP_MEDIUM_NAME_LIMIT_SIZE = 90; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/hello/HelloWorldModule.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -12,11 +12,11 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; import com.calclab.suco.client.ioc.decorator.Singleton; import com.calclab.suco.client.ioc.module.AbstractModule; import com.calclab.suco.client.ioc.module.Factory; -import com.calclab.suco.client.listener.Listener; import com.google.gwt.user.client.ui.Label; /** Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nTranslatorPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.workspace.client.site.Site; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.rpc.AsyncCallback; public class I18nTranslatorPresenter implements I18nTranslator { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/i18n/I18nUITranslationService.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -25,12 +25,12 @@ import org.ourproject.kune.platf.client.rpc.I18nServiceAsync; import org.ourproject.kune.platf.client.services.I18nTranslationService; import org.ourproject.kune.platf.client.state.Session; +import org.ourproject.kune.platf.client.ui.Location; import org.ourproject.kune.platf.client.ui.TextUtils; -import org.ourproject.kune.platf.client.ui.Location; import org.ourproject.kune.platf.client.ui.WindowUtils; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.rpc.AsyncCallback; public class I18nUITranslationService extends I18nTranslationService { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.dto.StateContainerDTO; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class EntityLicensePresenter { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseChangeAction.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -7,8 +7,8 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.site.Site; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.user.client.rpc.AsyncCallback; public class LicenseChangeAction { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizard.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -2,7 +2,7 @@ import org.ourproject.kune.platf.client.dto.LicenseDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public interface LicenseWizard { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -12,8 +12,8 @@ import org.ourproject.kune.workspace.client.site.Site; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; public class LicenseWizardPresenter implements LicenseWizard { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstForm.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -6,8 +6,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; -import com.calclab.suco.client.listener.Event0; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener0; import com.gwtext.client.widgets.form.Checkbox; import com.gwtext.client.widgets.form.FieldSet; import com.gwtext.client.widgets.form.Label; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstFormView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstFormView.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFirstFormView.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -2,7 +2,7 @@ import org.ourproject.kune.platf.client.View; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; public interface LicenseWizardFirstFormView extends View { void onAnotherLicenseSelected(Listener0 slot); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdForm.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -10,8 +10,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; -import com.calclab.suco.client.listener.Event0; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener0; import com.gwtext.client.core.Template; import com.gwtext.client.data.Record; import com.gwtext.client.data.SimpleStore; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdFormView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdFormView.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardFrdFormView.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -2,7 +2,7 @@ import org.ourproject.kune.platf.client.View; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; public interface LicenseWizardFrdFormView extends View { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdForm.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -6,8 +6,8 @@ import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizardView; -import com.calclab.suco.client.listener.Event0; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Event0; +import com.calclab.suco.client.events.Listener0; import com.gwtext.client.widgets.PaddedPanel; import com.gwtext.client.widgets.form.Checkbox; import com.gwtext.client.widgets.form.Field; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdFormView.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdFormView.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/pages/LicenseWizardTrdFormView.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -2,7 +2,7 @@ import org.ourproject.kune.platf.client.View; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; public interface LicenseWizardTrdFormView extends View { boolean isAllowComercial(); Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -30,9 +30,9 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Widget; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/newgroup/NewGroupPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -34,8 +34,8 @@ import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.site.SiteToken; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/nohomepage/NoHomePagePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -24,8 +24,8 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.entityheader.EntityHeader; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; public class NoHomePagePresenter implements NoHomePage { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/AbstractOptionsPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -8,7 +8,7 @@ import org.ourproject.kune.workspace.client.newgroup.SiteErrorType; import com.allen_sauer.gwt.log.client.Log; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.gwtext.client.widgets.Component; import com.gwtext.client.widgets.Panel; import com.gwtext.client.widgets.TabPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -3,7 +3,7 @@ import org.ourproject.kune.platf.client.dto.StateAbstractDTO; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class EntityOptionsPresenter extends AbstractOptionsPresenter implements EntityOptions { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -8,10 +8,10 @@ import org.ourproject.kune.workspace.client.licensewizard.LicenseWizard; import org.ourproject.kune.workspace.client.options.EntityOptions; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; -import com.calclab.suco.client.listener.Listener2; public class EntityOptionsDefLicensePresenter implements EntityOptionsDefLicense { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -29,8 +29,8 @@ import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.site.rpc.UserServiceAsync; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener2; public class EntityOptionsLogoPresenter implements EntityOptionsLogo { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -13,8 +13,8 @@ import org.ourproject.kune.workspace.client.newgroup.SiteErrorType; import org.ourproject.kune.workspace.client.options.EntityOptions; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener2; import com.google.gwt.user.client.rpc.AsyncCallback; public class EntityOptionsToolsConfPresenter implements EntityOptionsToolsConf { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/AbstractLiveSearcherPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -3,7 +3,7 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; import org.ourproject.kune.platf.client.services.I18nTranslationService; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.gwtext.client.core.Connection; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcher.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -21,7 +21,7 @@ import org.ourproject.kune.platf.client.dto.LinkDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public interface EntityLiveSearcher { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.ui.dialogs.BasicDialog; import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class EntityLiveSearcherPanel implements EntityLiveSearcherView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/search/EntityLiveSearcherPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.View; import org.ourproject.kune.platf.client.dto.LinkDTO; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class EntityLiveSearcherPresenter implements EntityLiveSearcher { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/RegisterPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -8,7 +8,7 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.gwtext.client.widgets.Component; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInAbstractPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -10,7 +10,7 @@ import org.ourproject.kune.workspace.client.newgroup.SiteErrorType; import org.ourproject.kune.workspace.client.site.Site; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Cookies; import com.gwtext.client.core.Ext; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/signin/SignInPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -6,7 +6,7 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Label; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitelogo/SiteLogoPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -22,7 +22,7 @@ import org.ourproject.kune.platf.client.dto.InitDataDTO; import org.ourproject.kune.platf.client.state.Session; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class SiteLogoPresenter implements SiteLogo { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitepublic/SitePublicSpaceLinkPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -25,7 +25,7 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class SitePublicSpaceLinkPresenter implements SitePublicSpaceLink { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignInLinkPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -22,8 +22,8 @@ import org.ourproject.kune.platf.client.dto.UserInfoDTO; import org.ourproject.kune.platf.client.state.Session; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; public class SiteSignInLinkPresenter implements SiteSignInLink { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/sitesign/SiteSignOutLinkPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -31,9 +31,9 @@ import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.site.rpc.UserServiceAsync; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; import com.google.gwt.core.client.GWT; import com.google.gwt.user.client.Cookies; import com.google.gwt.user.client.rpc.AsyncCallback; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteusermenu/SiteUserMenuPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -28,9 +28,9 @@ import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils; import org.ourproject.kune.workspace.client.options.EntityOptions; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener0; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener0; public class SiteUserMenuPresenter implements SiteUserMenu { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/WorkspaceSkeleton.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -20,7 +20,7 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; -import com.calclab.suco.client.listener.Listener0; +import com.calclab.suco.client.events.Listener0; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.ui.RootPanel; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -33,7 +33,7 @@ import org.ourproject.kune.workspace.client.skel.SummaryPanel; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; import com.google.gwt.user.client.ui.ClickListener; import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.Label; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/BuddiesSummaryPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -49,8 +49,8 @@ import org.ourproject.kune.workspace.client.site.Site; import org.ourproject.kune.workspace.client.site.rpc.UserServiceAsync; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; public class BuddiesSummaryPresenter extends SocialNetworkPresenter implements BuddiesSummary { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -34,7 +34,7 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import com.calclab.emiteuimodule.client.users.UserGridPanel; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.DeferredCommand; import com.google.gwt.user.client.ui.Label; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/GroupMembersSummaryPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -55,9 +55,9 @@ import org.ourproject.kune.workspace.client.themes.WsThemePresenter; import com.calclab.emite.core.client.xmpp.stanzas.XmppURI; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; public class GroupMembersSummaryPresenter extends SocialNetworkPresenter implements GroupMembersSummary { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -32,7 +32,7 @@ import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; import org.ourproject.kune.workspace.client.themes.WsTheme; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; import com.gwtext.client.widgets.BoxComponent; import com.gwtext.client.widgets.event.ContainerListenerAdapter; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/ParticipationSummaryPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -37,9 +37,9 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; public class ParticipationSummaryPresenter extends SocialNetworkPresenter implements ParticipationSummary { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/SocialNetworkPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -43,8 +43,8 @@ import org.ourproject.kune.workspace.client.entityheader.EntityHeaderView; import org.ourproject.kune.workspace.client.site.Site; +import com.calclab.suco.client.events.Listener; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; public class SocialNetworkPresenter { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/summary/GroupSummaryPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -25,8 +25,8 @@ import org.ourproject.kune.workspace.client.themes.WsTheme; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; public class GroupSummaryPresenter implements GroupSummary { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/tags/TagsSummaryPresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -32,9 +32,9 @@ import org.ourproject.kune.workspace.client.themes.WsThemePresenter; import com.allen_sauer.gwt.log.client.Log; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; public class TagsSummaryPresenter implements TagsSummary { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -21,7 +21,7 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener2; import com.gwtext.client.core.EventObject; import com.gwtext.client.widgets.ToolbarButton; import com.gwtext.client.widgets.menu.BaseItem; Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -27,10 +27,10 @@ import org.ourproject.kune.platf.client.state.StateManager; import org.ourproject.kune.workspace.client.site.Site; +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Event2; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; public class WsThemePresenter { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntitySubTitlePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -30,7 +30,7 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; import com.google.gwt.i18n.client.DateTimeFormat; public class EntitySubTitlePresenter implements EntitySubTitle { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePanel.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -23,7 +23,7 @@ import org.ourproject.kune.workspace.client.skel.SimpleToolbar; import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener2; import com.google.gwt.user.client.ui.Image; public class EntityTitlePanel implements EntityTitleView { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/EntityTitlePresenter.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -29,8 +29,8 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; -import com.calclab.suco.client.listener.Listener; -import com.calclab.suco.client.listener.Listener2; +import com.calclab.suco.client.events.Listener; +import com.calclab.suco.client.events.Listener2; public class EntityTitlePresenter implements EntityTitle { Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java =================================================================== --- trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/main/java/org/ourproject/kune/workspace/client/title/RenameAction.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -8,9 +8,9 @@ import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.workspace.client.site.Site; +import com.calclab.suco.client.events.Event2; +import com.calclab.suco.client.events.Listener2; import com.calclab.suco.client.ioc.Provider; -import com.calclab.suco.client.listener.Event2; -import com.calclab.suco.client.listener.Listener2; import com.google.gwt.user.client.rpc.AsyncCallback; public class RenameAction { Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/ActionRegistryTest.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -10,7 +10,7 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.Session; -import com.calclab.suco.client.listener.Listener; +import com.calclab.suco.client.events.Listener; public class ActionRegistryTest { Modified: trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/test/java/org/ourproject/kune/platf/client/state/StateManagerTest.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -14,9 +14,9 @@ import org.ourproject.kune.workspace.client.site.SiteToken; import org.ourproject.kune.workspace.client.sitebar.siteprogress.SiteProgress; -import com.calclab.suco.testing.listener.MockListener; -import com.calclab.suco.testing.listener.MockListener0; -import com.calclab.suco.testing.listener.MockListener2; +import com.calclab.suco.testing.events.MockedListener; +import com.calclab.suco.testing.events.MockedListener0; +import com.calclab.suco.testing.events.MockedListener2; import com.google.gwt.user.client.rpc.AsyncCallback; public class StateManagerTest { @@ -26,9 +26,9 @@ private HistoryWrapper history; private ContentProvider contentProvider; private Session session; - private MockListener2<String, String> toolChangeListener; - private MockListener2<String, String> groupChangeListener; - private MockListener<StateAbstractDTO> stateChangeListener; + private MockedListener2<String, String> toolChangeListener; + private MockedListener2<String, String> groupChangeListener; + private MockedListener<StateAbstractDTO> stateChangeListener; private StateAbstractDTO state; private BeforeActionListener beforeChangeListener1; private BeforeActionListener beforeChangeListener2; @@ -41,9 +41,9 @@ stateManager = new StateManagerDefault(contentProvider, session, history); Mockito.when(session.getUserHash()).thenReturn(HASH); state = Mockito.mock(StateAbstractDTO.class); - stateChangeListener = new MockListener<StateAbstractDTO>(); - groupChangeListener = new MockListener2<String, String>(); - toolChangeListener = new MockListener2<String, String>(); + stateChangeListener = new MockedListener<StateAbstractDTO>(); + groupChangeListener = new MockedListener2<String, String>(); + toolChangeListener = new MockedListener2<String, String>(); beforeChangeListener1 = Mockito.mock(BeforeActionListener.class); beforeChangeListener2 = Mockito.mock(BeforeActionListener.class); stateManager.onStateChanged(stateChangeListener); @@ -170,7 +170,7 @@ @SuppressWarnings("unchecked") @Test public void siteTokenFirstLoadDefContentAndFireListener() { - final MockListener0 listener = new MockListener0(); + final MockedListener0 listener = new MockedListener0(); final String token = SiteToken.signin.toString(); stateManager.addSiteToken(token, listener); stateManager.onHistoryChanged(token); @@ -181,7 +181,7 @@ @Test public void siteTokenTest() { - MockListener0 siteTokenListener = new MockListener0(); + MockedListener0 siteTokenListener = new MockedListener0(); stateManager.addSiteToken("signin", siteTokenListener); stateManager.onHistoryChanged("signIn"); siteTokenListener.isCalledOnce(); Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/editor/TextEditorPresenterTest.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -12,15 +12,15 @@ import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService; import org.ourproject.kune.workspace.client.sitebar.sitesign.SiteSignOutLink; -import com.calclab.suco.client.listener.Listener0; -import com.calclab.suco.testing.listener.MockListener; -import com.calclab.suco.testing.listener.MockListener0; +import com.calclab.suco.client.events.Listener0; +import com.calclab.suco.testing.events.MockedListener; +import com.calclab.suco.testing.events.MockedListener0; public class TextEditorPresenterTest { private TextEditorPresenter presenter; private TextEditorView view; - private MockListener<String> saveListener; - private MockListener0 cancelListener; + private MockedListener<String> saveListener; + private MockedListener0 cancelListener; @SuppressWarnings("unchecked") private ActionToolbar toolbar; private StateManager stateManager; @@ -38,8 +38,8 @@ presenter = new TextEditorPresenter(true, toolbar, i18n, stateManager, signOutLink, deferredCommandWrapper); view = Mockito.mock(TextEditorView.class); presenter.init(view); - saveListener = new MockListener<String>(); - cancelListener = new MockListener0(); + saveListener = new MockedListener<String>(); + cancelListener = new MockedListener0(); } @Test Modified: trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2009-01-07 18:27:06 UTC (rev 1030) +++ trunk/src/test/java/org/ourproject/kune/workspace/client/entityheader/EntityLogoPresenterTest.java 2009-01-13 09:42:36 UTC (rev 1031) @@ -8,8 +8,6 @@ import org.ourproject.kune.platf.client.dto.StateToken; import org.ourproject.kune.platf.client.state.Session; import org.ourproject.kune.platf.client.state.StateManager; -import org.ourproject.kune.workspace.client.entityheader.EntityHeaderPresenter; -import org.ourproject.kune.workspace.client.entityheader.EntityHeaderView; import org.ourproject.kune.workspace.client.themes.WsThemePresenter; public class EntityLogoPresenterTest {

1 0

r1030 - trunk/doc
by vjrj 07 Jan '09

07 Jan '09

Author: vjrj Date: 2009-01-07 19:27:06 +0100 (Wed, 07 Jan 2009) New Revision: 1030 Modified: trunk/doc/kune-ene-09.odp Log: odp updated Modified: trunk/doc/kune-ene-09.odp =================================================================== (Binary files differ)

1 0