[geeklog-cvs] geeklog: Merged with upstream
geeklog-cvs at lists.geeklog.net
geeklog-cvs at lists.geeklog.net
Wed Apr 25 10:54:21 EDT 2012
changeset 8626:b0bf1072f368
url: http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/b0bf1072f368
user: Tom <websitemaster at cogeco.net>
date: Wed Apr 25 10:50:10 2012 -0400
description:
Merged with upstream
diffstat:
plugins/calendar/functions.inc | 14 +-
plugins/calendar/templates/admin/eventeditor.thtml | 299 +-
plugins/links/functions.inc | 18 +-
plugins/links/templates/admin/categoryeditor.thtml | 125 +-
plugins/links/templates/admin/linkeditor.thtml | 143 +-
plugins/links/templates/categorydropdown.thtml | 15 +-
plugins/links/templates/submitlink.thtml | 64 +-
plugins/polls/functions.inc | 7 +-
plugins/polls/templates/admin/pollansweroption.thtml | 11 +-
plugins/polls/templates/admin/polleditor.thtml | 128 +-
plugins/polls/templates/admin/pollquestions.thtml | 31 +-
plugins/staticpages/functions.inc | 28 +-
plugins/staticpages/services.inc.php | 22 +-
plugins/staticpages/templates/admin/editor.thtml | 296 +-
plugins/staticpages/templates/admin/editor_advanced.thtml | 344 +-
public_html/404.php | 5 +-
public_html/admin/auth.inc.php | 5 +-
public_html/admin/block.php | 40 +-
public_html/admin/database.php | 24 +-
public_html/admin/group.php | 34 +-
public_html/admin/mail.php | 9 +-
public_html/admin/moderation.php | 8 +-
public_html/admin/plugins.php | 20 +-
public_html/admin/plugins/calendar/index.php | 43 +-
public_html/admin/plugins/links/category.php | 17 +-
public_html/admin/plugins/links/index.php | 22 +-
public_html/admin/plugins/polls/index.php | 22 +-
public_html/admin/plugins/spamx/index.php | 8 +-
public_html/admin/plugins/staticpages/index.php | 14 +-
public_html/admin/sectest.php | 10 +-
public_html/admin/story.php | 17 +-
public_html/admin/syndication.php | 49 +-
public_html/admin/topic.php | 48 +-
public_html/admin/trackback.php | 53 +-
public_html/admin/user.php | 51 +-
public_html/article.php | 13 +-
public_html/calendar/event.php | 20 +-
public_html/calendar/index.php | 19 +-
public_html/directory.php | 20 +-
public_html/fckeditor/editor/css/fck_editorarea.css | 226 +-
public_html/fckeditor/editor/skins/default/fck_editor.css | 941 +-
public_html/fckeditor/myconfig.js | 58 +-
public_html/getimage.php | 2 +-
public_html/index.php | 3 +-
public_html/javascript/admin.configuration.js | 448 +-
public_html/javascript/fix_tooltips.js | 7 +-
public_html/javascript/staticpages_fckeditor.js | 9 +-
public_html/javascript/storyeditor_fckeditor.js | 11 +-
public_html/javascript/ver.1.8/admin.configuration.js | 721 +
public_html/layout/denim/README | 264 +
public_html/layout/denim/admin/block/blockeditor.thtml | 118 +
public_html/layout/denim/admin/block/defaultblockeditor.thtml | 71 +
public_html/layout/denim/admin/common/edit_permissions.thtml | 26 +
public_html/layout/denim/admin/common/edit_topics.thtml | 33 +
public_html/layout/denim/admin/config/config_element.thtml | 75 +
public_html/layout/denim/admin/config/config_element_2.thtml | 83 +
public_html/layout/denim/admin/config/configuration.thtml | 64 +
public_html/layout/denim/admin/config/menu_element.thtml | 10 +
public_html/layout/denim/admin/group/groupeditor.thtml | 73 +
public_html/layout/denim/admin/group/groupmembers.thtml | 41 +
public_html/layout/denim/admin/lists/field.thtml | 1 +
public_html/layout/denim/admin/lists/header.thtml | 1 +
public_html/layout/denim/admin/lists/inline.thtml | 19 +
public_html/layout/denim/admin/lists/list.thtml | 34 +
public_html/layout/denim/admin/lists/listitem.thtml | 7 +
public_html/layout/denim/admin/lists/searchmenu.thtml | 31 +
public_html/layout/denim/admin/lists/topmenu.thtml | 12 +
public_html/layout/denim/admin/mail/mailform.thtml | 43 +
public_html/layout/denim/admin/moderation/ccitem.thtml | 1 +
public_html/layout/denim/admin/moderation/ccrow.thtml | 1 +
public_html/layout/denim/admin/moderation/moderation.thtml | 7 +
public_html/layout/denim/admin/plugins/editor.thtml | 39 +
public_html/layout/denim/admin/plugins/info.thtml | 39 +
public_html/layout/denim/admin/story/storyeditor.japanese_utf-8.thtml | 211 +
public_html/layout/denim/admin/story/storyeditor.thtml | 211 +
public_html/layout/denim/admin/story/storyeditor_advanced.japanese_utf-8.thtml | 308 +
public_html/layout/denim/admin/story/storyeditor_advanced.thtml | 309 +
public_html/layout/denim/admin/syndication/feededitor.thtml | 70 +
public_html/layout/denim/admin/syndication/selecttype.thtml | 17 +
public_html/layout/denim/admin/topic/listitem.thtml | 5 +
public_html/layout/denim/admin/topic/topiceditor.thtml | 87 +
public_html/layout/denim/admin/topic/topiclist.thtml | 10 +
public_html/layout/denim/admin/trackback/autodetectitem.thtml | 9 +
public_html/layout/denim/admin/trackback/autodetectlist.thtml | 12 +
public_html/layout/denim/admin/trackback/pingbackform.thtml | 25 +
public_html/layout/denim/admin/trackback/pingbackitem.thtml | 10 +
public_html/layout/denim/admin/trackback/pingbacklist.thtml | 12 +
public_html/layout/denim/admin/trackback/pingform.thtml | 29 +
public_html/layout/denim/admin/trackback/pingitem.thtml | 10 +
public_html/layout/denim/admin/trackback/pinglist.thtml | 12 +
public_html/layout/denim/admin/trackback/serviceeditor.thtml | 45 +
public_html/layout/denim/admin/trackback/trackbackeditor.thtml | 35 +
public_html/layout/denim/admin/user/batchdelete.thtml | 20 +
public_html/layout/denim/admin/user/batchdelete_options.thtml | 13 +
public_html/layout/denim/admin/user/edituser.thtml | 59 +
public_html/layout/denim/admin/user/groupedit.thtml | 9 +
public_html/layout/denim/admin/user/password.thtml | 10 +
public_html/layout/denim/admin/user/reminder.thtml | 8 +
public_html/layout/denim/adminoption.thtml | 1 +
public_html/layout/denim/adminoption_off.thtml | 1 +
public_html/layout/denim/archivestorybodytext.thtml | 5 +
public_html/layout/denim/archivestorytext.thtml | 36 +
public_html/layout/denim/article/article.thtml | 14 +
public_html/layout/denim/article/printable.thtml | 39 +
public_html/layout/denim/blockfooter-config.thtml | 6 +
public_html/layout/denim/blockfooter-left.thtml | 7 +
public_html/layout/denim/blockfooter-list.thtml | 8 +
public_html/layout/denim/blockfooter-message.thtml | 8 +
public_html/layout/denim/blockfooter-related.thtml | 7 +
public_html/layout/denim/blockfooter-right.thtml | 7 +
public_html/layout/denim/blockfooter.thtml | 8 +
public_html/layout/denim/blockheader-config.thtml | 8 +
public_html/layout/denim/blockheader-left.thtml | 8 +
public_html/layout/denim/blockheader-list.thtml | 9 +
public_html/layout/denim/blockheader-message.thtml | 9 +
public_html/layout/denim/blockheader-related.thtml | 8 +
public_html/layout/denim/blockheader-right.thtml | 8 +
public_html/layout/denim/blockheader.thtml | 8 +
public_html/layout/denim/blockservices.thtml | 9 +
public_html/layout/denim/breadcrumbs/breadcrumb.thtml | 5 +
public_html/layout/denim/breadcrumbs/breadcrumb_child.thtml | 3 +
public_html/layout/denim/breadcrumbs/breadcrumb_nolink.thtml | 3 +
public_html/layout/denim/breadcrumbs/breadcrumb_root.thtml | 1 +
public_html/layout/denim/breadcrumbs/breadcrumbs.thtml | 5 +
public_html/layout/denim/comment/comment.thtml | 17 +
public_html/layout/denim/comment/commentbar.thtml | 37 +
public_html/layout/denim/comment/commentform.thtml | 67 +
public_html/layout/denim/comment/commentform_advanced.thtml | 74 +
public_html/layout/denim/comment/reportcomment.thtml | 22 +
public_html/layout/denim/comment/startcomment.thtml | 14 +
public_html/layout/denim/comment/thread.thtml | 9 +
public_html/layout/denim/featuredstorybodytext.thtml | 5 +
public_html/layout/denim/featuredstorytext.thtml | 36 +
public_html/layout/denim/footer.thtml | 45 +
public_html/layout/denim/functions.php | 124 +
public_html/layout/denim/header.thtml | 67 +
public_html/layout/denim/ie6style.css | 321 +
public_html/layout/denim/ie7style.css | 224 +
public_html/layout/denim/ie8style.css | 35 +
public_html/layout/denim/images/addchild.png | Bin
public_html/layout/denim/images/admin/block-left.png | Bin
public_html/layout/denim/images/admin/block-right.png | Bin
public_html/layout/denim/images/admin/down.png | Bin
public_html/layout/denim/images/admin/up.png | Bin
public_html/layout/denim/images/bar.gif | Bin
public_html/layout/denim/images/bararrowdown.png | Bin
public_html/layout/denim/images/bararrowup.png | Bin
public_html/layout/denim/images/button_help.png | Bin
public_html/layout/denim/images/collapse.png | Bin
public_html/layout/denim/images/copy.png | Bin
public_html/layout/denim/images/css/bg_header.gif | Bin
public_html/layout/denim/images/css/bg_message_title.gif | Bin
public_html/layout/denim/images/deleteitem.png | Bin
public_html/layout/denim/images/disabled.png | Bin
public_html/layout/denim/images/edit.png | Bin
public_html/layout/denim/images/enabled.png | Bin
public_html/layout/denim/images/error.png | Bin
public_html/layout/denim/images/expand.png | Bin
public_html/layout/denim/images/external.png | Bin
public_html/layout/denim/images/favicon.ico | Bin
public_html/layout/denim/images/feed.png | Bin
public_html/layout/denim/images/header-bg.png | Bin
public_html/layout/denim/images/icon_info.png | Bin
public_html/layout/denim/images/icons/block.png | Bin
public_html/layout/denim/images/icons/configuration.png | Bin
public_html/layout/denim/images/icons/database.png | Bin
public_html/layout/denim/images/icons/delete_event.png | Bin
public_html/layout/denim/images/icons/docs.png | Bin
public_html/layout/denim/images/icons/event.png | Bin
public_html/layout/denim/images/icons/group.png | Bin
public_html/layout/denim/images/icons/logout.png | Bin
public_html/layout/denim/images/icons/mail.png | Bin
public_html/layout/denim/images/icons/plugins.png | Bin
public_html/layout/denim/images/icons/story.png | Bin
public_html/layout/denim/images/icons/syndication.png | Bin
public_html/layout/denim/images/icons/topic.png | Bin
public_html/layout/denim/images/icons/trackback.png | Bin
public_html/layout/denim/images/icons/user.png | Bin
public_html/layout/denim/images/icons/versioncheck.png | Bin
public_html/layout/denim/images/info.png | Bin
public_html/layout/denim/images/install.png | Bin
public_html/layout/denim/images/list.png | Bin
public_html/layout/denim/images/logo.png | Bin
public_html/layout/denim/images/mail.png | Bin
public_html/layout/denim/images/person.png | Bin
public_html/layout/denim/images/print.png | Bin
public_html/layout/denim/images/sendping.png | Bin
public_html/layout/denim/images/smallcamera.png | Bin
public_html/layout/denim/images/success.png | Bin
public_html/layout/denim/images/sysmessage.png | Bin
public_html/layout/denim/images/unavailable.png | Bin
public_html/layout/denim/images/update.png | Bin
public_html/layout/denim/images/warning.png | Bin
public_html/layout/denim/javascript/app.js | 160 +
public_html/layout/denim/javascript/iepngfix.htc | 63 +
public_html/layout/denim/javascript/script.js | 57 +
public_html/layout/denim/javascript/tabs.js | 29 +
public_html/layout/denim/javascript/tinynav.min.js | 3 +
public_html/layout/denim/jquery_ui/images/ui-anim_basic_16x16.gif | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_flat_0_aaaaaa_40x100.png | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_flat_55_fbec88_40x100.png | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_glass_75_d0e5f5_1x400.png | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_glass_85_dfeffc_1x400.png | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_glass_95_fef1ec_1x400.png | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_gloss-wave_55_5c9ccc_500x100.png | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_inset-hard_100_f5f8f9_1x100.png | Bin
public_html/layout/denim/jquery_ui/images/ui-bg_inset-hard_100_fcfdfd_1x100.png | Bin
public_html/layout/denim/jquery_ui/images/ui-icons_217bc0_256x240.png | Bin
public_html/layout/denim/jquery_ui/images/ui-icons_2e83ff_256x240.png | Bin
public_html/layout/denim/jquery_ui/images/ui-icons_469bdd_256x240.png | Bin
public_html/layout/denim/jquery_ui/images/ui-icons_6da8d5_256x240.png | Bin
public_html/layout/denim/jquery_ui/images/ui-icons_cd0a0a_256x240.png | Bin
public_html/layout/denim/jquery_ui/images/ui-icons_d8e7f3_256x240.png | Bin
public_html/layout/denim/jquery_ui/images/ui-icons_f9bd01_256x240.png | Bin
public_html/layout/denim/jquery_ui/jquery-ui.css | 573 +
public_html/layout/denim/jquery_ui/jquery.ui.accordion.css | 19 +
public_html/layout/denim/jquery_ui/jquery.ui.all.css | 11 +
public_html/layout/denim/jquery_ui/jquery.ui.autocomplete.css | 53 +
public_html/layout/denim/jquery_ui/jquery.ui.base.css | 11 +
public_html/layout/denim/jquery_ui/jquery.ui.button.css | 38 +
public_html/layout/denim/jquery_ui/jquery.ui.core.css | 41 +
public_html/layout/denim/jquery_ui/jquery.ui.datepicker.css | 68 +
public_html/layout/denim/jquery_ui/jquery.ui.dialog.css | 21 +
public_html/layout/denim/jquery_ui/jquery.ui.geeklog.css | 218 +
public_html/layout/denim/jquery_ui/jquery.ui.progressbar.css | 11 +
public_html/layout/denim/jquery_ui/jquery.ui.resizable.css | 20 +
public_html/layout/denim/jquery_ui/jquery.ui.selectable.css | 10 +
public_html/layout/denim/jquery_ui/jquery.ui.slider.css | 24 +
public_html/layout/denim/jquery_ui/jquery.ui.tabs.css | 18 +
public_html/layout/denim/jquery_ui/jquery.ui.theme.css | 254 +
public_html/layout/denim/leftblocks.thtml | 35 +
public_html/layout/denim/list.thtml | 8 +
public_html/layout/denim/listitem.thtml | 1 +
public_html/layout/denim/lists/inline/item_field.thtml | 6 +
public_html/layout/denim/lists/inline/item_row.thtml | 9 +
public_html/layout/denim/lists/inline/list.thtml | 24 +
public_html/layout/denim/lists/inline/page_limit.thtml | 6 +
public_html/layout/denim/lists/inline/page_sort.thtml | 6 +
public_html/layout/denim/lists/table/item_field.thtml | 6 +
public_html/layout/denim/lists/table/item_row.thtml | 8 +
public_html/layout/denim/lists/table/list.thtml | 23 +
public_html/layout/denim/lists/table/page_limit.thtml | 6 +
public_html/layout/denim/lists/table/page_sort.thtml | 6 +
public_html/layout/denim/loginform.thtml | 35 +
public_html/layout/denim/loginform_oauth.thtml | 10 +
public_html/layout/denim/loginform_openid.thtml | 12 +
public_html/layout/denim/menuitem.thtml | 1 +
public_html/layout/denim/menuitem_last.thtml | 1 +
public_html/layout/denim/menuitem_none.thtml | 1 +
public_html/layout/denim/navbar/breadcrumb_link.thtml | 1 +
public_html/layout/denim/navbar/breadcrumbs.thtml | 8 +
public_html/layout/denim/navbar/images/button.gif | Bin
public_html/layout/denim/navbar/images/button_over.gif | Bin
public_html/layout/denim/navbar/images/tableftI.gif | Bin
public_html/layout/denim/navbar/images/tableftJ.gif | Bin
public_html/layout/denim/navbar/images/tabrightI.gif | Bin
public_html/layout/denim/navbar/images/tabrightJ.gif | Bin
public_html/layout/denim/navbar/menuitem.thtml | 1 +
public_html/layout/denim/navbar/navbar.thtml | 11 +
public_html/layout/denim/noscript.thtml | 10 +
public_html/layout/denim/preferences/boxesblock.thtml | 19 +
public_html/layout/denim/preferences/commentblock.thtml | 29 +
public_html/layout/denim/preferences/current_password.thtml | 8 +
public_html/layout/denim/preferences/deleteaccount.thtml | 22 +
public_html/layout/denim/preferences/digestblock.thtml | 21 +
public_html/layout/denim/preferences/displayblock.thtml | 40 +
public_html/layout/denim/preferences/displayprefs.thtml | 19 +
public_html/layout/denim/preferences/editor.thtml | 7 +
public_html/layout/denim/preferences/excludeblock.thtml | 25 +
public_html/layout/denim/preferences/language.thtml | 7 +
public_html/layout/denim/preferences/password.thtml | 12 +
public_html/layout/denim/preferences/privacyblock.thtml | 27 +
public_html/layout/denim/preferences/profile.thtml | 114 +
public_html/layout/denim/preferences/resynch.thtml | 8 +
public_html/layout/denim/preferences/theme.thtml | 7 +
public_html/layout/denim/preferences/username.thtml | 8 +
public_html/layout/denim/preferences/userphoto.thtml | 8 +
public_html/layout/denim/print.css | 55 +
public_html/layout/denim/profiles/contactauthorform.thtml | 44 +
public_html/layout/denim/profiles/contactuserform.thtml | 38 +
public_html/layout/denim/rightblocks.thtml | 14 +
public_html/layout/denim/search/headingcolumn.thtml | 6 +
public_html/layout/denim/search/resultauthdatehits.thtml | 10 +
public_html/layout/denim/search/resultcolumn.thtml | 6 +
public_html/layout/denim/search/resultrow.thtml | 8 +
public_html/layout/denim/search/resultrowenhanced.thtml | 12 +
public_html/layout/denim/search/resultsummary.thtml | 8 +
public_html/layout/denim/search/resulttitle.thtml | 8 +
public_html/layout/denim/search/searchauthors.thtml | 11 +
public_html/layout/denim/search/searchblock.thtml | 20 +
public_html/layout/denim/search/searchform.thtml | 57 +
public_html/layout/denim/search/searchresults.thtml | 14 +
public_html/layout/denim/search/searchresults_heading.thtml | 8 +
public_html/layout/denim/search/searchresults_norows.thtml | 6 +
public_html/layout/denim/search/searchresults_rows.thtml | 8 +
public_html/layout/denim/stats/itemstatistics.thtml | 18 +
public_html/layout/denim/stats/singlestat.thtml | 9 +
public_html/layout/denim/stats/singlesummary.thtml | 9 +
public_html/layout/denim/stats/sitestatistics.thtml | 24 +
public_html/layout/denim/storybodytext.thtml | 5 +
public_html/layout/denim/storytext.thtml | 36 +
public_html/layout/denim/style.css | 3626 +++++++++
public_html/layout/denim/style_rtl.css | 3630 ++++++++++
public_html/layout/denim/submit/submitstory.thtml | 45 +
public_html/layout/denim/submit/submitstory_advanced.thtml | 57 +
public_html/layout/denim/tooltips/classic.thtml | 1 +
public_html/layout/denim/tooltips/critical.thtml | 1 +
public_html/layout/denim/tooltips/help.thtml | 1 +
public_html/layout/denim/tooltips/images/critical.png | Bin
public_html/layout/denim/tooltips/images/help.png | Bin
public_html/layout/denim/tooltips/images/info.png | Bin
public_html/layout/denim/tooltips/images/tooltip.png | Bin
public_html/layout/denim/tooltips/images/warning.png | Bin
public_html/layout/denim/tooltips/information.thtml | 1 +
public_html/layout/denim/tooltips/warning.thtml | 1 +
public_html/layout/denim/topcenterblock-span.thtmlx | 10 +
public_html/layout/denim/topicoption.thtml | 1 +
public_html/layout/denim/topicoption_off.thtml | 1 +
public_html/layout/denim/trackback/formattedcomment.thtml | 15 +
public_html/layout/denim/trackback/trackback.thtml | 13 +
public_html/layout/denim/trackback/trackbackcomment.thtml | 6 +
public_html/layout/denim/useroption.thtml | 1 +
public_html/layout/denim/useroption_off.thtml | 1 +
public_html/layout/denim/users/commentrow.thtml | 6 +
public_html/layout/denim/users/email.thtml | 7 +
public_html/layout/denim/users/getpasswordform.thtml | 28 +
public_html/layout/denim/users/loginform.thtml | 30 +
public_html/layout/denim/users/newpassword.thtml | 30 +
public_html/layout/denim/users/profile.thtml | 51 +
public_html/layout/denim/users/registrationform.thtml | 33 +
public_html/layout/denim/users/services.thtml | 7 +
public_html/layout/denim/users/storyrow.thtml | 6 +
public_html/layout/newpro/css/tooltips/tooltips.css | 4 +-
public_html/layout/professional/style.css | 60 +
public_html/lib-common.php | 729 +-
public_html/links/index.php | 13 +-
public_html/polls/index.php | 17 +-
public_html/profiles.php | 58 +-
public_html/search.php | 8 +-
public_html/stats.php | 8 +-
public_html/submit.php | 23 +-
public_html/users.php | 60 +-
public_html/usersettings.php | 22 +-
system/classes/config.class.php | 361 +-
system/lib-comment.php | 36 +-
system/lib-security.php | 7 +-
system/lib-story.php | 34 +-
system/lib-user.php | 11 +-
348 files changed, 17969 insertions(+), 2352 deletions(-)
diffs (truncated from 23975 to 300 lines):
diff -r 12e4c93a52fa -r b0bf1072f368 plugins/calendar/functions.inc
--- a/plugins/calendar/functions.inc Tue Apr 24 14:37:36 2012 -0400
+++ b/plugins/calendar/functions.inc Wed Apr 25 10:50:10 2012 -0400
@@ -438,13 +438,12 @@
// check for missing textfields
if (empty ($A['title']) || empty ($A['start_month']) || empty ($A['start_day']) || empty ($A['start_year'])) {
- $retval .= COM_siteHeader ('menu', $LANG_CAL_1[27])
- . COM_startBlock ($LANG12[22], '',
+ $retval .= COM_startBlock ($LANG12[22], '',
COM_getBlockTemplate ('_msg_block', 'header'))
. $LANG12[23]
. COM_endBlock (COM_getBlockTemplate ('_msg_block', 'footer'))
- . plugin_submit_calendar ($A['calendar_type'])
- . COM_siteFooter ();
+ . plugin_submit_calendar ($A['calendar_type']);
+ $retval = COM_createHTMLDocument($retval, 'menu', $LANG_CAL_1[27]);
return $retval;
}
@@ -512,10 +511,9 @@
$msg = PLG_itemPreSave('calendar', $A);
if (! empty($msg)) {
- $retval .= COM_siteHeader('menu', $LANG_CAL_1[27])
- . COM_errorLog($msg, 2)
- . plugin_submit_calendar($A['calendar_type'])
- . COM_siteFooter();
+ $retval .= COM_errorLog($msg, 2)
+ . plugin_submit_calendar($A['calendar_type']);
+ $retval = COM_createHTMLDocument($retval, 'menu', $LANG_CAL_1[27]);
return $retval;
}
diff -r 12e4c93a52fa -r b0bf1072f368 plugins/calendar/templates/admin/eventeditor.thtml
--- a/plugins/calendar/templates/admin/eventeditor.thtml Tue Apr 24 14:37:36 2012 -0400
+++ b/plugins/calendar/templates/admin/eventeditor.thtml Wed Apr 25 10:50:10 2012 -0400
@@ -1,170 +1,129 @@
- <form action="{site_admin_url}/plugins/calendar/index.php" name="events" method="post">
- <table border="0" cellspacing="0" cellpadding="3">
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_eventtitle}:</td>
- <td>
- <input type="text" size="48" maxlength="128" name="title" value="{event_title}"{xhtml}>
- </td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_eventtype}:</td>
- <td>
- <select name="event_type">
- <option value="">--</option>
- {type_options}
- </select>
- </td>
- </tr>
- <tr>
- <td align="right" valign="top" style="white-space:nowrap;">{lang_eventstartdate}:</td>
- <td>
- <span dir="ltr">
- <select name="start_month">
- {startmonth_options}
- </select>
- /
- <select name="start_day">
- {startday_options}
- </select>
- /
- <select name="start_year">
- {startyear_options}
- </select>
- {lang_starttime}:
- <select name="start_hour">
- {starthour_options}
- </select>
- :
- <select name="start_minute">
- {startminute_options}
- </select>
- {startampm_selection}
- </span>
- </td>
- </tr>
- <tr>
- <td align="right" valign="top" style="white-space:nowrap;">{lang_eventenddate}:</td>
- <td>
- <span dir="ltr">
- <select name="end_month">
- {endmonth_options}
- </select>
- /
- <select name="end_day">
- {endday_options}
- </select>
- /
- <select name="end_year">
- {endyear_options}
- </select>
- {lang_endtime}:
- <select name="end_hour">
- {endhour_options}
- </select>
- :
- <select name="end_minute">
- {endminute_options}
- </select>
- {endampm_selection}
- </span>
- </td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_alldayevent}:</td>
- <td><input type="checkbox" name="allday" {allday_checked}{xhtml}></td>
- </tr>
- <tr>
- <td align="right" valign="top" style="white-space:nowrap;">{lang_location}:</td>
- <td>
- <textarea name="location" cols="45" rows="2">{event_location}</textarea>
- </td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_addressline1}:</td>
- <td><input type="text" name="address1" size="40" value="{event_address1}"{xhtml}></td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_addressline2}:</td>
- <td><input type="text" name="address2" size="40" value="{event_address2}"{xhtml}></td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_city}:</td>
- <td><input type="text" name="city" size="40" maxlength="60" value="{event_city}"{xhtml}></td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_state}:</td>
- <td><input type="text" name="state" size="40" value="{event_state}"{xhtml}></td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_zipcode}:</td>
- <td><input type="text" name="zipcode" size="5" maxlength="5" value="{event_zipcode}"{xhtml}></td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_eventurl}:</td>
- <td><input type="text" dir="ltr" size="48" maxlength="{max_url_length}" name="url" value="{event_url}"{xhtml}> {lang_includehttp}</td>
- </tr>
- <tr>
- <td align="right" valign="top" style="white-space:nowrap;">{lang_eventdescription}:</td>
- <td><textarea name="description" style="width:100%" cols="45" rows="8">{event_description}</textarea></td>
- </tr>
- <tr valign="top">
- <td align="right" style="white-space:nowrap;">{lang_postmode}:</td>
- <td>
- <select name="postmode">
- {post_options}
- </select>
- <br{xhtml}>
- {lang_allowed_html}
- </td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_hits}:</td>
- <td>{hits}</td>
- </tr>
- <tr>
- <td colspan="2"><hr{xhtml}></td>
- </tr>
- <tr>
- <td colspan="2"><b>{lang_accessrights}</b></td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_owner}:</td>
- <td>{owner_name}<input type="hidden" name="owner_id" value="{owner_id}"{xhtml}></td>
- </tr>
- <tr>
- <td align="right" style="white-space:nowrap;">{lang_group}:</td>
- <td>
- {group_dropdown}
- </td>
- </tr>
- <tr>
- <td colspan="2"><b>{lang_permissions}</b>:</td>
- </tr>
- <tr>
- <td colspan="2"></td>
- </tr>
- <tr>
- <td colspan="2">{lang_perm_key}</td>
- </tr>
- <tr>
- <td colspan="2">
- {permissions_editor}
- </td>
- </tr>
- <tr>
- <td colspan="2">{lang_permissions_msg}</td>
- </tr>
- <tr><td> </td></tr>
- <tr>
- <td colspan="2">
- <input type="submit" value="{lang_save}" name="mode"{xhtml}>
- <input type="submit" value="{lang_cancel}" name="mode"{xhtml}>
- <input type="hidden" name="eid" value="{event_id}"{xhtml}>
- <input type="hidden" name="hour_mode" value="{hour_mode}"{xhtml}>
- {delete_option}
- {submission_option}
- <input type="hidden" name="{gltoken_name}" value="{gltoken}"{xhtml}>
- </td>
- </tr>
- </table>
- </form>
+
+<!-- plugins/calendar/templates/admin/eventeditor.thtml { -->
+
+<form action="{site_admin_url}/plugins/calendar/index.php" name="events" method="post" id="calendar-eventeditor" class="compact">
+ <div class="admin_basic">
+ <dl class="form_block">
+ <dt><label for="calendar-eventeditor-title">{lang_eventtitle}</label></dt>
+ <dd><input type="text" maxlength="128" name="title" value="{event_title}" id="calendar-eventeditor-title" class="size6"{xhtml}></dd>
+
+ <dt><label for="calendar-eventeditor-event_type">{lang_eventtype}</label></dt>
+ <dd><select name="event_type" id="calendar-eventeditor-event_type">
+ <option value="">--</option>
+ {type_options}
+ </select></dd>
+
+ <dt><label>{lang_eventstartdate}</label></dt>
+ <dd><span dir="ltr">
+ <select name="start_month">
+ {startmonth_options}
+ </select>
+ /
+ <select name="start_day">
+ {startday_options}
+ </select>
+ /
+ <select name="start_year">
+ {startyear_options}
+ </select>
+ {lang_starttime}:
+ <select name="start_hour">
+ {starthour_options}
+ </select>
+ :
+ <select name="start_minute">
+ {startminute_options}
+ </select>
+ {startampm_selection}
+ </span></dd>
+
+ <dt><label>{lang_eventenddate}</label></dt>
+ <dd><span dir="ltr">
+ <select name="end_month">
+ {endmonth_options}
+ </select>
+ /
+ <select name="end_day">
+ {endday_options}
+ </select>
+ /
+ <select name="end_year">
+ {endyear_options}
+ </select>
+ {lang_endtime}:
+ <select name="end_hour">
+ {endhour_options}
+ </select>
+ :
+ <select name="end_minute">
+ {endminute_options}
+ </select>
+ {endampm_selection}
+ </span></dd>
+
+ <dt><label for="calendar-eventeditor-allday">{lang_alldayevent}</label></dt>
+ <dd><input type="checkbox" name="allday" id="calendar-eventeditor-allday" {allday_checked}{xhtml}></dd>
+
+ <dt><label for="calendar-eventeditor-location">{lang_location}</label></dt>
+ <dd><textarea name="location" cols="45" rows="2" id="calendar-eventeditor-location" class="size6">{event_location}</textarea></dd>
+
+ <dt><label for="calendar-eventeditor-address1">{lang_addressline1}</label></dt>
+ <dd><input type="text" name="address1" value="{event_address1}" id="calendar-eventeditor-address1" class="size6"{xhtml}></dd>
+
+ <dt><label for="calendar-eventeditor-address2">{lang_addressline2}</label></dt>
+ <dd><input type="text" name="address2" value="{event_address2}" id="calendar-eventeditor-address2" class="size6"{xhtml}></dd>
+
+ <dt><label for="calendar-eventeditor-city">{lang_city}</label></dt>
+ <dd><input type="text" name="city" maxlength="60" value="{event_city}" id="calendar-eventeditor-city" class="size6"{xhtml}></dd>
+
+ <dt><label for="calendar-eventeditor-state">{lang_state}</label></dt>
+ <dd><input type="text" name="state" value="{event_state}" id="calendar-eventeditor-state" class="size6"{xhtml}></dd>
+
+ <dt><label for="calendar-eventeditor-zipcode">{lang_zipcode}</label></dt>
+ <dd><input type="text" name="zipcode" maxlength="5" value="{event_zipcode}" id="calendar-eventeditor-zipcode" class="size1"{xhtml}></dd>
+
+ <dt><label for="calendar-eventeditor-url">{lang_eventurl}</label></dt>
+ <dd><input type="text" dir="ltr" name="url" maxlength="{max_url_length}" value="{event_url}" id="calendar-eventeditor-url" class="size6"{xhtml}> {lang_includehttp}</dd>
+
+ <dt><label for="calendar-eventeditor-description">{lang_eventdescription}</label></dt>
+ <dd><textarea name="description" cols="45" rows="8" id="calendar-eventeditor-description" class="wide">{event_description}</textarea></dd>
+
+ <dt><label for="calendar-eventeditor-postmode">{lang_postmode}</label></dt>
+ <dd><select name="postmode" id="calendar-eventeditor-postmode">
More information about the geeklog-cvs
mailing list