@@ -1,6 +1,11 @@ -To avoid future confusion, we recommend that you include a license with your plugin. -This file is simply a reminder. +Copyright (c) 2008, Keith Brophy> +All rights reserved. -For a template license you can have a look at: http://www.opensource.org/licenses/ +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + * Neither the name of Keith Brophy nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -Atlassian releases most of its modules under a BSD license: http://www.opensource.org/licenses/bsd-license.php LICENSE.TXT @@ -57,15 +57,12 @@ public class TwikkirMacro extends BaseMacro twikkirUsers.removeAll(leaders); SortedSet myRecentTwikkirs = twikkirManager.getTwikkirs(currentUsername); - int followers = twikkirManager.getFollowers(currentUsername).size(); - Integer followersInt = new Integer(followers); Map velocityContextMap = MacroUtils.defaultVelocityContext(); velocityContextMap.put(PARAM_CURRENT_USERNAME, currentUsername); velocityContextMap.put(PARAM_USERS, twikkirUsers); velocityContextMap.put(PARAM_LEADERS, leaders); velocityContextMap.put("pageId", pageId); - velocityContextMap.put("numFollowers", followersInt.toString()); velocityContextMap.put("myrecenttwikkirs", myRecentTwikkirs); return VelocityUtils.getRenderedTemplate(MACRO_TEMPLATE, velocityContextMap); } src/main/java/com/sidus/confluence/twikkir/macro/TwikkirMacro.java @@ -229,5 +229,5 @@ function getLatestTwikkirs() *************************************************************** Timers **** */ -setInterval ( "getLatestTwikkirs()", 5000 ); +setInterval ( "getLatestTwikkirs()", 60000 ); src/main/resources/js/twikkir.js @@ -120,23 +120,22 @@ </form> </div> <div id="tab_mytwikkirs"> - <h3>$numFollowers people are listening to you.</h3> <h2>My Recent Twikkirs</h2> - <div id="myrecenttwikkirlist"> - #foreach($twikkir in $myrecenttwikkirs) - <div class="twikkirpost"> - <table> - <tr> - <td valign="top"> - #getUserPic($twikkir.username) - </td> - <td>$twikkir.post<br /><span class="smalltext">$twikkir.postDate</span> - </td> - </tr> - </table> - </div> - #end - </div> + <div id="myrecenttwikkirlist"> + #foreach($twikkir in $myrecenttwikkirs) + <div class="twikkirpost"> + <table> + <tr> + <td valign="top"> + #getUserPic($twikkir.username) + </td> + <td>$twikkir.post<br /><span class="smalltext">$twikkir.postDate</span> + </td> + </tr> + </table> + </div> + #end + </div> </div> </div> src/main/resources/templates/sidus/twikkir/twikkir.vm README.txt bin/com/sidus/confluence/twikkir/Constants.class bin/com/sidus/confluence/twikkir/TestTwikkirMacro.class bin/com/sidus/confluence/twikkir/Twikkir.class bin/com/sidus/confluence/twikkir/TwikkirManager.class bin/com/sidus/confluence/twikkir/action/PostItAction.class bin/com/sidus/confluence/twikkir/action/ViewTwikkirListAction.class bin/com/sidus/confluence/twikkir/macro/TwikkirMacro.class bin/it/IntegrationTestMyPlugin.class 5979c709d28a8a99aaf47624c819e635cf895e18 keithb keithb@Walle.local http://github.com/keithb/twikkir/commit/08ea6f8ef8a419b8b8d040cf0d3184ede1c99434 08ea6f8ef8a419b8b8d040cf0d3184ede1c99434 2008-05-24T14:31:51-07:00 2008-05-24T14:31:51-07:00 Update with latest files. fed2a2051b547434d2d56060f88fb794affc9ccc keithb keithb@Walle.local