Author: solomax
Date: Wed Nov 23 10:10:31 2016
New Revision: 1770940
URL: http://svn.apache.org/viewvc?rev=1770940&view=rev
Log:
[OPENMEETINGS-1488] group logo is saved and displayed as expected (3.1.x)
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Wed Nov 23 10:10:31 2016
@@ -127,7 +127,7 @@ public class GenerateImage extends BaseC
public ConverterProcessResult resize(File in, File out, Integer width,
Integer height) throws IOException {
String[] argv = new String[] { getPathToImageMagick()
- , "-size", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
+ , "-resize", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
, in.getCanonicalPath(), out.getCanonicalPath()
};
return ProcessHelper.executeScript("GenerateImage::resize",
argv);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/flexibleConferenceRoom/baseConferenceRoom.lzx
Wed Nov 23 10:10:31 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -35,7 +35,6 @@
<view y="24">
-
<dtmfButton text="1" x="20" dtmf="1"/>
<dtmfButton text="2" x="40" dtmf="2"/>
<dtmfButton text="3" x="60" dtmf="3"/>
@@ -46,24 +45,18 @@
<dtmfButton text="7" x="20" y="40" dtmf="7"/>
<dtmfButton text="8" x="40" y="40" dtmf="8"/>
- <dtmfButton text="9" x="60" y="40" dtmf="9"/>
-
+ <dtmfButton text="9" x="60" y="40" dtmf="9"/>
<dtmfButton text="10" x="20" y="60" dtmf="10"/>
-
</view>
-
-
</class>
<class name="baseConferenceRoom" extends="baseContentView"
destroyByMethod="true" >
-
- <attribute name="roomobj" value="null" />
-
- <attribute name="meetingTimer" value="null" />
-
+ <attribute name="roomobj" value="null" />
+ <attribute name="meetingTimer" value="null" />
+
<handler name="oninit">
<![CDATA[
- if ($debug) Debug.write("baseConferenceRoom:: oninit");
+ if ($debug) Debug.write("baseConferenceRoom:: oninit");
_mainScrollBar.setAttribute("visibility","hidden");
if ($debug) Debug.write("roomobj: ",this.roomobj);
@@ -74,7 +67,6 @@
if (this.roomobj.closed) {
canvas.roomClosed();
}
-
if (this.roomobj.waitForRecording) {
new lz.labelerrorPopup(canvas, {labelid: 1316,
errorlabelid: 1315});
}
@@ -100,11 +92,24 @@
canvas._mymod.destroy();
canvas._mymod = null;
}
- new lz.moderationPanel(canvas._moderatormenu, {
- name:'_moderationPanel', align:'right',
-
allowUserQuestions:this.roomobj.allowUserQuestions,
- roomName:this.roomobj.name
+ var m = new lz.moderationPanel(canvas._moderatormenu, {
+ name: '_moderationPanel'
+ , align: 'right'
+ , allowUserQuestions:
this.roomobj.allowUserQuestions
+ , roomName: this.roomobj.name
});
+ if ($debug) Debug.write("GROUPS!!! ", this.roomobj.roomGroups);
+ if (this.roomobj.roomGroups) {
+ var g = this.roomobj.roomGroups[0].group;
+ if ($debug) Debug.write("GROUPS!!! ", g);
+ m._group_logo.setAttribute('src', canvas.getUrl() +
"group/" + g.id + "?anticache=" + new Date().getTime());
+ m._group_logo.setAttribute("visible", true);
+ if (g.tag) {
+ m._group_tag.setAttribute("text", g.tag);
+ m._group_tag.setAttribute("visible", true);
+ }
+ if ($debug) Debug.write("GROUPS!!! ", m);
+ }
if (roomobj.appointment) {
canvas.appointmentNotificationPopUp = new
lz.appointmentNotificationPopUp(this,{name:'appDetail', roomobj:this.roomobj });
} else {
@@ -120,7 +125,7 @@
canvas._videocontainer.setAttribute("allowUserQuestions",this.roomobj.allowUserQuestions);
]]>
</handler>
-
+
<handler name="onkeydown" reference="lz.Keys" args="keyCode">
<![CDATA[
if ($debug) Debug.write("onkeydown:: keyCode = ", keyCode);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/moderation/moderationPanel.lzx
Wed Nov 23 10:10:31 2016
@@ -78,10 +78,10 @@
var tString = "";
if (this.recordingUser != null) {
tString += canvas.getLabelName(419)
- + " " + this.recordingUser.username
- + " " + this.recordingUser.firstname
- + " " + this.recordingUser.lastname
- + " " +
parseDateToStringTime(this.recordingUser.roomEnter) + ";";
+ + " " + this.recordingUser.username
+ + " " + this.recordingUser.firstname
+ + " " + this.recordingUser.lastname
+ + " " +
parseDateToStringTime(this.recordingUser.roomEnter) + ";";
}
if (this.publishingObj != null) {
tString += canvas.getLabelName(1504)
@@ -92,17 +92,19 @@
}
this._inner.setAttribute('text', tString);
]]>
- </method>
+ </method>
<method name="checkForApplyScreen" args="record">
//TODO check if host is required for rtmps
ExternalInterface.call("startSharing", canvas.publicSID);
- </method>
+ </method>
- <labelText name="_roomName" fgcolor="0xFFFFFF" y="4" fontstyle="bold"
fontsize="12" />
+ <omImage name="_group_logo" y="0" width="28" height="28"
visible="false"/>
+ <labelText name="_group_tag" fgcolor="0xFFFFFF" y="4" x="1"
fontstyle="bold" fontsize="12" visible="false" />
+ <labelText name="_roomName" fgcolor="0xFFFFFF" y="4" fontstyle="bold"
fontsize="12" />
<miniIconsNew name="mod_btn" y="6" innerResource="applyformodicon_rsc"
width="16" height="16"
- visible="${ (canvas.ismoderator) ? false : true }"
showhandcursor="true">
+ visible="${ (canvas.ismoderator) ? false : true }"
showhandcursor="true">
<handler name="onclick">
//We do only ask the Moderator(s) to change Moderation
//new
lz.applyForModeration(canvas.main_content._content.inner);
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/participants/participantListItem.lzx
Wed Nov 23 10:10:31 2016
@@ -71,13 +71,13 @@
}
this.updateIcons();
</method>
-
+
<method name="fadeText" args="ignore=null">
<![CDATA[
if ($debug) Debug.write("fadeText :1: ",this.refObj);
if ($debug) Debug.write("fadeText :2:
",this.refObj.picture_uri);
this._userpic.setAttribute('src',
canvas.getPictureUrl(this.userId, this.refObj.picture_uri));
- ]]>
+ ]]>
</method>
<handler name="onismoderator" reference="canvas" args="m">
Modified:
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Wed Nov 23 10:10:31 2016
@@ -141,13 +141,13 @@
var width = maxx - minx;
var height = maxy - miny;
- if ($debug) Debug.info("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height);
+ if ($debug) Debug.info("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height, "point count: ", points.length);
if (width < 2 && height < 2) {
//if ($debug) Debug.info("Add minimum size of
Painting Line");
if (points.length > 0) {
var lastPoint = points[points.length -
1];
- drawlineRegisterPaint(lastPoint[3].x,
lastPoint[4].y, lastPoint[3].x + 2, lastPoint[4].y + 2);
+ drawlineRegisterPaint(lastPoint.x,
lastPoint.y, lastPoint.x + 2, lastPoint.y + 2);
} else {
//if ($debug) Debug.info("## 2 ##
CURRENT width,height ",this.width,this.height);
@@ -159,7 +159,6 @@
height = 2;
}
}
-
if (this.isSnapToGrid) {
var xgrid = Math.round((minx - 1) /
this.gridWidth) * this.gridWidth;
var ygrid = Math.round((miny - 1) /
this.gridWidth) * this.gridWidth;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
Wed Nov 23 10:10:31 2016
@@ -61,11 +61,29 @@ public class GroupForm extends AdminBase
private final NumberTextField<Integer> maxRooms = new
NumberTextField<>("maxRooms");
private final NumberTextField<Integer> recordingTtl = new
NumberTextField<>("recordingTtl");
private final NumberTextField<Integer> reminderDays = new
NumberTextField<>("reminderDays");
-
+ private final UploadableImagePanel logo = new
UploadableImagePanel("logo") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getImageUrl() {
+ return getUrl(getRequestCycle(),
GroupForm.this.getModelObject().getId());
+ }
+
+ @Override
+ protected void processImage(StoredFile sf, File f) throws
Exception {
+ getBean(GenerateImage.class).resize(f,
getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 28);
+ }
+
+ @Override
+ protected String getTitle() {
+ return getString("admin.group.form.logo");
+ }
+ };
+
static String formatUser(User choice) {
return String.format("%s [%s %s]", choice.getLogin(),
choice.getFirstname(), choice.getLastname());
}
-
+
public GroupForm(String id, WebMarkupContainer groupList, Group group) {
super(id, new CompoundPropertyModel<Group>(group));
this.groupList = groupList;
@@ -131,24 +149,7 @@ public class GroupForm extends AdminBase
final boolean isGroupAdmin = hasGroupAdminLevel(getRights());
userToadd.setEnabled(!isGroupAdmin);
add(new
RequiredTextField<String>("name").setLabel(Model.of(getString("165"))));
- add(new UploadableImagePanel("logo") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected String getImageUrl() {
- return getUrl(getRequestCycle(),
GroupForm.this.getModelObject().getId());
- }
-
- @Override
- protected void processImage(StoredFile sf, File f)
throws Exception {
- getBean(GenerateImage.class).resize(f,
getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 23);
- }
-
- @Override
- protected String getTitle() {
- return getString("admin.group.form.logo");
- }
- });
+ add(logo);
add(new
TextField<String>("tag").setLabel(Model.of(getString("admin.group.form.tag"))));
add(new AjaxCheckBox("limited") {
private static final long serialVersionUID = 1L;
@@ -179,6 +180,7 @@ public class GroupForm extends AdminBase
maxRooms.setEnabled(getModelObject().isLimited());
recordingTtl.setEnabled(getModelObject().isLimited());
reminderDays.setEnabled(getModelObject().isLimited());
+ logo.update();
target.add(this, groupList);
target.appendJavaScript("groupsInit();");
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
Wed Nov 23 10:10:31 2016
@@ -59,7 +59,7 @@
<label><wicket:message key="171" /></label><input type="text" wicket:id="name"
/>
</div>
<div
class="formelement">
-
<label><wicket:message key="admin.group.form.logo" /></label><div
wicket:id="logo" class="input"></div>
+
<label><wicket:message key="admin.group.form.logo" /></label><div
wicket:id="logo" class="input group logo"></div>
</div>
<div
class="formelement">
<label><wicket:message key="admin.group.form.tag" /></label><input type="text"
wicket:id="tag" />
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
Wed Nov 23 10:10:31 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,6 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div class="profile" wicket:id="profile"><img wicket:id="img"
style="width: 125px;"/><wicket:child/></div>
+ <div class="profile" wicket:id="profile"><img
wicket:id="img"/><wicket:child/></div>
</wicket:panel>
</html>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/admin.css
Wed Nov 23 10:10:31 2016
@@ -330,7 +330,10 @@ table.adminListTable td div.four_column_
width: 180px;
white-space: normal;
}
-
+.adminForm .group.logo .profile img {
+ height: 16px;
+ width: auto;
+}
.adminBackupForm div.formelement {
display: block;
clear: both;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/webapp/css/theme.css
Wed Nov 23 10:10:31 2016
@@ -617,6 +617,9 @@ form .input {
width: 280px;
margin: 2px 2px;
}
+.profile img {
+ width: 125px;
+}
.date.time.picker {
font-size: 12px;
white-space: nowrap;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Wed Nov 23 10:10:31 2016
@@ -117,7 +117,7 @@ public class GenerateImage extends BaseC
public ConverterProcessResult resize(File in, File out, Integer width,
Integer height) throws IOException {
String[] argv = new String[] { getPathToImageMagick()
- , "-size", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
+ , "-resize", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
, in.getCanonicalPath(), out.getCanonicalPath()
};
return ProcessHelper.executeScript("GenerateImage::resize",
argv);
Modified:
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-flash/src/main/swf/modules/conference/whiteboard/base/tools/baseDrawPaint.lzx
Wed Nov 23 10:10:31 2016
@@ -141,13 +141,13 @@
var width = maxx - minx;
var height = maxy - miny;
- if ($debug) Debug.info("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height);
+ if ($debug) Debug.info("## 1 ## NEW x,y ",minx,miny,"
width,height: ",width,height, "point count: ", points.length);
if (width < 2 && height < 2) {
//if ($debug) Debug.info("Add minimum size of
Painting Line");
if (points.length > 0) {
var lastPoint = points[points.length -
1];
- drawlineRegisterPaint(lastPoint[3].x,
lastPoint[4].y, lastPoint[3].x + 2, lastPoint[4].y + 2);
+ drawlineRegisterPaint(lastPoint.x,
lastPoint.y, lastPoint.x + 2, lastPoint.y + 2);
} else {
//if ($debug) Debug.info("## 2 ##
CURRENT width,height ",this.width,this.height);
@@ -159,7 +159,6 @@
height = 2;
}
}
-
if (this.isSnapToGrid) {
var xgrid = Math.round((minx - 1) /
this.gridWidth) * this.gridWidth;
var ygrid = Math.round((miny - 1) /
this.gridWidth) * this.gridWidth;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
Wed Nov 23 10:10:31 2016
@@ -61,11 +61,29 @@ public class GroupForm extends AdminBase
private final NumberTextField<Integer> maxRooms = new
NumberTextField<>("maxRooms");
private final NumberTextField<Integer> recordingTtl = new
NumberTextField<>("recordingTtl");
private final NumberTextField<Integer> reminderDays = new
NumberTextField<>("reminderDays");
-
+ private final UploadableImagePanel logo = new
UploadableImagePanel("logo") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getImageUrl() {
+ return getUrl(getRequestCycle(),
GroupForm.this.getModelObject().getId());
+ }
+
+ @Override
+ protected void processImage(StoredFile sf, File f) throws
Exception {
+ getBean(GenerateImage.class).resize(f,
getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 28);
+ }
+
+ @Override
+ protected String getTitle() {
+ return getString("admin.group.form.logo");
+ }
+ };
+
static String formatUser(User choice) {
return String.format("%s [%s %s]", choice.getLogin(),
choice.getFirstname(), choice.getLastname());
}
-
+
public GroupForm(String id, WebMarkupContainer groupList, Group group) {
super(id, new CompoundPropertyModel<Group>(group));
this.groupList = groupList;
@@ -131,24 +149,7 @@ public class GroupForm extends AdminBase
final boolean isGroupAdmin = hasGroupAdminLevel(getRights());
userToadd.setEnabled(!isGroupAdmin);
add(new
RequiredTextField<String>("name").setLabel(Model.of(getString("165"))));
- add(new UploadableImagePanel("logo") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected String getImageUrl() {
- return getUrl(getRequestCycle(),
GroupForm.this.getModelObject().getId());
- }
-
- @Override
- protected void processImage(StoredFile sf, File f)
throws Exception {
- getBean(GenerateImage.class).resize(f,
getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 23);
- }
-
- @Override
- protected String getTitle() {
- return getString("admin.group.form.logo");
- }
- });
+ add(logo);
add(new
TextField<String>("tag").setLabel(Model.of(getString("admin.group.form.tag"))));
add(new AjaxCheckBox("limited") {
private static final long serialVersionUID = 1L;
@@ -179,6 +180,7 @@ public class GroupForm extends AdminBase
maxRooms.setEnabled(getModelObject().isLimited());
recordingTtl.setEnabled(getModelObject().isLimited());
reminderDays.setEnabled(getModelObject().isLimited());
+ logo.update();
target.add(this, groupList);
target.appendJavaScript("groupsInit();");
}
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
Wed Nov 23 10:10:31 2016
@@ -59,7 +59,7 @@
<label><wicket:message key="171" /></label><input type="text" wicket:id="name"
/>
</div>
<div
class="formelement">
-
<label><wicket:message key="admin.group.form.logo" /></label><div
wicket:id="logo" class="input"></div>
+
<label><wicket:message key="admin.group.form.logo" /></label><div
wicket:id="logo" class="input group logo"></div>
</div>
<div
class="formelement">
<label><wicket:message key="admin.group.form.tag" /></label><input type="text"
wicket:id="tag" />
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
Wed Nov 23 10:10:31 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,6 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div class="profile" wicket:id="profile"><img wicket:id="img"
style="width: 125px;"/><wicket:child/></div>
+ <div class="profile" wicket:id="profile"><img
wicket:id="img"/><wicket:child/></div>
</wicket:panel>
</html>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/admin.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/admin.css?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/admin.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/admin.css
Wed Nov 23 10:10:31 2016
@@ -330,7 +330,10 @@ table.adminListTable td div.four_column_
width: 180px;
white-space: normal;
}
-
+.adminForm .group.logo .profile img {
+ height: 16px;
+ width: auto;
+}
.adminBackupForm div.formelement {
display: block;
clear: both;
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/webapp/css/theme.css
Wed Nov 23 10:10:31 2016
@@ -617,6 +617,9 @@ form .input {
width: 280px;
margin: 2px 2px;
}
+.profile img {
+ width: 125px;
+}
.date.time.picker {
font-size: 12px;
white-space: nowrap;
Modified:
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
(original)
+++
openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/GenerateImage.java
Wed Nov 23 10:10:31 2016
@@ -117,7 +117,7 @@ public class GenerateImage extends BaseC
public ConverterProcessResult resize(File in, File out, Integer width,
Integer height) throws IOException {
String[] argv = new String[] { getPathToImageMagick()
- , "-size", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
+ , "-resize", (width == null ? "" : width) +
(height == null ? "" : "x" + height)
, in.getCanonicalPath(), out.getCanonicalPath()
};
return ProcessHelper.executeScript("GenerateImage::resize",
argv);
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupForm.java
Wed Nov 23 10:10:31 2016
@@ -61,11 +61,29 @@ public class GroupForm extends AdminBase
private final NumberTextField<Integer> maxRooms = new
NumberTextField<>("maxRooms");
private final NumberTextField<Integer> recordingTtl = new
NumberTextField<>("recordingTtl");
private final NumberTextField<Integer> reminderDays = new
NumberTextField<>("reminderDays");
-
+ private final UploadableImagePanel logo = new
UploadableImagePanel("logo") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected String getImageUrl() {
+ return getUrl(getRequestCycle(),
GroupForm.this.getModelObject().getId());
+ }
+
+ @Override
+ protected void processImage(StoredFile sf, File f) throws
Exception {
+ getBean(GenerateImage.class).resize(f,
getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 28);
+ }
+
+ @Override
+ protected String getTitle() {
+ return getString("admin.group.form.logo");
+ }
+ };
+
static String formatUser(User choice) {
return String.format("%s [%s %s]", choice.getLogin(),
choice.getFirstname(), choice.getLastname());
}
-
+
public GroupForm(String id, WebMarkupContainer groupList, Group group) {
super(id, new CompoundPropertyModel<Group>(group));
this.groupList = groupList;
@@ -131,24 +149,7 @@ public class GroupForm extends AdminBase
final boolean isGroupAdmin = hasGroupAdminLevel(getRights());
userToadd.setEnabled(!isGroupAdmin);
add(new
RequiredTextField<String>("name").setLabel(Model.of(getString("165"))));
- add(new UploadableImagePanel("logo") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected String getImageUrl() {
- return getUrl(getRequestCycle(),
GroupForm.this.getModelObject().getId());
- }
-
- @Override
- protected void processImage(StoredFile sf, File f)
throws Exception {
- getBean(GenerateImage.class).resize(f,
getGroupLogo(GroupForm.this.getModelObject().getId(), false), null, 23);
- }
-
- @Override
- protected String getTitle() {
- return getString("admin.group.form.logo");
- }
- });
+ add(logo);
add(new
TextField<String>("tag").setLabel(Model.of(getString("admin.group.form.tag"))));
add(new AjaxCheckBox("limited") {
private static final long serialVersionUID = 1L;
@@ -179,6 +180,7 @@ public class GroupForm extends AdminBase
maxRooms.setEnabled(getModelObject().isLimited());
recordingTtl.setEnabled(getModelObject().isLimited());
reminderDays.setEnabled(getModelObject().isLimited());
+ logo.update();
target.add(this, groupList);
target.appendJavaScript("groupsInit();");
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
Wed Nov 23 10:10:31 2016
@@ -59,7 +59,7 @@
<label><wicket:message key="171" /></label><input type="text" wicket:id="name"
/>
</div>
<div
class="formelement">
-
<label><wicket:message key="admin.group.form.logo" /></label><div
wicket:id="logo" class="input"></div>
+
<label><wicket:message key="admin.group.form.logo" /></label><div
wicket:id="logo" class="input group logo"></div>
</div>
<div
class="formelement">
<label><wicket:message key="admin.group.form.tag" /></label><input type="text"
wicket:id="tag" />
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ImagePanel.html
Wed Nov 23 10:10:31 2016
@@ -9,7 +9,7 @@
with the License. You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -20,6 +20,6 @@
-->
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
- <div class="profile" wicket:id="profile"><img wicket:id="img"
style="width: 125px;"/><wicket:child/></div>
+ <div class="profile" wicket:id="profile"><img
wicket:id="img"/><wicket:child/></div>
</wicket:panel>
</html>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
Wed Nov 23 10:10:31 2016
@@ -330,7 +330,10 @@ table.adminListTable td div.four_column_
width: 180px;
white-space: normal;
}
-
+.adminForm .group.logo .profile img {
+ height: 16px;
+ width: auto;
+}
.adminBackupForm div.formelement {
display: block;
clear: both;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1770940&r1=1770939&r2=1770940&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
Wed Nov 23 10:10:31 2016
@@ -617,6 +617,9 @@ form .input {
width: 280px;
margin: 2px 2px;
}
+.profile img {
+ width: 125px;
+}
.date.time.picker {
font-size: 12px;
white-space: nowrap;
