[SUCS Devel] site r657 - in trunk: . components db_changes htdocs htdocs/css htdocs/desktop htdocs/files htdocs/files/Help htdocs/images htdocs/images/bananas htdocs/js htdocs/js/tinymce htdocs/js/tinymce/docs htdocs/js/tinymce/docs/css htdocs/js/tinymce/docs/images htdocs/js/tinymce/docs/tinymce_api htdocs/js/tinymce/examples htdocs/pictures/people lib lib/Validate lib/venus lib/venus/docs lib/venus/docs/img lib/venus/examples lib/venus/examples/filters lib/venus/examples/filters/categories lib/venus/examples/filters/guess-language lib/venus/examples/filters/xpath-sifter lib/venus/examples/images lib/venus/filters lib/venus/filters/delDupName lib/venus/filters/stripAd lib/venus/planet lib/venus/planet/shell lib/venus/planet/vendor lib/venus/planet/vendor/compat_logging lib/venus/planet/vendor/html5lib lib/venus/planet/vendor/html5lib/filters lib/venus/planet/vendor/html5lib/serializer lib/venus/planet/vendor/html5lib/treebuilders lib/venus/planet/vendor/html5lib/treewalkers lib/venus/planet/vendor/httplib2 lib/venus/sucs lib/venus/themes lib/venus/themes/asf lib/venus/themes/classic_fancy lib/venus/themes/common lib/venus/themes/common/images lib/venus/themes/django lib/venus/themes/genshi_fancy lib/venus/themes/mobile lib/venus/themes/musings plugins templates templates_c

imranh at sucs.org imranh at sucs.org
Sun Apr 5 17:42:48 BST 2015


Author: imranh
Date: 2015-04-05 17:42:47 +0100 (Sun, 05 Apr 2015)
New Revision: 657

Added:
   trunk/components/disk.graph.php
   trunk/components/disk.php
   trunk/components/election.php
   trunk/components/electionreminder.php
   trunk/components/events.php
   trunk/components/events_ical.php
   trunk/components/junk.php
   trunk/components/libraryadmin.php
   trunk/components/membershiprenew.php
   trunk/components/motd_wrapper.php
   trunk/components/printer.graph.php
   trunk/components/printer.php
   trunk/components/signup-admin.php
   trunk/components/signupajax.php
   trunk/components/susignup-admin.php
   trunk/components/susignup.php
   trunk/db_changes/
   trunk/db_changes/sucssite-0.3.sql
   trunk/htdocs/css/ie8.css
   trunk/htdocs/css/ielt8.css
   trunk/htdocs/css/milliways.css
   trunk/htdocs/css/susignup-admin.css
   trunk/htdocs/images/bananas/banana-container.png
   trunk/htdocs/images/bananas/banana-g-container.png
   trunk/htdocs/images/border-top-left.gif
   trunk/htdocs/images/border-top-left.png
   trunk/htdocs/images/border-top-right.gif
   trunk/htdocs/images/border-top-right.png
   trunk/htdocs/images/shame.php
   trunk/htdocs/images/spinner.gif
   trunk/htdocs/js/jquery.js
   trunk/htdocs/js/signup.js
   trunk/htdocs/js/tinymce/changelog
   trunk/htdocs/js/tinymce/docs/
   trunk/htdocs/js/tinymce/docs/about.html
   trunk/htdocs/js/tinymce/docs/compatiblity_chart.html
   trunk/htdocs/js/tinymce/docs/credits.html
   trunk/htdocs/js/tinymce/docs/css/
   trunk/htdocs/js/tinymce/docs/css/screen.css
   trunk/htdocs/js/tinymce/docs/customization_language_packs.html
   trunk/htdocs/js/tinymce/docs/customization_plugins.html
   trunk/htdocs/js/tinymce/docs/customization_themes.html
   trunk/htdocs/js/tinymce/docs/faq.html
   trunk/htdocs/js/tinymce/docs/images/
   trunk/htdocs/js/tinymce/docs/images/moxiecode.gif
   trunk/htdocs/js/tinymce/docs/index.html
   trunk/htdocs/js/tinymce/docs/installation_example_00.html
   trunk/htdocs/js/tinymce/docs/installation_example_01.html
   trunk/htdocs/js/tinymce/docs/installation_example_02.html
   trunk/htdocs/js/tinymce/docs/installation_example_03.html
   trunk/htdocs/js/tinymce/docs/installing.html
   trunk/htdocs/js/tinymce/docs/license.html
   trunk/htdocs/js/tinymce/docs/option_accessibility_focus.html
   trunk/htdocs/js/tinymce/docs/option_accessibility_warnings.html
   trunk/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html
   trunk/htdocs/js/tinymce/docs/option_add_unload_trigger.html
   trunk/htdocs/js/tinymce/docs/option_apply_source_formatting.html
   trunk/htdocs/js/tinymce/docs/option_ask.html
   trunk/htdocs/js/tinymce/docs/option_auto_focus.html
   trunk/htdocs/js/tinymce/docs/option_auto_reset_designmode.html
   trunk/htdocs/js/tinymce/docs/option_auto_resize.html
   trunk/htdocs/js/tinymce/docs/option_browsers.html
   trunk/htdocs/js/tinymce/docs/option_button_tile_map.html
   trunk/htdocs/js/tinymce/docs/option_cleanup.html
   trunk/htdocs/js/tinymce/docs/option_cleanup_callback.html
   trunk/htdocs/js/tinymce/docs/option_cleanup_on_startup.html
   trunk/htdocs/js/tinymce/docs/option_content_css.html
   trunk/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html
   trunk/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html
   trunk/htdocs/js/tinymce/docs/option_convert_urls.html
   trunk/htdocs/js/tinymce/docs/option_custom_shortcuts.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html
   trunk/htdocs/js/tinymce/docs/option_debug.html
   trunk/htdocs/js/tinymce/docs/option_dialog_type.html
   trunk/htdocs/js/tinymce/docs/option_directionality.html
   trunk/htdocs/js/tinymce/docs/option_display_tab_class.html
   trunk/htdocs/js/tinymce/docs/option_docs_language.html
   trunk/htdocs/js/tinymce/docs/option_doctype.html
   trunk/htdocs/js/tinymce/docs/option_document_base_url.html
   trunk/htdocs/js/tinymce/docs/option_editor_css.html
   trunk/htdocs/js/tinymce/docs/option_editor_deselector.html
   trunk/htdocs/js/tinymce/docs/option_editor_selector.html
   trunk/htdocs/js/tinymce/docs/option_elements.html
   trunk/htdocs/js/tinymce/docs/option_encoding.html
   trunk/htdocs/js/tinymce/docs/option_entities.html
   trunk/htdocs/js/tinymce/docs/option_entity_encoding.html
   trunk/htdocs/js/tinymce/docs/option_event_elements.html
   trunk/htdocs/js/tinymce/docs/option_execcommand_callback.html
   trunk/htdocs/js/tinymce/docs/option_extended_valid_elements.html
   trunk/htdocs/js/tinymce/docs/option_external_image_list_url.html
   trunk/htdocs/js/tinymce/docs/option_external_link_list_url.html
   trunk/htdocs/js/tinymce/docs/option_file_browser_callback.html
   trunk/htdocs/js/tinymce/docs/option_fix_content_duplication.html
   trunk/htdocs/js/tinymce/docs/option_fix_list_elements.html
   trunk/htdocs/js/tinymce/docs/option_fix_table_elements.html
   trunk/htdocs/js/tinymce/docs/option_focus_alert.html
   trunk/htdocs/js/tinymce/docs/option_font_size_classes.html
   trunk/htdocs/js/tinymce/docs/option_font_size_style_values.html
   trunk/htdocs/js/tinymce/docs/option_force_br_newlines.html
   trunk/htdocs/js/tinymce/docs/option_force_hex_style_colors.html
   trunk/htdocs/js/tinymce/docs/option_force_p_newlines.html
   trunk/htdocs/js/tinymce/docs/option_handle_event_callback.html
   trunk/htdocs/js/tinymce/docs/option_height.html
   trunk/htdocs/js/tinymce/docs/option_hidden_tab_class.html
   trunk/htdocs/js/tinymce/docs/option_init_instance_callback.html
   trunk/htdocs/js/tinymce/docs/option_inline_styles.html
   trunk/htdocs/js/tinymce/docs/option_insertimage_callback.html
   trunk/htdocs/js/tinymce/docs/option_insertlink_callback.html
   trunk/htdocs/js/tinymce/docs/option_invalid_elements.html
   trunk/htdocs/js/tinymce/docs/option_language.html
   trunk/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html
   trunk/htdocs/js/tinymce/docs/option_mode.html
   trunk/htdocs/js/tinymce/docs/option_nowrap.html
   trunk/htdocs/js/tinymce/docs/option_object_resizing.html
   trunk/htdocs/js/tinymce/docs/option_onchange_callback.html
   trunk/htdocs/js/tinymce/docs/option_oninit.html
   trunk/htdocs/js/tinymce/docs/option_onpageload.html
   trunk/htdocs/js/tinymce/docs/option_plugins.html
   trunk/htdocs/js/tinymce/docs/option_popups_css.html
   trunk/htdocs/js/tinymce/docs/option_preformatted.html
   trunk/htdocs/js/tinymce/docs/option_relative_urls.html
   trunk/htdocs/js/tinymce/docs/option_remove_linebreaks.html
   trunk/htdocs/js/tinymce/docs/option_remove_script_host.html
   trunk/htdocs/js/tinymce/docs/option_save_callback.html
   trunk/htdocs/js/tinymce/docs/option_setupcontent_callback.html
   trunk/htdocs/js/tinymce/docs/option_strict_loading_mode.html
   trunk/htdocs/js/tinymce/docs/option_submit_patch.html
   trunk/htdocs/js/tinymce/docs/option_table_inline_editing.html
   trunk/htdocs/js/tinymce/docs/option_textarea_trigger.html
   trunk/htdocs/js/tinymce/docs/option_theme.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_container.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_container_align.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_container_class.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_containers.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_containers_default_align.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_containers_default_class.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_custom_layout.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_disable.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_fonts.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_layout_manager.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_link_targets.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_path.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_path_location.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_resize_horizontal.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_resizing.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_resizing_use_cookie.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_source_editor_height.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_source_editor_width.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_source_editor_wrap.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_statusbar_location.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_styles.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_toolbar_align.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_toolbar_location.html
   trunk/htdocs/js/tinymce/docs/option_trim_span_elements.html
   trunk/htdocs/js/tinymce/docs/option_urlconverter_callback.html
   trunk/htdocs/js/tinymce/docs/option_valid_elements.html
   trunk/htdocs/js/tinymce/docs/option_verify_css_classes.html
   trunk/htdocs/js/tinymce/docs/option_verify_html.html
   trunk/htdocs/js/tinymce/docs/option_visual.html
   trunk/htdocs/js/tinymce/docs/option_visual_table_class.html
   trunk/htdocs/js/tinymce/docs/option_width.html
   trunk/htdocs/js/tinymce/docs/plugin_advhr.html
   trunk/htdocs/js/tinymce/docs/plugin_advimage.html
   trunk/htdocs/js/tinymce/docs/plugin_advlink.html
   trunk/htdocs/js/tinymce/docs/plugin_autosave.html
   trunk/htdocs/js/tinymce/docs/plugin_contextmenu.html
   trunk/htdocs/js/tinymce/docs/plugin_directionality.html
   trunk/htdocs/js/tinymce/docs/plugin_emotions.html
   trunk/htdocs/js/tinymce/docs/plugin_flash.html
   trunk/htdocs/js/tinymce/docs/plugin_fullpage.html
   trunk/htdocs/js/tinymce/docs/plugin_fullscreen.html
   trunk/htdocs/js/tinymce/docs/plugin_iespell.html
   trunk/htdocs/js/tinymce/docs/plugin_inlinepopups.html
   trunk/htdocs/js/tinymce/docs/plugin_insertdatetime.html
   trunk/htdocs/js/tinymce/docs/plugin_layer.html
   trunk/htdocs/js/tinymce/docs/plugin_noneditable.html
   trunk/htdocs/js/tinymce/docs/plugin_paste.html
   trunk/htdocs/js/tinymce/docs/plugin_preview.html
   trunk/htdocs/js/tinymce/docs/plugin_print.html
   trunk/htdocs/js/tinymce/docs/plugin_save.html
   trunk/htdocs/js/tinymce/docs/plugin_searchreplace.html
   trunk/htdocs/js/tinymce/docs/plugin_spellchecker.html
   trunk/htdocs/js/tinymce/docs/plugin_style.html
   trunk/htdocs/js/tinymce/docs/plugin_table.html
   trunk/htdocs/js/tinymce/docs/plugin_zoom.html
   trunk/htdocs/js/tinymce/docs/reference_buttons.html
   trunk/htdocs/js/tinymce/docs/reference_configuration.html
   trunk/htdocs/js/tinymce/docs/reference_javascript_functions.html
   trunk/htdocs/js/tinymce/docs/reference_plugins.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/
   trunk/htdocs/js/tinymce/docs/tinymce_api/GLOBALS.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Cleanup.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Control.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Engine.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Layer.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Popup.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Selection.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_UndoRedo.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/allclasses-frame.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/allclasses-noframe.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/help-doc.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/index-all.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/index.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Array.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Cleanup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Control.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_DOMUtils.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Debug.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Engine.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Event.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_ForceParagraphs.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Layer.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Menu.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Popup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Selection.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_URL.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_UndoRedo.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-frame.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Array.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Cleanup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Control.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_DOMUtils.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Debug.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Engine.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Event.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_ForceParagraphs.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Layer.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Menu.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Popup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Selection.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_URL.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_UndoRedo.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-tree.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/stylesheet.css
   trunk/htdocs/js/tinymce/examples/
   trunk/htdocs/js/tinymce/examples/example_advanced.css
   trunk/htdocs/js/tinymce/examples/example_advanced.htm
   trunk/htdocs/js/tinymce/examples/example_flash_list.js
   trunk/htdocs/js/tinymce/examples/example_full.css
   trunk/htdocs/js/tinymce/examples/example_full.htm
   trunk/htdocs/js/tinymce/examples/example_image_list.js
   trunk/htdocs/js/tinymce/examples/example_link_list.js
   trunk/htdocs/js/tinymce/examples/example_simple.htm
   trunk/htdocs/js/tinymce/examples/example_word.css
   trunk/htdocs/js/tinymce/examples/example_word.htm
   trunk/htdocs/js/tinymce/examples/logo.jpg
   trunk/htdocs/js/tinymce/examples/logo_over.jpg
   trunk/htdocs/js/tinymce/readme
   trunk/lib/Validate/
   trunk/lib/Validate/ISPN.php
   trunk/lib/Validate/Validate.php
   trunk/lib/iCalcreator.class.php
   trunk/lib/ldap-auth.php
   trunk/lib/member_functions.php
   trunk/lib/page-feedback.php
   trunk/lib/pieChart.php
   trunk/lib/sanitization.php
   trunk/lib/validationData.php
   trunk/lib/venus/
   trunk/lib/venus/.htaccess
   trunk/lib/venus/AUTHORS
   trunk/lib/venus/LICENCE
   trunk/lib/venus/README
   trunk/lib/venus/THANKS
   trunk/lib/venus/TODO
   trunk/lib/venus/docs/
   trunk/lib/venus/docs/config.html
   trunk/lib/venus/docs/contributing.html
   trunk/lib/venus/docs/docs.css
   trunk/lib/venus/docs/docs.js
   trunk/lib/venus/docs/etiquette.html
   trunk/lib/venus/docs/filters.html
   trunk/lib/venus/docs/img/
   trunk/lib/venus/docs/img/shadowAlpha.png
   trunk/lib/venus/docs/index.html
   trunk/lib/venus/docs/installation.html
   trunk/lib/venus/docs/migration.html
   trunk/lib/venus/docs/normalization.html
   trunk/lib/venus/docs/templates.html
   trunk/lib/venus/docs/venus.svg
   trunk/lib/venus/examples/
   trunk/lib/venus/examples/filters/
   trunk/lib/venus/examples/filters/categories/
   trunk/lib/venus/examples/filters/categories/categories.xslt
   trunk/lib/venus/examples/filters/guess-language/
   trunk/lib/venus/examples/filters/guess-language/README
   trunk/lib/venus/examples/filters/guess-language/en.data
   trunk/lib/venus/examples/filters/guess-language/fr.data
   trunk/lib/venus/examples/filters/guess-language/guess-language.py
   trunk/lib/venus/examples/filters/guess-language/learn-language.py
   trunk/lib/venus/examples/filters/guess-language/trigram.py
   trunk/lib/venus/examples/filters/xpath-sifter/
   trunk/lib/venus/examples/filters/xpath-sifter/xpath-sifter.ini
   trunk/lib/venus/examples/foaf-based.ini
   trunk/lib/venus/examples/images/
   trunk/lib/venus/examples/images/edd.png
   trunk/lib/venus/examples/images/jdub.png
   trunk/lib/venus/examples/images/keybuk.png
   trunk/lib/venus/examples/images/thom.png
   trunk/lib/venus/examples/opml-top100.ini
   trunk/lib/venus/examples/planet-schmanet.ini
   trunk/lib/venus/expunge.py
   trunk/lib/venus/filters/
   trunk/lib/venus/filters/addsearch.genshi
   trunk/lib/venus/filters/addsearch.xslt
   trunk/lib/venus/filters/coral_cdn_filter.py
   trunk/lib/venus/filters/delDupName/
   trunk/lib/venus/filters/delDupName/byline_author.xslt
   trunk/lib/venus/filters/delDupName/p_by_name.xslt
   trunk/lib/venus/filters/delDupName/p_from.xslt
   trunk/lib/venus/filters/detitle.xslt
   trunk/lib/venus/filters/excerpt.py
   trunk/lib/venus/filters/h1title.xslt
   trunk/lib/venus/filters/html2xhtml.plugin
   trunk/lib/venus/filters/mememe.plugin
   trunk/lib/venus/filters/minhead.py
   trunk/lib/venus/filters/notweets.py
   trunk/lib/venus/filters/regexp_sifter.py
   trunk/lib/venus/filters/stripAd/
   trunk/lib/venus/filters/stripAd/feedburner.sed
   trunk/lib/venus/filters/stripAd/google_ad_map.sed
   trunk/lib/venus/filters/stripAd/yahoo.sed
   trunk/lib/venus/filters/xhtml2html.plugin
   trunk/lib/venus/filters/xpath_sifter.py
   trunk/lib/venus/planet.py
   trunk/lib/venus/planet/
   trunk/lib/venus/planet/__init__.py
   trunk/lib/venus/planet/config.py
   trunk/lib/venus/planet/csv_config.py
   trunk/lib/venus/planet/expunge.py
   trunk/lib/venus/planet/foaf.py
   trunk/lib/venus/planet/idindex.py
   trunk/lib/venus/planet/opml.py
   trunk/lib/venus/planet/reconstitute.py
   trunk/lib/venus/planet/scrub.py
   trunk/lib/venus/planet/shell/
   trunk/lib/venus/planet/shell/__init__.py
   trunk/lib/venus/planet/shell/_genshi.py
   trunk/lib/venus/planet/shell/dj.py
   trunk/lib/venus/planet/shell/plugin.py
   trunk/lib/venus/planet/shell/py.py
   trunk/lib/venus/planet/shell/sed.py
   trunk/lib/venus/planet/shell/tmpl.py
   trunk/lib/venus/planet/shell/xslt.py
   trunk/lib/venus/planet/spider.py
   trunk/lib/venus/planet/splice.py
   trunk/lib/venus/planet/vendor/
   trunk/lib/venus/planet/vendor/compat_logging/
   trunk/lib/venus/planet/vendor/compat_logging/__init__.py
   trunk/lib/venus/planet/vendor/compat_logging/config.py
   trunk/lib/venus/planet/vendor/compat_logging/handlers.py
   trunk/lib/venus/planet/vendor/feedparser.py
   trunk/lib/venus/planet/vendor/html5lib/
   trunk/lib/venus/planet/vendor/html5lib/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/constants.py
   trunk/lib/venus/planet/vendor/html5lib/filters/
   trunk/lib/venus/planet/vendor/html5lib/filters/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/filters/_base.py
   trunk/lib/venus/planet/vendor/html5lib/filters/inject_meta_charset.py
   trunk/lib/venus/planet/vendor/html5lib/filters/lint.py
   trunk/lib/venus/planet/vendor/html5lib/filters/optionaltags.py
   trunk/lib/venus/planet/vendor/html5lib/filters/whitespace.py
   trunk/lib/venus/planet/vendor/html5lib/html5parser.py
   trunk/lib/venus/planet/vendor/html5lib/inputstream.py
   trunk/lib/venus/planet/vendor/html5lib/liberalxmlparser.py
   trunk/lib/venus/planet/vendor/html5lib/sanitizer.py
   trunk/lib/venus/planet/vendor/html5lib/serializer/
   trunk/lib/venus/planet/vendor/html5lib/serializer/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/serializer/htmlserializer.py
   trunk/lib/venus/planet/vendor/html5lib/serializer/xhtmlserializer.py
   trunk/lib/venus/planet/vendor/html5lib/tokenizer.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/_base.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/dom.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/etree.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/simpletree.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/soup.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/_base.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/dom.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/etree.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/genshistream.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/pulldom.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/simpletree.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/soup.py
   trunk/lib/venus/planet/vendor/html5lib/utils.py
   trunk/lib/venus/planet/vendor/htmltmpl.py
   trunk/lib/venus/planet/vendor/httplib2/
   trunk/lib/venus/planet/vendor/httplib2/__init__.py
   trunk/lib/venus/planet/vendor/httplib2/iri2uri.py
   trunk/lib/venus/planet/vendor/portalocker.py
   trunk/lib/venus/planet/vendor/timeoutsocket.py
   trunk/lib/venus/spider.py
   trunk/lib/venus/splice.py
   trunk/lib/venus/sucs/
   trunk/lib/venus/sucs/Planet.txt.tmpl
   trunk/lib/venus/sucs/atom.xml.tmpl
   trunk/lib/venus/sucs/foafroll.xml.tmpl
   trunk/lib/venus/sucs/opml.xml.tmpl
   trunk/lib/venus/sucs/rss10.xml.tmpl
   trunk/lib/venus/sucs/rss20.xml.tmpl
   trunk/lib/venus/themes/
   trunk/lib/venus/themes/asf/
   trunk/lib/venus/themes/asf/config.ini
   trunk/lib/venus/themes/asf/default.css
   trunk/lib/venus/themes/asf/index.html.xslt
   trunk/lib/venus/themes/asf/personalize.js
   trunk/lib/venus/themes/classic_fancy/
   trunk/lib/venus/themes/classic_fancy/config.ini
   trunk/lib/venus/themes/classic_fancy/index.html.tmpl
   trunk/lib/venus/themes/classic_fancy/planet.css
   trunk/lib/venus/themes/common/
   trunk/lib/venus/themes/common/atom.xml.xslt
   trunk/lib/venus/themes/common/foafroll.xml.xslt
   trunk/lib/venus/themes/common/images/
   trunk/lib/venus/themes/common/images/feed-icon-10x10.png
   trunk/lib/venus/themes/common/images/foaf.png
   trunk/lib/venus/themes/common/images/logo.png
   trunk/lib/venus/themes/common/images/opml.png
   trunk/lib/venus/themes/common/images/planet.png
   trunk/lib/venus/themes/common/images/tcosm11.gif
   trunk/lib/venus/themes/common/images/venus.ico
   trunk/lib/venus/themes/common/images/venus.png
   trunk/lib/venus/themes/common/opml.xml.xslt
   trunk/lib/venus/themes/common/rss10.xml.tmpl
   trunk/lib/venus/themes/common/rss20.xml.tmpl
   trunk/lib/venus/themes/common/validate.html.xslt
   trunk/lib/venus/themes/django/
   trunk/lib/venus/themes/django/bland.css
   trunk/lib/venus/themes/django/config.ini
   trunk/lib/venus/themes/django/index.html.dj
   trunk/lib/venus/themes/genshi_fancy/
   trunk/lib/venus/themes/genshi_fancy/config.ini
   trunk/lib/venus/themes/genshi_fancy/index.html.genshi
   trunk/lib/venus/themes/genshi_fancy/planet.css
   trunk/lib/venus/themes/mobile/
   trunk/lib/venus/themes/mobile/config.ini
   trunk/lib/venus/themes/mobile/mobile.html.xslt
   trunk/lib/venus/themes/musings/
   trunk/lib/venus/themes/musings/config.ini
   trunk/lib/venus/themes/musings/default.css
   trunk/lib/venus/themes/musings/images/
   trunk/lib/venus/themes/musings/index.html.xslt
   trunk/lib/venus/themes/musings/personalize.js
   trunk/templates/banana-awardlist.tpl
   trunk/templates/election-results.tpl
   trunk/templates/election-vote.tpl
   trunk/templates/event.tpl
   trunk/templates/event_edit.tpl
   trunk/templates/events.tpl
   trunk/templates/feedback.tpl
   trunk/templates/junk.tpl
   trunk/templates/library-addbook.tpl
   trunk/templates/library-book-edit.tpl
   trunk/templates/library-book.tpl
   trunk/templates/membershiprenew-options.tpl
   trunk/templates/membershiprenew.tpl
   trunk/templates/milliways_status.tpl
   trunk/templates/milliways_tag.tpl
   trunk/templates/milliways_taglist.tpl
   trunk/templates/milliways_uri.tpl
   trunk/templates/signup-admin.tpl
   trunk/templates/signup.tpl
   trunk/templates/susignup-admin.tpl
   trunk/templates/susignup.tpl
Removed:
   trunk/components/blogadmin.php
   trunk/components/blogfeed.php
   trunk/components/blogs.php
   trunk/components/forum.php
   trunk/components/forumposts.php
   trunk/components/planet.php
   trunk/components/planetposts.php
   trunk/db_changes/sucssite-0.3.sql
   trunk/htdocs/css/forum/
   trunk/htdocs/js/tinymce/docs/about.html
   trunk/htdocs/js/tinymce/docs/compatiblity_chart.html
   trunk/htdocs/js/tinymce/docs/credits.html
   trunk/htdocs/js/tinymce/docs/css/
   trunk/htdocs/js/tinymce/docs/css/screen.css
   trunk/htdocs/js/tinymce/docs/customization_language_packs.html
   trunk/htdocs/js/tinymce/docs/customization_plugins.html
   trunk/htdocs/js/tinymce/docs/customization_themes.html
   trunk/htdocs/js/tinymce/docs/faq.html
   trunk/htdocs/js/tinymce/docs/images/
   trunk/htdocs/js/tinymce/docs/images/moxiecode.gif
   trunk/htdocs/js/tinymce/docs/index.html
   trunk/htdocs/js/tinymce/docs/installation_example_00.html
   trunk/htdocs/js/tinymce/docs/installation_example_01.html
   trunk/htdocs/js/tinymce/docs/installation_example_02.html
   trunk/htdocs/js/tinymce/docs/installation_example_03.html
   trunk/htdocs/js/tinymce/docs/installing.html
   trunk/htdocs/js/tinymce/docs/license.html
   trunk/htdocs/js/tinymce/docs/option_accessibility_focus.html
   trunk/htdocs/js/tinymce/docs/option_accessibility_warnings.html
   trunk/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html
   trunk/htdocs/js/tinymce/docs/option_add_unload_trigger.html
   trunk/htdocs/js/tinymce/docs/option_apply_source_formatting.html
   trunk/htdocs/js/tinymce/docs/option_ask.html
   trunk/htdocs/js/tinymce/docs/option_auto_focus.html
   trunk/htdocs/js/tinymce/docs/option_auto_reset_designmode.html
   trunk/htdocs/js/tinymce/docs/option_auto_resize.html
   trunk/htdocs/js/tinymce/docs/option_browsers.html
   trunk/htdocs/js/tinymce/docs/option_button_tile_map.html
   trunk/htdocs/js/tinymce/docs/option_cleanup.html
   trunk/htdocs/js/tinymce/docs/option_cleanup_callback.html
   trunk/htdocs/js/tinymce/docs/option_cleanup_on_startup.html
   trunk/htdocs/js/tinymce/docs/option_content_css.html
   trunk/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html
   trunk/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html
   trunk/htdocs/js/tinymce/docs/option_convert_urls.html
   trunk/htdocs/js/tinymce/docs/option_custom_shortcuts.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html
   trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html
   trunk/htdocs/js/tinymce/docs/option_debug.html
   trunk/htdocs/js/tinymce/docs/option_dialog_type.html
   trunk/htdocs/js/tinymce/docs/option_directionality.html
   trunk/htdocs/js/tinymce/docs/option_display_tab_class.html
   trunk/htdocs/js/tinymce/docs/option_docs_language.html
   trunk/htdocs/js/tinymce/docs/option_doctype.html
   trunk/htdocs/js/tinymce/docs/option_document_base_url.html
   trunk/htdocs/js/tinymce/docs/option_editor_css.html
   trunk/htdocs/js/tinymce/docs/option_editor_deselector.html
   trunk/htdocs/js/tinymce/docs/option_editor_selector.html
   trunk/htdocs/js/tinymce/docs/option_elements.html
   trunk/htdocs/js/tinymce/docs/option_encoding.html
   trunk/htdocs/js/tinymce/docs/option_entities.html
   trunk/htdocs/js/tinymce/docs/option_entity_encoding.html
   trunk/htdocs/js/tinymce/docs/option_event_elements.html
   trunk/htdocs/js/tinymce/docs/option_execcommand_callback.html
   trunk/htdocs/js/tinymce/docs/option_extended_valid_elements.html
   trunk/htdocs/js/tinymce/docs/option_external_image_list_url.html
   trunk/htdocs/js/tinymce/docs/option_external_link_list_url.html
   trunk/htdocs/js/tinymce/docs/option_file_browser_callback.html
   trunk/htdocs/js/tinymce/docs/option_fix_content_duplication.html
   trunk/htdocs/js/tinymce/docs/option_fix_list_elements.html
   trunk/htdocs/js/tinymce/docs/option_fix_table_elements.html
   trunk/htdocs/js/tinymce/docs/option_focus_alert.html
   trunk/htdocs/js/tinymce/docs/option_font_size_classes.html
   trunk/htdocs/js/tinymce/docs/option_font_size_style_values.html
   trunk/htdocs/js/tinymce/docs/option_force_br_newlines.html
   trunk/htdocs/js/tinymce/docs/option_force_hex_style_colors.html
   trunk/htdocs/js/tinymce/docs/option_force_p_newlines.html
   trunk/htdocs/js/tinymce/docs/option_handle_event_callback.html
   trunk/htdocs/js/tinymce/docs/option_height.html
   trunk/htdocs/js/tinymce/docs/option_hidden_tab_class.html
   trunk/htdocs/js/tinymce/docs/option_init_instance_callback.html
   trunk/htdocs/js/tinymce/docs/option_inline_styles.html
   trunk/htdocs/js/tinymce/docs/option_insertimage_callback.html
   trunk/htdocs/js/tinymce/docs/option_insertlink_callback.html
   trunk/htdocs/js/tinymce/docs/option_invalid_elements.html
   trunk/htdocs/js/tinymce/docs/option_language.html
   trunk/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html
   trunk/htdocs/js/tinymce/docs/option_mode.html
   trunk/htdocs/js/tinymce/docs/option_nowrap.html
   trunk/htdocs/js/tinymce/docs/option_object_resizing.html
   trunk/htdocs/js/tinymce/docs/option_onchange_callback.html
   trunk/htdocs/js/tinymce/docs/option_oninit.html
   trunk/htdocs/js/tinymce/docs/option_onpageload.html
   trunk/htdocs/js/tinymce/docs/option_plugins.html
   trunk/htdocs/js/tinymce/docs/option_popups_css.html
   trunk/htdocs/js/tinymce/docs/option_preformatted.html
   trunk/htdocs/js/tinymce/docs/option_relative_urls.html
   trunk/htdocs/js/tinymce/docs/option_remove_linebreaks.html
   trunk/htdocs/js/tinymce/docs/option_remove_script_host.html
   trunk/htdocs/js/tinymce/docs/option_save_callback.html
   trunk/htdocs/js/tinymce/docs/option_setupcontent_callback.html
   trunk/htdocs/js/tinymce/docs/option_strict_loading_mode.html
   trunk/htdocs/js/tinymce/docs/option_submit_patch.html
   trunk/htdocs/js/tinymce/docs/option_table_inline_editing.html
   trunk/htdocs/js/tinymce/docs/option_textarea_trigger.html
   trunk/htdocs/js/tinymce/docs/option_theme.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_container.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_container_align.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_container_class.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_containers.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_containers_default_align.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_containers_default_class.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_custom_layout.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_disable.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_fonts.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_layout_manager.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_link_targets.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_path.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_path_location.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_resize_horizontal.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_resizing.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_resizing_use_cookie.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_source_editor_height.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_source_editor_width.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_source_editor_wrap.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_statusbar_location.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_styles.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_toolbar_align.html
   trunk/htdocs/js/tinymce/docs/option_theme_advanced_toolbar_location.html
   trunk/htdocs/js/tinymce/docs/option_trim_span_elements.html
   trunk/htdocs/js/tinymce/docs/option_urlconverter_callback.html
   trunk/htdocs/js/tinymce/docs/option_valid_elements.html
   trunk/htdocs/js/tinymce/docs/option_verify_css_classes.html
   trunk/htdocs/js/tinymce/docs/option_verify_html.html
   trunk/htdocs/js/tinymce/docs/option_visual.html
   trunk/htdocs/js/tinymce/docs/option_visual_table_class.html
   trunk/htdocs/js/tinymce/docs/option_width.html
   trunk/htdocs/js/tinymce/docs/plugin_advhr.html
   trunk/htdocs/js/tinymce/docs/plugin_advimage.html
   trunk/htdocs/js/tinymce/docs/plugin_advlink.html
   trunk/htdocs/js/tinymce/docs/plugin_autosave.html
   trunk/htdocs/js/tinymce/docs/plugin_contextmenu.html
   trunk/htdocs/js/tinymce/docs/plugin_directionality.html
   trunk/htdocs/js/tinymce/docs/plugin_emotions.html
   trunk/htdocs/js/tinymce/docs/plugin_flash.html
   trunk/htdocs/js/tinymce/docs/plugin_fullpage.html
   trunk/htdocs/js/tinymce/docs/plugin_fullscreen.html
   trunk/htdocs/js/tinymce/docs/plugin_iespell.html
   trunk/htdocs/js/tinymce/docs/plugin_inlinepopups.html
   trunk/htdocs/js/tinymce/docs/plugin_insertdatetime.html
   trunk/htdocs/js/tinymce/docs/plugin_layer.html
   trunk/htdocs/js/tinymce/docs/plugin_noneditable.html
   trunk/htdocs/js/tinymce/docs/plugin_paste.html
   trunk/htdocs/js/tinymce/docs/plugin_preview.html
   trunk/htdocs/js/tinymce/docs/plugin_print.html
   trunk/htdocs/js/tinymce/docs/plugin_save.html
   trunk/htdocs/js/tinymce/docs/plugin_searchreplace.html
   trunk/htdocs/js/tinymce/docs/plugin_spellchecker.html
   trunk/htdocs/js/tinymce/docs/plugin_style.html
   trunk/htdocs/js/tinymce/docs/plugin_table.html
   trunk/htdocs/js/tinymce/docs/plugin_zoom.html
   trunk/htdocs/js/tinymce/docs/reference_buttons.html
   trunk/htdocs/js/tinymce/docs/reference_configuration.html
   trunk/htdocs/js/tinymce/docs/reference_javascript_functions.html
   trunk/htdocs/js/tinymce/docs/reference_plugins.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/
   trunk/htdocs/js/tinymce/docs/tinymce_api/GLOBALS.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Cleanup.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Control.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Engine.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Layer.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Popup.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_Selection.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/TinyMCE_UndoRedo.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/allclasses-frame.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/allclasses-noframe.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/help-doc.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/index-all.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/index.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Array.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Cleanup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Control.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_DOMUtils.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Debug.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Engine.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Event.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_ForceParagraphs.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Layer.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Menu.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Popup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_Selection.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_URL.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-TinyMCE_UndoRedo.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-frame.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Array.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Cleanup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Control.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_DOMUtils.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Debug.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Engine.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Event.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_ForceParagraphs.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Layer.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Menu.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Popup.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_Selection.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_URL.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary-TinyMCE_UndoRedo.class.js.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-summary.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/overview-tree.html
   trunk/htdocs/js/tinymce/docs/tinymce_api/stylesheet.css
   trunk/htdocs/js/tinymce/examples/example_advanced.css
   trunk/htdocs/js/tinymce/examples/example_advanced.htm
   trunk/htdocs/js/tinymce/examples/example_flash_list.js
   trunk/htdocs/js/tinymce/examples/example_full.css
   trunk/htdocs/js/tinymce/examples/example_full.htm
   trunk/htdocs/js/tinymce/examples/example_image_list.js
   trunk/htdocs/js/tinymce/examples/example_link_list.js
   trunk/htdocs/js/tinymce/examples/example_simple.htm
   trunk/htdocs/js/tinymce/examples/example_word.css
   trunk/htdocs/js/tinymce/examples/example_word.htm
   trunk/htdocs/js/tinymce/examples/logo.jpg
   trunk/htdocs/js/tinymce/examples/logo_over.jpg
   trunk/lib/Validate/ISPN.php
   trunk/lib/Validate/Validate.php
   trunk/lib/blog/
   trunk/lib/venus/.htaccess
   trunk/lib/venus/AUTHORS
   trunk/lib/venus/LICENCE
   trunk/lib/venus/README
   trunk/lib/venus/THANKS
   trunk/lib/venus/TODO
   trunk/lib/venus/docs/
   trunk/lib/venus/docs/config.html
   trunk/lib/venus/docs/contributing.html
   trunk/lib/venus/docs/docs.css
   trunk/lib/venus/docs/docs.js
   trunk/lib/venus/docs/etiquette.html
   trunk/lib/venus/docs/filters.html
   trunk/lib/venus/docs/img/
   trunk/lib/venus/docs/img/shadowAlpha.png
   trunk/lib/venus/docs/index.html
   trunk/lib/venus/docs/installation.html
   trunk/lib/venus/docs/migration.html
   trunk/lib/venus/docs/normalization.html
   trunk/lib/venus/docs/templates.html
   trunk/lib/venus/docs/venus.svg
   trunk/lib/venus/examples/
   trunk/lib/venus/examples/filters/
   trunk/lib/venus/examples/filters/categories/
   trunk/lib/venus/examples/filters/categories/categories.xslt
   trunk/lib/venus/examples/filters/guess-language/
   trunk/lib/venus/examples/filters/guess-language/README
   trunk/lib/venus/examples/filters/guess-language/en.data
   trunk/lib/venus/examples/filters/guess-language/fr.data
   trunk/lib/venus/examples/filters/guess-language/guess-language.py
   trunk/lib/venus/examples/filters/guess-language/learn-language.py
   trunk/lib/venus/examples/filters/guess-language/trigram.py
   trunk/lib/venus/examples/filters/xpath-sifter/
   trunk/lib/venus/examples/filters/xpath-sifter/xpath-sifter.ini
   trunk/lib/venus/examples/foaf-based.ini
   trunk/lib/venus/examples/images/
   trunk/lib/venus/examples/images/edd.png
   trunk/lib/venus/examples/images/jdub.png
   trunk/lib/venus/examples/images/keybuk.png
   trunk/lib/venus/examples/images/thom.png
   trunk/lib/venus/examples/opml-top100.ini
   trunk/lib/venus/examples/planet-schmanet.ini
   trunk/lib/venus/expunge.py
   trunk/lib/venus/filters/
   trunk/lib/venus/filters/addsearch.genshi
   trunk/lib/venus/filters/addsearch.xslt
   trunk/lib/venus/filters/coral_cdn_filter.py
   trunk/lib/venus/filters/delDupName/
   trunk/lib/venus/filters/delDupName/byline_author.xslt
   trunk/lib/venus/filters/delDupName/p_by_name.xslt
   trunk/lib/venus/filters/delDupName/p_from.xslt
   trunk/lib/venus/filters/detitle.xslt
   trunk/lib/venus/filters/excerpt.py
   trunk/lib/venus/filters/h1title.xslt
   trunk/lib/venus/filters/html2xhtml.plugin
   trunk/lib/venus/filters/mememe.plugin
   trunk/lib/venus/filters/minhead.py
   trunk/lib/venus/filters/notweets.py
   trunk/lib/venus/filters/regexp_sifter.py
   trunk/lib/venus/filters/stripAd/
   trunk/lib/venus/filters/stripAd/feedburner.sed
   trunk/lib/venus/filters/stripAd/google_ad_map.sed
   trunk/lib/venus/filters/stripAd/yahoo.sed
   trunk/lib/venus/filters/xhtml2html.plugin
   trunk/lib/venus/filters/xpath_sifter.py
   trunk/lib/venus/planet.py
   trunk/lib/venus/planet/
   trunk/lib/venus/planet/__init__.py
   trunk/lib/venus/planet/config.py
   trunk/lib/venus/planet/csv_config.py
   trunk/lib/venus/planet/expunge.py
   trunk/lib/venus/planet/foaf.py
   trunk/lib/venus/planet/idindex.py
   trunk/lib/venus/planet/opml.py
   trunk/lib/venus/planet/reconstitute.py
   trunk/lib/venus/planet/scrub.py
   trunk/lib/venus/planet/shell/
   trunk/lib/venus/planet/shell/__init__.py
   trunk/lib/venus/planet/shell/_genshi.py
   trunk/lib/venus/planet/shell/dj.py
   trunk/lib/venus/planet/shell/plugin.py
   trunk/lib/venus/planet/shell/py.py
   trunk/lib/venus/planet/shell/sed.py
   trunk/lib/venus/planet/shell/tmpl.py
   trunk/lib/venus/planet/shell/xslt.py
   trunk/lib/venus/planet/spider.py
   trunk/lib/venus/planet/splice.py
   trunk/lib/venus/planet/vendor/
   trunk/lib/venus/planet/vendor/compat_logging/
   trunk/lib/venus/planet/vendor/compat_logging/__init__.py
   trunk/lib/venus/planet/vendor/compat_logging/config.py
   trunk/lib/venus/planet/vendor/compat_logging/handlers.py
   trunk/lib/venus/planet/vendor/feedparser.py
   trunk/lib/venus/planet/vendor/html5lib/
   trunk/lib/venus/planet/vendor/html5lib/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/constants.py
   trunk/lib/venus/planet/vendor/html5lib/filters/
   trunk/lib/venus/planet/vendor/html5lib/filters/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/filters/_base.py
   trunk/lib/venus/planet/vendor/html5lib/filters/inject_meta_charset.py
   trunk/lib/venus/planet/vendor/html5lib/filters/lint.py
   trunk/lib/venus/planet/vendor/html5lib/filters/optionaltags.py
   trunk/lib/venus/planet/vendor/html5lib/filters/whitespace.py
   trunk/lib/venus/planet/vendor/html5lib/html5parser.py
   trunk/lib/venus/planet/vendor/html5lib/inputstream.py
   trunk/lib/venus/planet/vendor/html5lib/liberalxmlparser.py
   trunk/lib/venus/planet/vendor/html5lib/sanitizer.py
   trunk/lib/venus/planet/vendor/html5lib/serializer/
   trunk/lib/venus/planet/vendor/html5lib/serializer/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/serializer/htmlserializer.py
   trunk/lib/venus/planet/vendor/html5lib/serializer/xhtmlserializer.py
   trunk/lib/venus/planet/vendor/html5lib/tokenizer.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/_base.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/dom.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/etree.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/simpletree.py
   trunk/lib/venus/planet/vendor/html5lib/treebuilders/soup.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/__init__.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/_base.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/dom.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/etree.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/genshistream.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/pulldom.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/simpletree.py
   trunk/lib/venus/planet/vendor/html5lib/treewalkers/soup.py
   trunk/lib/venus/planet/vendor/html5lib/utils.py
   trunk/lib/venus/planet/vendor/htmltmpl.py
   trunk/lib/venus/planet/vendor/httplib2/
   trunk/lib/venus/planet/vendor/httplib2/__init__.py
   trunk/lib/venus/planet/vendor/httplib2/iri2uri.py
   trunk/lib/venus/planet/vendor/portalocker.py
   trunk/lib/venus/planet/vendor/timeoutsocket.py
   trunk/lib/venus/spider.py
   trunk/lib/venus/splice.py
   trunk/lib/venus/sucs/
   trunk/lib/venus/sucs/Planet.txt.tmpl
   trunk/lib/venus/sucs/atom.xml.tmpl
   trunk/lib/venus/sucs/foafroll.xml.tmpl
   trunk/lib/venus/sucs/opml.xml.tmpl
   trunk/lib/venus/sucs/rss10.xml.tmpl
   trunk/lib/venus/sucs/rss20.xml.tmpl
   trunk/lib/venus/themes/
   trunk/lib/venus/themes/asf/
   trunk/lib/venus/themes/asf/config.ini
   trunk/lib/venus/themes/asf/default.css
   trunk/lib/venus/themes/asf/index.html.xslt
   trunk/lib/venus/themes/asf/personalize.js
   trunk/lib/venus/themes/classic_fancy/
   trunk/lib/venus/themes/classic_fancy/config.ini
   trunk/lib/venus/themes/classic_fancy/index.html.tmpl
   trunk/lib/venus/themes/classic_fancy/planet.css
   trunk/lib/venus/themes/common/
   trunk/lib/venus/themes/common/atom.xml.xslt
   trunk/lib/venus/themes/common/foafroll.xml.xslt
   trunk/lib/venus/themes/common/images/
   trunk/lib/venus/themes/common/images/feed-icon-10x10.png
   trunk/lib/venus/themes/common/images/foaf.png
   trunk/lib/venus/themes/common/images/logo.png
   trunk/lib/venus/themes/common/images/opml.png
   trunk/lib/venus/themes/common/images/planet.png
   trunk/lib/venus/themes/common/images/tcosm11.gif
   trunk/lib/venus/themes/common/images/venus.ico
   trunk/lib/venus/themes/common/images/venus.png
   trunk/lib/venus/themes/common/opml.xml.xslt
   trunk/lib/venus/themes/common/rss10.xml.tmpl
   trunk/lib/venus/themes/common/rss20.xml.tmpl
   trunk/lib/venus/themes/common/validate.html.xslt
   trunk/lib/venus/themes/django/
   trunk/lib/venus/themes/django/bland.css
   trunk/lib/venus/themes/django/config.ini
   trunk/lib/venus/themes/django/index.html.dj
   trunk/lib/venus/themes/genshi_fancy/
   trunk/lib/venus/themes/genshi_fancy/config.ini
   trunk/lib/venus/themes/genshi_fancy/index.html.genshi
   trunk/lib/venus/themes/genshi_fancy/planet.css
   trunk/lib/venus/themes/mobile/
   trunk/lib/venus/themes/mobile/config.ini
   trunk/lib/venus/themes/mobile/mobile.html.xslt
   trunk/lib/venus/themes/musings/
   trunk/lib/venus/themes/musings/config.ini
   trunk/lib/venus/themes/musings/default.css
   trunk/lib/venus/themes/musings/images/
   trunk/lib/venus/themes/musings/index.html.xslt
   trunk/lib/venus/themes/musings/personalize.js
   trunk/templates/forumposts.tpl
   trunk/templates/planetposts.tpl
Modified:
   trunk/
   trunk/ChangeLog
   trunk/components/README
   trunk/components/bananas.php
   trunk/components/contents.php
   trunk/components/email.php
   trunk/components/front.php
   trunk/components/library.php
   trunk/components/members.php
   trunk/components/menu.php
   trunk/components/milliways.php
   trunk/components/motd.php
   trunk/components/mw.php
   trunk/components/news.php
   trunk/components/options.php
   trunk/components/pagemap.php
   trunk/components/pastebin.php
   trunk/components/projects.php
   trunk/components/signup.php
   trunk/components/societies.php
   trunk/components/static.php
   trunk/components/uri.php
   trunk/htdocs/
   trunk/htdocs/css/blog.css
   trunk/htdocs/css/common.css
   trunk/htdocs/css/ie.css
   trunk/htdocs/css/sucs.css
   trunk/htdocs/desktop/1024x768.html
   trunk/htdocs/desktop/640x480.html
   trunk/htdocs/desktop/800x600.html
   trunk/htdocs/desktop/VncViewer.jar
   trunk/htdocs/files/
   trunk/htdocs/files/Help/mw-script.tar.gz
   trunk/htdocs/images/bananas/banana-bunch.png
   trunk/htdocs/images/bananas/banana-crate.png
   trunk/htdocs/images/bananas/banana-g-1.png
   trunk/htdocs/images/bananas/banana-g-2.png
   trunk/htdocs/images/bananas/banana-g-3.png
   trunk/htdocs/images/bananas/banana-g-bunch.png
   trunk/htdocs/images/bananas/banana-g-crate.png
   trunk/htdocs/images/bananas/banana-g-one.png
   trunk/htdocs/images/bananas/banana-one.png
   trunk/htdocs/images/bananas/banana-zero.png
   trunk/htdocs/images/bananas/banana1.png
   trunk/htdocs/images/bananas/banana2.png
   trunk/htdocs/images/bananas/banana3.png
   trunk/htdocs/images/border-bottom-left.png
   trunk/htdocs/images/border-bottom-right.png
   trunk/htdocs/images/border-bottom.png
   trunk/htdocs/images/borders.png
   trunk/htdocs/images/box.png
   trunk/htdocs/images/google.png
   trunk/htdocs/images/hostedby.png
   trunk/htdocs/images/left-bottom-corner.png
   trunk/htdocs/images/left-top-corner.png
   trunk/htdocs/images/menu-bottom-left.png
   trunk/htdocs/images/menu-bottom-right.png
   trunk/htdocs/images/menu-top-left.png
   trunk/htdocs/images/menu-top-right.png
   trunk/htdocs/images/orangefade-left.png
   trunk/htdocs/images/right-bottom-corner.png
   trunk/htdocs/images/right-top-corner.png
   trunk/htdocs/images/sucslogo-halo.png
   trunk/htdocs/images/sucslogo-main.png
   trunk/htdocs/images/sucslogo-opaque.png
   trunk/htdocs/images/sucslogo.png
   trunk/htdocs/index.php
   trunk/htdocs/js/tiny_mce.js
   trunk/htdocs/js/xmlhttp.js
   trunk/htdocs/pictures/people/
   trunk/lib/ArrayRenderer.php
   trunk/lib/banana-admin.php
   trunk/lib/date.php
   trunk/lib/error.php
   trunk/lib/members.php
   trunk/lib/session.php
   trunk/lib/validation.php
   trunk/plugins/function.articlesummary.php
   trunk/plugins/function.bananaprint.php
   trunk/plugins/function.buildpath.php
   trunk/settingstemplate
   trunk/setup.sh
   trunk/templates/banana-award.tpl
   trunk/templates/bananas.tpl
   trunk/templates/branding.tpl
   trunk/templates/breadcrumb.tpl
   trunk/templates/foot.tpl
   trunk/templates/head.tpl
   trunk/templates/index.tpl
   trunk/templates/library.tpl
   trunk/templates/login.tpl
   trunk/templates/members.tpl
   trunk/templates/menu.tpl
   trunk/templates/milliways.tpl
   trunk/templates/news.tpl
   trunk/templates/news_delete.tpl
   trunk/templates/news_edit.tpl
   trunk/templates/news_expire.tpl
   trunk/templates/options.tpl
   trunk/templates/pagemap.tpl
   trunk/templates/pastebin-sidebar.tpl
   trunk/templates/pastebin.tpl
   trunk/templates/search.cy.tpl
   trunk/templates/search.tpl
   trunk/templates/shop.tpl
   trunk/templates/societies.tpl
   trunk/templates/uri.tpl
   trunk/templates_c/
Log:
Merge branches/sucs-site into trunk. This means dropping support for the generic CMS. It was bad anyway, got no updates and had security holes that were fixed in the sucs specific one.


Property changes on: trunk
___________________________________________________________________
Added: svn:ignore
   + member
suapi.inc.php
static
*.tmp
templates_c

Added: svn:mergeinfo
   + /branches/imranh:590-591
/branches/sucs-site:318-656
/branches/sucs-site/branches/sucs-site:590-591

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/ChangeLog	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,3 +1,15 @@
+2008-01-29 - Version 0.3 "Logged Out"
+
+Sessions now last a lot longer and are more secure to boot (chckens)
+Library admin component allows adding books (chckens, eventually)
+Bananas component shelved in favour of Members component for most things (chckens)
+
+Fixes:
+Don't list societies with no website in the societies website list (chckens)
+Pastebin now redirects to url of pasted item to prevent confusion (chckens)
+News article summary can now deal with new lines in the first paragraph (chckens)
+
+
 2007-10-28 - Version 0.2 "Oktoberfest"
 
 Options component now allows users to change their hackergotchi (aeternus)

Modified: trunk/components/README
===================================================================
--- trunk/components/README	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/README	2015-04-05 16:42:47 UTC (rev 657)
@@ -24,7 +24,8 @@
 	[component]	component name
 
 $smarty		The smarty object
-$DB		The ADODB database object
+$DB		The sucssite ADODB database object
+$sucsDB		The sucs ADODB databse object
 $session	The Session object
 
 Session has the following properties
@@ -35,3 +36,11 @@
 
 any values stored in data[] will be persistant between pages
 for as long as the users session cookie stays active.
+
+For error handling, your component should use the trigger_error() function:
+
+trigger_error("Informational message", E_USER_INFO); // To inform the user that something happened, e.g. the session expired
+trigger_error("Warning message", E_USER_WARNING); // Warn the user of an expected error, e.g. incorrect password
+trigger_error("Error message", E_USER_ERROR); // Reserved for unexpected conditions, e.g. unable to connect to database
+
+You may also use the message_flash("status message") function for helpful messages, e.g. form submitted

Modified: trunk/components/bananas.php
===================================================================
--- trunk/components/bananas.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/bananas.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,33 +1,43 @@
 <?php
 
-/* as far as bananas are concerned, year ends after the beach party */
-$yearstart = date("Y")."-06-30";
+include_once("../lib/members.php");
 
-/* Banana viewing component. Looking a little obsolete since most of this is now in the members component */
+$members = new Members;
 
+/* Banana viewing component. Mostly obsolete since most of this is now in the members component */
+
 $banana_index = array_search("Bananas", $pathlist);
 if ((sizeof($pathlist) > $banana_index + 1) && (trim($pathlist[$banana_index + 1]) != "")) {
 	$mode = "detail";
 	$who = $pathlist[$banana_index + 1];
 } else {
-	$mode = "summary";
+	// User wasn't looking for anything in particular, so bump them to the Members page
+	header("HTTP/1.1 301 Moved Permanently");
+	header("Location: https://$preferred_hostname$baseurl/Community/Members/");
 }
 
-if (isset($who))
-	$smarty->assign('who', "$who");
+/* redirect requests for members' bananas to Members component. Only serve banana info for non-members (e.g. LIS ;-)) */
 
-// banana admin bits
-
-
-if ($mode == "detail") {
-	$smarty->assign("awards",$DB->GetAll("SELECT *, date_trunc('second', whn) FROM awards WHERE username=? AND whn > ? ORDER BY whn DESC", array($who, $yearstart)));
-	if ($session->loggedin) {
-		include("../lib/banana-admin.php");
+if (count($members->memberView($who)) > 0) {
+	// this is actually a real member, so serve a redirect and let Members handle it
+	header("HTTP/1.1 301 Moved Permanently");
+	header("Location: https://$preferred_hostname$baseurl/Community/Members/$who");
+} else {
+	// banana admin bits 
+	if ($mode == "detail") {
+		if ($session->loggedin) {
+			include("../lib/banana-admin.php");
+		}
 	}
+	// attempt to find some bananas for this name in the database
+	$smarty->assign("awards",$DB->GetAll("SELECT *, date_trunc('second', whn) FROM awards WHERE username=? ORDER BY whn DESC", array($who)));
 }
 
-$users = $DB->GetAll("SELECT username, sum(score) AS sum FROM awards WHERE whn > ? GROUP BY username ORDER BY sum(score) DESC, username", array($yearstart));
 
+if (isset($who))
+	$smarty->assign('who', "$who");
+
+
 $smarty->assign('mode', "$mode");
 $smarty->assign('users', $users);
 

Deleted: trunk/components/blogadmin.php
===================================================================
--- trunk/components/blogadmin.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/blogadmin.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,129 +0,0 @@
-<?php
-	//include our admin functions
-	include("../lib/blog/admin.lib.php");
-	$admin = new admin();
-
-	//make our command list from the path
-	$request=$pathlist;
-array_shift($request);
-array_shift($request);
-array_shift($request);
-
-$smarty->assign("title", "Blog Admin");
-
-	if ($session->loggedin) $admin->menu(); else {
-		header("Location: {$admin->httpPath}");
-		exit;
-	}
-
-ob_start();
-		//alter the debuging state on request
-		if ($request[0] == "debug") {
-			$_SESSION[debug] = $request[1];
-		}
-		//if logged in
-		if($session->loggedin && blogger($session->username)) {
-				//call appropriate functions..
-				switch (array_shift($request)) {
-					case "newentry":
-						$admin->printEntryForm() ;
-						$smarty->assign("subselect", _("Write new entry"));
-						if ($admin->blog->editor) $smarty->assign("action", "edit");
-						break;
-					case "Settings":
-						if ($_REQUEST['submit'] == "Save Settings") {
-							$admin->updateSettings();
-						} else {
-							$admin->printSettingsForm() ;
-						}
-						$smarty->assign("subselect", _("Settings"));
-						break;
-					case "postentry":
-						$admin->postEntry() ;
-						break;
-					case "postupdate":
-						$admin->updateEntry(array_shift($request)) ;
-						break;
-					case "update":
-						$admin->updateForm(array_shift($request)) ;
-						$smarty->assign("subselect", _("Edit entries"));
-						if ($admin->blog->editor) $smarty->assign("action", "edit");
-						break;
-					case "showentries":
-						$admin->printEntries() ;
-						$smarty->assign("subselect", _("Edit entries"));
-						break;
-					case "deleteentry":
-						$admin->deleteEntry(array_shift($request)) ;
-						break;
-					case "confirmdeleteentries":
-						$admin->confirmDeleteEntries();
-						break;
-					case "deleteentries":
-						$admin->deleteEntries();
-						break;
-					case "moderatecomments":
-						$admin->printComments();
-						$admin->printAuthorisedUsers();
-						$comments=_("Comments");
-						$result = $BlogDB->GetOne("SELECT count(comments.id) from comments join entries on comments.post = entries.id where moderated = false and entries.user_id = ".$admin->id.";");
-						if($result){
-							$comments .= " (".$result[0].")";
-						}
-						$smarty->assign("subselect", $comments);
-						break;
-					case "updatecomments":
-						$admin->updateComments();
-						break;
-					case "deletecomments":
-						$admin->deleteComments(array_shift($request));
-						break;
-					case "updateauthusers":
-						$admin->updateAuthorisedUsers();
-						break;
-					default:
-						$admin->mainPage();
-				}
-		}
-		else {
-			//run appropriate functions
-			switch (array_shift($request)) {
-				case "signup":
-					$admin->addUserForm();
-					$smarty->assign("subselect", _("Start a Blog"));
-					break;
-				case "adduser":
-					$admin->addUser();
-					break;
-				//or offer login box
-				default:
-					$admin->addUserForm();
-					$smarty->assign("subselect", _("Start a Blog"));
-					break;
-			}
-		}
-
-	?>
-    <div id="bottompanel">
-	<p><? echo _("Validate"); ?> : <a href="http://validator.w3.org/check?uri=referer">XHTML</a> / <a href="http://jigsaw.w3.org/css-validator/check/referer/">CSS</a></p>
-    </div>
-<?php
-$page = ob_get_contents();
-ob_end_clean();
-
-$smarty->assign("body", $page);
-$smarty->assign("extra_styles", "/css/blog.css");
-
-
-	//if we are in debug mode display a bunch of stuff
-	if($_SESSION[debug]){
-		echo "<div class=\"debug\"><h2>"._("Debug Info")."</h2><pre>\n";
-		echo "**"._("Session")."**\n";
-		print_r($_SESSION);
-		echo "**"._("Request")."**\n";
-		print_r($_REQUEST);
-		echo "**"._("Class")."**\n";
-		print_r($admin);
-		echo "</pre></div>";
-	}
-?>

Deleted: trunk/components/blogfeed.php
===================================================================
--- trunk/components/blogfeed.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/blogfeed.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,156 +0,0 @@
-<?php
-/*
- * feed script - outputs an feed. Currently supports both RSS 2.0 and ATOM
- */
-
-// We're outputting raw XML, so want to turn the templating off
-$no_template = TRUE;
-
-//include the blog lib, and thus everything else we need
-include("../lib/blog/blog.lib.php");
-
-//setup our path and from that get the feed type and usernae
-$request = explode('/', substr($_SERVER['PATH_INFO'], 1));
-array_shift($request);
-array_shift($request);
-//default to rss (so old links and existing feed readers still work, would be nice to ditch this at some point)
-$feedtype = 'rss';
-if ($request[0] == 'rss' or $request[0] == 'atom'){
-	$feedtype = array_shift($request);
-}
-//grab the username
-$user = array('username'=> array_shift($request));
-//check the user is sane
-if(!safeuname($user['username'])){
-	error(1,"Invalid username");
-}
-//check the user exists
-$row = $BlogDB->GetRow("SELECT username, id, name, title, description FROM users WHERE username='".$user['username']."' AND enabled=true;");
-if(!$row){
-	error(1, "No such user");
-}
-else {
-	//fetch the users info from the db
-	$user = $row;
-	if(substr(dirname($_SERVER['SCRIPT_NAME']), -1)=="/"){
-		$user['link'] = "http://".$_SERVER['HTTP_HOST']."/blogs/".$user['username']."/";
-		$user['feed'] = "http://".$_SERVER['HTTP_HOST']."/blog/feed/".$feedtype."/".$user['username']."";
-	}
-	else {
-		$user['link'] = "http://".$_SERVER['HTTP_HOST']."/blogs/".$user['username']."/";
-		$user['feed'] = "http://".$_SERVER['HTTP_HOST']."/blog/feed/".$feedtype."/".$user['username']."";
-	}
-}
-
-//check to see if we are only interested in one category
-switch(array_shift($request)){
-	case "category":
-		$extra = " AND category=".(int)array_shift($request);
-		break;
-	default:
-		$extra = "";
-}
-
-//grab the first 15 entires
-$query = "SELECT subject, body, timestamp, shortsubject FROM entries WHERE user_id=".$user['id'].$extra." ORDER BY timestamp DESC LIMIT 15;";
-$result = $BlogDB->GetAll($query);
-
-//if we have relivent entrys fetch them
-if (count($result) > 0) {
-	$row = array_shift($result);
-	//set the publish dates in the required format
-	if($feedtype=='rss') {
-		$pubdate = date("r",strtotime($row['timestamp']));
-	}
-	if($feedtype=='atom') {
-		//this should be a date type c when we are on php5, untill then, this nasty hack should work.
-		$pubdate = ereg_replace(' ', 'T', $row['timestamp']).":00";
-	}
-	$entries = "";
-	//output this entry
-	if ($feedtype=='rss') {
-		do {
-			$entrydate = date("r",strtotime($row['timestamp']));
-			$entries .= "\t\t<item>\n";
-			$entries .= "\t\t\t<guid>".$user['link']."entry/".$row['shortsubject']."</guid>\n";
-			$entries .= "\t\t\t<title>" . $row['subject'] . "</title>\n";
-			$entries .= "\t\t\t<description><![CDATA[" . substr(strip_tags($row['body']),0,150) . " [...]]]></description>\n";
-			$entries .= "\t\t\t<link>".$user['link']."entry/".$row['shortsubject']."</link>\n";
-			$entries .= "\t\t\t<pubDate>" . $entrydate . "</pubDate>\n";
-			$entries .= "\t\t\t<dc:creator>".$user['name']."</dc:creator>\n";
-			$entries .= "\t\t\t<content:encoded><![CDATA[" . str_replace("'", "’", $row['body']) . "]]></content:encoded>\n";
-			$entries .= "\t\t</item>\n";
-			//and ever other 
-		} while ($row = array_shift($result));
-	}
-	if($feedtype=='atom') {
-		do {
-			$entrydate = ereg_replace(' ', 'T', $row['timestamp']).":00";
-			$entries .= "\t<entry>\n";
-			$entries .= "\t\t<title>".htmlentities($row['subject'])."</title>\n";
-			$entries .= "\t\t<link rel=\"alternate\" type=\"text/html\" href=\"".$user['link']."entry/".$row['shortsubject']."\"/>\n";
-			$entries .= "\t\t<id>".$user['link']."entry/".$row['shortsubject']."</id>\n";
-			$entries .= "\t\t<updated>".$entrydate."</updated>\n";
-			$entries .= "\t\t<content type=\"xhtml\" xml:lang=\"en\" xml:base=\"".$user['link']."entry/"."\">\n";
-			$entries .= "\t\t<div xmlns=\"http://www.w3.org/1999/xhtml\">\n";
-			//just passing though the raw body will cause the feed to fail if the code isnt valid, perhaps we should chuck everything though tidy on its way in (or even out) once we're on php5
-			$config = array('output-xhtml' => true, 'show-body-only' => true, 'wrap' => false);
-			$tidy = new tidy;
-			$tidy->parseString($row['body'], $config, 'utf8');
-			$tidy->cleanRepair();
-			$entries .= $tidy;
-			$entries .= "\t\t</div>\n";
-			$entries .= "\t\t</content>\n";
-			$entries .= "\t</entry>\n";
-		} while ($row = array_shift($result));
-	}
-}
-
-if($feedtype=='rss') {
-	//tell the client its xml and utf8 encoded (which it should be)
-	header("Content-type: application/rss+xml; charset=utf-8");
-	echo "<?xml version=\"1.0\" ?>\n";
-?>
-<rss version="2.0" 
-	xmlns:content="http://purl.org/rss/1.0/modules/content/"
-	xmlns:wfw="http://wellformedweb.org/CommentAPI/"
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
->
-	<channel>
-		<title><?php print $user['title']?></title>
-		<description><?php print $user['description']?></description>
-		<link><?php print $user['link']?></link>
-		<pubDate><?php echo $pubdate; ?></pubDate>
-		<generator>SUCS Blogs - http://sucs.org/blogs/</generator>
-		<language>en</language>
-		<?php 
-		// add our entrys here
-		echo $entries; ?>
-	</channel>
-</rss>
-<?
-}
-if($feedtype=='atom') {
-	//tell the client its xml and utf8 encoded (which it should be)
-	header("Content-type: application/atom+xml; charset=utf-8");
-	echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
-	?>
-	<feed xmlns="http://www.w3.org/2005/Atom">
-		<title type="text"><?php print $user['title']?></title>
-		<subtitle type="text"><?php print $user['description']?></subtitle>
-		<updated><?php print $pubdate;?></updated>
-		<id><?php print $user['link']?></id>
-		<link rel="alternate" type="text/html" hreflang="en" href="<?php print $user['link']?>"/>
-		<link rel="self" type="application/atom+xml" href="<?php print $user['feed']?>"/>
-		<rights>Copyright (c) <? echo date("Y",strtotime($row['timestamp'])).", ".$user['name'] ?></rights>
-		<author>
-			<name><? echo $user['name'] ?></name>
-		</author>
-		<generator uri="http://sucs.org/blogs/" version="1.0">SUCS Blogs</generator>
-<?
-		echo $entries; 
-?>
-	</feed>
-<?
-}
-?>

Deleted: trunk/components/blogs.php
===================================================================
--- trunk/components/blogs.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/blogs.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,102 +0,0 @@
-<?php
-	//include our blog functions
-	require_once("../lib/blog/blog.lib.php");
-	//make our command list
-	$request=explode('/',substr($_SERVER['PATH_INFO'], 1));
-
-//bodge - fix this
-array_shift($request);
-
-	//if we have something which might be a username start a blogs instance
-	if ($request[0] != "" and $request[0] != "list"){
-		$blogsingle = new blogs(array_shift($request));
-	} 
-	//otherwise, or if there was no such user, start a bloglist instance
-	if (!isset($blogsingle) || !isset($blogsingle->id)) {
-		$bloglist = new bloglist();
-		$request = array("list");
-	}
-
-
-	$blog = isset($bloglist) ? $bloglist : $blogsingle;
-
-	if (isset($blog->userName)) {
-		if ($session->username==$blog->userName) $smarty->assign("subselect", _("My Blog"));
-		else $smarty->assign("subselect", $blog->userName._("'s Blog"));
-	}
-	
-	ob_start();
-
-$smarty->assign("title", $blog->title);
-$smarty->assign("extra_scripts", array("<script type=\"text/javascript\" src=\"/js/xmlhttp.js\"></script>"));
-	//check we have a valid username before offering a RSS feed
-	if($blog->userName) {
-		$smarty->assign("rss_url", "http://{$_SERVER['HTTP_HOST']}{$blog->httpPath}feed/rss/{$blog->userName}".(($request[0]=="category") ? "/category/".(int)$request[1]:""));
-		$smarty->assign("atom_url", "http://{$_SERVER['HTTP_HOST']}{$blog->httpPath}feed/atom/{$blog->userName}".(($request[0]=="category") ? "/category/".(int)$request[1]:""));
-//		echo "    <link rel=\"alternate\" type=\"application/rss+xml\" title=\"{$blog->title}\" href=\"$rss_url\"/>\n";
-//		echo "    <link rel=\"alternate\" type=\"application/atom+xml\" title=\"{$blog->title}\" href=\"$atom_url\"/>\n";
-	}
-
-ob_start();
-    
-$blog->menu();
-
-		// if there was an error, print it here
-		if (isset($blogsingle) && !isset($blogsingle->id)) {
-			error_exc($blogsingle);
-		}
-	    	//run the appropriate command
-		switch (array_shift($request)) {
-			case "entry":
-				$blog->printEntryAndComments(array_shift($request));
-				break;
-			case "category":
-				$blog->printEntries(0,15,'and category = '.(int)array_shift($request)); 
-				break;
-			case "postcomment":
-				$blog->newComment((int)array_shift($request)) ; 
-				break;
-			case "Archive":
-				$blog->printArchive($request);
-				if ($session->username == $blog->userName) $smarty->assign("subselect", _("My Archive"));
-				else $smarty->assign("subselect", $blog->userName._("'s Archive"));
-				break;
-			case "list":
-				$blog->listBlogs();
-				break;
-			default:
-				$blog->printEntries(); 
-		}
-	     ?>
-    <div id="bottompanel">
-	<p><? echo _("Validate"); ?> : <a href="http://validator.w3.org/check?uri=referer">XHTML</a> / <a href="http://jigsaw.w3.org/css-validator/check/referer/">CSS</a> / 
-<?
-	if($blog->userName) {
-		echo "<a href=\"http://feedvalidator.org/check.cgi?url=$rss_url\">RSS</a> / <a href=\"http://feedvalidator.org/check.cgi?url=$atom_url\">ATOM</a>";
-	}
-	else {
-		echo "RSS / ATOM";
-	}
-?>
-	</p>
-    </div>
-<?php
-$page = ob_get_contents();
-ob_end_clean();
-
-$smarty->assign("body", $page);
-$smarty->assign("extra_styles", "/css/blog.css");
-
-	//display debuing info as required
-	if($_SESSION[debug]){
-		echo "<div class=\"debug\"><h2>"._("Debug Info")."</h2><pre>\n";
-		echo "**"._("Session")."**\n";
-		print_r($_SESSION);
-		echo "**"._("Request")."**\n";
-		print_r($_REQUEST);
-		echo "**"._("Class")."**\n";
-		print_r($blog);
-		echo "</pre></div>";
-	}
-
-?>

Modified: trunk/components/contents.php
===================================================================
--- trunk/components/contents.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/contents.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -10,9 +10,9 @@
 		if ($file[0]!=".") {
 			$element = array();
 			if (!is_dir(SUCS_BASEDIR."static".$mypath."/".$file)) {
-				$pagename = ereg_replace("\.txt", "", $file);
+				$pagename = preg_replace("/\.txt/", "", $file);
 				if ($summaries) $element['summary'] = $DB->GetOne("select summary from static where path=?", array($mypath."/".$pagename));
-				if ($pagename!=@$lastdir) $output[$pagename]=$element;
+				if ($pagename!=@$lastdir) $output[$pagename]=str_replace("_", " ", $element);
 			} else {
 				if ($recurse) $element['file']=listdir($mypath."/".$file, $recurse, $summaries);
 				if ($summaries) $element['summary'] = $DB->GetOne("select summary from static where path=?", array($mypath."/".$file));

Copied: trunk/components/disk.graph.php (from rev 656, branches/sucs-site/components/disk.graph.php)
===================================================================
--- trunk/components/disk.graph.php	                        (rev 0)
+++ trunk/components/disk.graph.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,26 @@
+<?
+	exec("/usr/local/bin/shame.py -a", $Shame);
+	for ( $i=1 ; $i < (count($Shame) - 1); $i++)
+	{
+		list($space, $place, $user, $size) = preg_split("/ +/", $Shame[$i]);
+		if ($i <= 12)
+		{
+			$item[]=$user;
+			$slice[]=preg_replace('/M/', '', ${size});
+		}
+		else {
+			$otherSize += preg_replace('/M/', '', ${size});
+		}
+	}
+//	$itemName[]="Other";
+//	$sliceSize[]=$otherSize;
+	$slice = array_merge(array($otherSize),$slice);
+	$item = array_merge(array("Other"), $item);
+
+/*	echo "<pre>";
+	print_r($slice);
+	print_r($item);*/
+
+	include("../../lib/pieChart.php");
+	piechart("Top 12 Users of disk space", $slice, $item, 1)
+?>

Copied: trunk/components/disk.php (from rev 656, branches/sucs-site/components/disk.php)
===================================================================
--- trunk/components/disk.php	                        (rev 0)
+++ trunk/components/disk.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,51 @@
+<?	exec("/usr/local/bin/shame.py -a", $Shame);
+	$max=10; //SET to number of users to display 
+	$smarty->assign('title',"The SUCS Hall of Shame");
+//$o="<div style='text-align: center;'><img src=\"/images/disk.graph.php\" alt=\"pie chart of top 12 disk users\"/></div>";
+	$o.="<table align=\"center\">\n";
+	$o.="\t<tr><th align=\"center\">User</th><th align=\"center\">Home Directory Size</th></tr>\n";
+	for ( $i=1 ; $i < 13 /*(count($Shame) - 1)*/; $i++)
+	{
+		list($space, $place, $user, $size) = preg_split("/ +/", $Shame[$i]);
+		if ($size > 0)
+			$o.="\t<tr><td align=\"center\">$user</td><td align=\"center\">${size}B</td></tr>\n";
+	}
+	exec("df -m /home",$dfraw);
+	$dfout = preg_split('/[ ]+/', $dfraw[1]);
+	$o.="\t<tr><td align=\"center\" colspan=\"2\">".floor($dfout[2]/1024)."GB used of ".floor($dfout[1]/1024). "GB (".floor($dfout[3]/1024)."GB available)</td></tr>\n";
+	$o.="</table>\n";
+	$o.=$Shame[count($Shame) - 1];
+	$o.="<br />\n";
+	//readfile("tail.html");
+	$out="<script type=\"text/javascript\" src=\"https://www.google.com/jsapi\"></script>
+		    <script type=\"text/javascript\">
+      			google.load(\"visualization\", \"1\", {packages:[\"corechart\"]});
+			google.setOnLoadCallback(drawChart);
+			function drawChart() {
+
+		        	var data = new google.visualization.DataTable();
+			        data.addColumn('string', 'User');
+			        data.addColumn('number', 'Megabytes in use');
+				data.addRows(".(count($Shame) - 1).");\n";
+	for( $i=0; $i<(count($Shame) - 3); $i++ ){
+		list($u,$d)=parseLine($Shame[$i+1]);
+		$out.="data.setValue(".($i+1).", 0, '".$u."');\n";
+		$out.="data.setValue(".($i+1).", 1,".$d.");\n";
+	}
+	$others=0;
+	for ( $i=$max; $i<count($data); $i++ ) {
+	    list($u,$d)=parseLine($Shame[$i+1]);
+	    $others+=$d;
+	}
+	$out.="data.setValue(0, 0, 'Free Space');\ndata.setValue(0,1,".$dfout[3]." );\n";
+	$out.="\t\tvar chart = new google.visualization.PieChart(document.getElementById('chart_div'));
+	           chart.draw(data, {width: 500, height: 360, backgroundColor: 'none', is3D: true, title: 'Disk Usage',sliceVisibilityThreshold: 1/180});
+	           }
+	</script>";
+	$out.="<div id='chart_div' align='center'></div>";
+	$smarty->assign('body', ($out.$o));
+function parseLine($l){
+	$fields=explode("|",preg_filter("/[ ]+/","|",$l));
+	return array(trim($fields[2]),trim(str_replace("M","",$fields[3])));
+}
+?>

Copied: trunk/components/election.php (from rev 656, branches/sucs-site/components/election.php)
===================================================================
--- trunk/components/election.php	                        (rev 0)
+++ trunk/components/election.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,135 @@
+<?php 
+$smarty->assign("election_year", ELECTION_YEAR);
+$smarty->assign("title", "Executive Election ".ELECTION_YEAR);
+
+function display_ballot() {
+	global $DB, $smarty, $output;
+
+	require_once("../lib/members.php");
+	$members = new Members;
+	$role = $DB->GetAll("SELECT post FROM election_candidates GROUP BY post");
+
+	foreach ($role as $post) {
+		$candidate[$post['post']] = $DB->GetAll("SELECT username, manifesto_link FROM election_candidates WHERE post=? ORDER BY username ASC", $post['post']);
+
+		$i=0;
+		foreach ($candidate[$post['post']] as $person) {
+			$details = $members->memberView($person['username']);
+			$candidate[$post['post']][$i]['realname'] = $details[0]['cn'];
+			if (empty($person['manifesto_link'])) $candidate[$post['post']][$i]['manifesto_link'] = ELECTION_NO_MANIFESTO;
+			$i++;
+		}
+	}
+
+	$smarty->assign("candidate", $candidate);
+	$output = $smarty->fetch('election-vote.tpl');
+}
+
+
+if (!$session->loggedin) {
+	# You can't vote if you're not logged in!
+	trigger_error("You are not logged in.", E_USER_WARNING);
+} else {
+	# The election hasn't started yet
+	if (strtotime('now') < strtotime(ELECTION_START)) trigger_error("The polling station is not yet open. Voting begins on ".date('l jS F, Y \a\t H:i', strtotime(ELECTION_START)).".");
+
+	# The election is over - display the results
+	else if (strtotime('now') > strtotime(ELECTION_END)) {
+		require_once("../lib/members.php");
+		$members = new Members;
+		$role = $DB->GetAll("SELECT post FROM election_candidates GROUP BY post");
+
+		foreach ($role as $post) {
+			$candidate[$post['post']] = $DB->GetAll("SELECT username, manifesto_link FROM election_candidates WHERE post=?", $post['post']);
+
+			$i=0;
+			foreach ($candidate[$post['post']] as $person) {
+				$details = $members->memberView($person['username']);
+				$candidate[$post['post']][$i]['realname'] = $details[0]['cn'];
+				if (empty($person['manifesto_link'])) $candidate[$post['post']][$i]['manifesto_link'] = ELECTION_NO_MANIFESTO;
+				$candidate[$post['post']][$i]['votes'] = $DB->GetOne("SELECT count(username) FROM election_votes WHERE ".$post['post']."=?", array($person['username']));
+				$i++;
+			}
+		}
+
+		$smarty->assign("candidate", $candidate);
+		$output = $smarty->fetch('election-results.tpl');		
+	} else {
+	# It's election time
+		# Check the user hasn't already voted
+		$vote_details = $DB->GetRow("SELECT time, ipaddress FROM election_votes WHERE username=?", $session->username);
+		if (count($vote_details)>0) {
+			trigger_error("You already voted on ".date('l jS F, Y \a\t H:i', strtotime($vote_details['time']))." from IP address ".$vote_details['ipaddress'].".", E_USER_WARNING);
+			$output = "<p>Please email the Returning Officer at <a href=\"mailto:vote at sucs.org\">vote at sucs.org</a> with any queries.</p>\n<p>Once polling has closed on ".date('l jS F, Y \a\t H:i', strtotime(ELECTION_END)).", the election results will be available on this page.</p>";
+		} else {
+			if ($_POST['submit']=="Cast Votes") {
+			# We have a ballot paper to process
+				$output = "<h2>Thank you for your vote</h2>\n<p>You will shortly receive an email confirming your vote.</p>\n<p>Once polling has closed on ".date('l jS F, Y \a\t H:i', strtotime(ELECTION_END)).", the election results will be available on this page.</p>";
+				
+				# Establish which positions are contested
+				$role = $DB->GetCol("SELECT post FROM election_candidates GROUP BY post HAVING count(username) > 1");
+				
+				$fail = FALSE;
+				$invalid_candidate = FALSE;
+				$abstain_count = 0;
+				foreach ($role as $post) {
+					if ($_POST[$post] == "abstain") $abstain_count++;					
+					# check that we have a valid option selected
+					if (!($DB->GetOne("SELECT username FROM election_candidates WHERE post=? AND username=?", array($post, $_POST[$post])) || $_POST[$post]=="abstain")) $fail = TRUE;
+				}
+
+
+				# Check their password first
+				if ($session->check_pass($session->username, $_POST['vote_passwd'])) {
+					if ($fail) {
+					# Either no option or an invalid candidate was supplied
+						trigger_error("An invalid option was selected in at least one ballot. Please try again.", E_USER_WARNING);
+						display_ballot();
+					} else {
+					# User has abstained in all votes
+						if ($abstain_count == count($role)) {
+							trigger_error("You have not selected any candidates in any ballots.", E_USER_WARNING);
+							display_ballot();
+						} else {
+						# The input is valid - record the vote
+							$vote = array(
+								'username' => $session->username,
+								'time' => 'now',
+								'ipaddress' => $_SERVER['REMOTE_ADDR']);
+
+							# Email the Returning Officer
+							$ro_message = "User: ".$vote['username']."\nIP:   ".$vote['ipaddress']."\n\n";
+
+							# Email the voter with confirmation
+							$voter_message = "Thank you for voting in the SUCS election this year. Here are the votes you cast:\n\n";
+
+							foreach ($role as $post) {
+								# Don't add votes up as we go
+								# $DB->Execute("UPDATE election_candidates SET votes=votes+1 WHERE post=? AND username=?", array($post, $_POST[$post]));
+								$vote[$post] = $_POST[$post];
+								$ro_message .= ucfirst($post).": ".$_POST[$post]."\n";
+								$voter_message .= ucfirst($post).": ".$_POST[$post]."\n";
+							}
+						
+							$voter_message .= "\nResults of the election will be announced on ".date('l jS F, Y \a\t H:i', strtotime(ELECTION_END))." at http://sucs.org/Vote\n";
+						
+							$DB->AutoExecute("election_votes", $vote, 'INSERT');
+
+							mail("SUCS Returning Officer <vote at sucs.org>", "[SUCS Election] Vote received from ".$vote['username'], $ro_message, "From: SUCS Election ".ELECTION_YEAR." <vote at sucs.org>");
+							mail($session->fullname." <".$session->username."@sucs.org>", "[SUCS Election] Thanks For Voting", $voter_message, "From: SUCS Election ".ELECTION_YEAR." <vote at sucs.org>");
+						}
+					}
+				} else {
+					display_ballot();
+				}				
+			} else {
+			# Display the ballot paper
+				display_ballot();
+			}
+		}
+	}
+}
+
+$smarty->assign("body", $output);
+
+?>

Copied: trunk/components/electionreminder.php (from rev 656, branches/sucs-site/components/electionreminder.php)
===================================================================
--- trunk/components/electionreminder.php	                        (rev 0)
+++ trunk/components/electionreminder.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,8 @@
+<?php
+
+if (strtotime('now') > strtotime(ELECTION_START) && strtotime('now') < strtotime(ELECTION_END) && !$DB->GetOne("SELECT username FROM election_votes where username=?", $session->username)) {
+ 	$messages['info'][] = "<strong>You haven't voted yet</strong><br />\nThe SUCS Executive Election is in progress. <a href=\"/Vote\">Vote now!</a>\n";
+}
+
+
+?>

Modified: trunk/components/email.php
===================================================================
--- trunk/components/email.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/email.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -8,7 +8,7 @@
 // Perform data integrity checks
 
 // Full name
-if (ereg("[:/<>]", $_REQUEST['realname'])) {
+if (preg_match("/[^\p{L}- ]/iu", $_REQUEST['realname'])) {
 	$body .= "<p>That's a suspiciously unusual-looking name, <strong>" . htmlentities($_REQUEST['realname']) . "</strong>.</p>\n";
 	$body .= "<p>Please click <em>Back</em> and correct it.</p>\n";
 } else {
@@ -18,14 +18,14 @@
 	$body .= "<p>Please click <em>Back</em> and correct it.</p>\n";
 } else {
 // Email address
-	list($username, $maildomain) = split("@", $_REQUEST['email']);
+	list($username, $maildomain) = preg_split("/@/", $_REQUEST['email']);
 	if (!checkdnsrr($maildomain, "MX") && !checkdnsrr($maildomain)) {
 		$body .= "<p>The email address <strong>" . htmlentities($_REQUEST['email']) . "</strong> appears not to be valid.</p>\n";
 		$body .= "<p>Please click <em>Back</em> and correct it.</p>\n";
 	} else {
 // Username
 		// This test is rather inadequate. Needs improving
-		if (ereg("[:/<>]", $_REQUEST['uname'])) {
+		if (!preg_match("/^[a-z0-9_]*$/i", $_REQUEST['uname'])) {
 			$body .= "<p>Usernames can only contain letters, numbers and underscores(_).</p>\n";
 			$body .= "<p>Please click <em>Back</em> and choose a different one.</p>\n";
 		} else {
@@ -58,4 +58,4 @@
 $smarty->assign("title", "Joining");
 $pathlist[2] = "Joining";
 $smarty->assign("subselect", "Joining");
-?>
\ No newline at end of file
+?>

Copied: trunk/components/events.php (from rev 656, branches/sucs-site/components/events.php)
===================================================================
--- trunk/components/events.php	                        (rev 0)
+++ trunk/components/events.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,107 @@
+<?php
+/*
+ * Main events page, including admin functions
+ */
+
+
+$permission = "sucsstaff";
+$eventtable = "events";
+$eventcategories = array("Technical","Talks","Gaming","Social","Misc");
+
+$smarty->assign("event_categories", $eventcategories);
+
+$events_index = array_search("Events", $pathlist);
+
+if (isset($pathlist[$events_index + 1])) {
+	list($eventcat, $eventid) = preg_split("/_/", $pathlist[$events_index + 1]);
+	if (!in_array($eventcat, $eventcategories)) {
+		trigger_error("Invalid category specified", E_USER_ERROR);
+		unset($eventcat, $eventid);
+	} elseif (!ctype_digit($eventid)) {
+		trigger_error("Invalid event specified", E_USER_ERROR);
+		print_r($eventid);
+		unset($eventcat, $eventid);
+	}
+}
+
+if (isset($session->groups[$permission])) {
+	$smarty->assign("editable", true);
+	$action = @$_REQUEST['action'];
+
+	// process form actions with side-effects first
+	switch ($action) {
+		case "save":
+			$record['name'] = $_REQUEST['name'];
+			$record['description'] = $_REQUEST['description'];
+			$record['location'] = $_REQUEST['location'];
+
+			// reconstruct date/time
+			$datetime = $_REQUEST['Date_Year'];
+			$datetime .= str_pad((int) $_REQUEST['Date_Month'],2,'0',STR_PAD_LEFT);
+			$datetime .= str_pad((int) $_REQUEST['Date_Day'],2,'0',STR_PAD_LEFT);
+
+			$datetime .= " ".$_REQUEST['Time_Hour'];
+			$datetime .= ":".$_REQUEST['Time_Minute'];
+
+
+			$record['whn'] = $datetime;
+			$record['category'] = $_REQUEST['category'];
+			$id = @$_REQUEST['id'];
+
+			// this may be an existing event which needs to be updated
+			if (ctype_digit($id)) {
+				$DB->AutoExecute($eventtable, $record, 'UPDATE', "id=".$id);
+			} else {
+				$DB->AutoExecute($eventtable, $record, 'INSERT');
+			}
+
+			unset($action);
+			break;
+    }
+}
+
+if (isset($session->groups[$permission]) && isset($action)) {
+	switch($action) {
+		case "create":
+			$event = array("id" => "*");
+			$body = $smarty->fetch("event_edit.tpl");
+			break;
+		case "edit":
+			if (isset($eventcat) && isset($eventid)) {
+				$event = $DB->GetRow("SELECT * FROM $eventtable WHERE id=?", array($eventid));
+
+				//make tastier breadcrumbs
+				$pathlist[$events_index + 1] = $event['name'];
+
+				$smarty->assign("event", $event);
+				$body = $smarty->fetch("event_edit.tpl");
+			}
+			break;
+	}
+} else {
+	// not logged in, or no special action required
+	if (isset($eventcat) && isset($eventid)) {
+		$event = $DB->GetRow("SELECT * FROM $eventtable WHERE id=?", array($eventid));
+
+		//make tastier breadcrumbs
+		$pathlist[$events_index + 1] = $event['name'];
+
+		$smarty->assign("event", $event);
+		$body = $smarty->fetch("event.tpl");
+	} else {
+		$events = $DB->GetAll("SELECT *,date_part('epoch', whn) as whn_timestamp
+					FROM $eventtable WHERE date_trunc('day', whn) >= date_trunc('day',NOW()) ORDER BY whn ASC");
+		$oldevents = $DB->GetAll("SELECT *,date_part('epoch', whn) as whn_timestamp 
+					FROM $eventtable WHERE date_trunc('day', whn) < date_trunc('day', NOW()) ORDER BY whn DESC LIMIT 3");
+		$smarty->assign("events", $events);
+		$smarty->assign("oldevents", $oldevents);
+		$body = $smarty->fetch("events.tpl");
+	}
+}
+
+$smarty->assign("body", $body);
+$smarty->assign("title", "Events");
+//$smarty->assign("secondary", file_get_contents("../static/fragments/Events.txt"));
+
+
+?>

Copied: trunk/components/events_ical.php (from rev 656, branches/sucs-site/components/events_ical.php)
===================================================================
--- trunk/components/events_ical.php	                        (rev 0)
+++ trunk/components/events_ical.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,34 @@
+<?php
+require_once("../lib/iCalcreator.class.php");
+
+// disable site template
+$no_template = TRUE;
+
+// initialise calendar
+$cal = new vcalendar();
+$cal->setConfig('unique_id', 'sucs.org');
+$cal->setProperty('method', 'PUBLISH');
+$cal->setProperty('x-wr-calname', "SUCS Events Calendar");
+$cal->setProperty('X-WR-CALDESC', 
+		"Upcoming events for members of the Swansea University Computer Society"); 
+$cal->setProperty('X-WR-TIMEZONE', 'Europe/London');
+
+//populate with upcoming events
+$events = $DB->GetAll("SELECT * FROM events WHERE 
+				date_trunc('day', whn) >= date_trunc('day', NOW()) ORDER BY whn ASC");
+
+foreach($events as $event) {
+	$vevent = new vevent();
+	$vevent->setProperty('dtstart', $event['whn']);
+	$vevent->setProperty('LOCATION', $event['location']);
+	$vevent->setProperty('summary', $event['name']);
+	$vevent->setProperty('description', $event['description']); 
+	$vevent->setProperty('categories', $event['category']);
+	$cal -> setComponent($vevent);
+}
+
+//spit out a shiny new iCal file
+$cal->returnCalendar();
+
+
+?>

Deleted: trunk/components/forum.php
===================================================================
--- trunk/components/forum.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/forum.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,64 +0,0 @@
-<?php
-
-// Forum integration component
-
-$punbb_base = "/usr/share/punbb";
-
-// Attempt to divine which punbb file is wanted
-$file_index = array_search("Forum", $pathlist) + 1;
-
-if ($pathlist[$file_index] == "") {
-        $punbb_file = "index.php";
-} else {
-        $punbb_file = $pathlist[$file_index];
-}
-
-// Stick relevant get parameters somewhere where the template can get them
-// This is to cure problems with the login form eating essential get params
-// Done here instead of site-wide to limit potential for an XSS vulnerabilityy
-
-// (it occurs though that this could be solved using session data rather than writing GET params)
-
-$gets = array();
-if (isset($_GET['id']))
-	$gets['id'] = intval($_GET['id']);
-if (isset($_GET['p']))
-	$gets['p'] = intval($_GET['p']);
-
-$smarty->assign("gets", $gets);
-
-
-// move to the punbb directory and start buffering
-$oldcwd = getcwd();
-chdir($punbb_base);
-ob_start();
-
-// include the wanted punbb file
-try {
-	include($punbb_base."/".$punbb_file);
-} catch (Exception $e) {
-	// do nothing. This is practically expected as our punbb throws exceptions when it's done rendering
-	// this sounds nasty, but it's better than calling exit() like the stock punbb does ;-)
-}
-
-// stop buffering, move back to where we were
-$page = ob_get_contents();
-ob_clean();
-chdir($oldcwd);
-
-// if this is for syndication purposes, we don't want a template 
-if ($punbb_file == "extern.php") {
-	$no_template = TRUE;
-	echo $page;	
-} else {
-
-	// make the breadcrumbs tastier
-	$pathlist = array_slice($pathlist, 0, $file_index);
-
-	$smarty->assign("title", "Forum");
-	$smarty->assign("extra_styles", "/css/forum/SUCS.css");
-	$smarty->assign("rss_url", "/Community/Forum/extern.php?action=active&type=rss");
-	$smarty->assign("body", $page);
-}
-
-?>

Deleted: trunk/components/forumposts.php
===================================================================
--- trunk/components/forumposts.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/forumposts.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,13 +0,0 @@
-<?php
-unset($result);
-require_once("/usr/share/adodb/adodb.inc.php");
-$ForumDB = NewADOConnection('postgres8');
-$ForumDB->Connect('dbname=punbb');
-$ForumDB->SetFetchMode(ADODB_FETCH_ASSOC);
-
-$posts = $ForumDB->GetAll('SELECT t.subject, t.last_poster, t.last_post_id FROM topics AS t INNER JOIN forums AS f ON f.id=t.forum_id LEFT JOIN forum_perms AS fp ON (fp.forum_id=f.id AND fp.group_id=4) WHERE (fp.read_forum IS NULL OR fp.read_forum=1) ORDER BY t.last_post DESC LIMIT 5');
-
-$smarty->assign('posts', $posts);
-
-$result = $smarty->fetch('forumposts.tpl');
-?>

Modified: trunk/components/front.php
===================================================================
--- trunk/components/front.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/front.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -8,14 +8,16 @@
 if (!$session->loggedin) {
 	$output = file_get_contents("../static/fragments/Join.txt");
 } else {
-	$output = "<div class=\"cbb\"><h3>You are logged in</h3><p>If you would like to contribute to the site or report a bug, please contact chckens or dez.</p></div>";
+	$output = "<div class=\"cbb\"><h3>You are logged in</h3><p>If you would like to contribute to the site or report a bug, please contact imranh.</p></div>";
+	$output = "<div class=\"cbb\"><h3>You are logged in</h3><p style=\"text-align: center;\">Why not join our <a href=\"#\" onclick=\"window.open('/mw/','Milliways','height=600,width=800,menubar=no,resizable=yes,location=no,directories=no,scrollbars=yes,status=no,toolbar=no')\" style=\"font-size: 150%; font-weight: bold; color: #ffc62b;\">Live Chat</a>?</p></div>";
 //include('users.php');
 //$output .= $result;
-//include('planetposts.php');
-//$output .= $result;
-//include('forumposts.php');
-//$output .= $result;
+include('electionreminder.php');
+$output .= $result;
 
 }
+
+$output .= "<div class=\"cbb\"><h3>SUCS Tools</h3><p>Download the SUCS Tools to make it easier to access SUCS services from your computer.</p><ul><li><a href=\"/files/sucstools-latest.exe\">SUCS Tools for Windows</a></li><li><a href=\"/files/SUCS-latest.dmg\">SUCS Tools for Mac OS X</a></li></ul><p>More information about the tools is available in \"<a href=\"/Knowledge/Help/SUCS%20Services/Using%20the%20SUCS%20Tools\">Using the SUCS Tools</a>\".</p></div>";
+
 $smarty->assign("secondary",$output);
 ?>

Copied: trunk/components/junk.php (from rev 656, branches/sucs-site/components/junk.php)
===================================================================
--- trunk/components/junk.php	                        (rev 0)
+++ trunk/components/junk.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,201 @@
+<?php
+
+// Set defaults
+$mode = "list";
+$admin = false;
+
+$admin_group="sucsstaff";
+
+// who's notified of items being requested?
+$junk_contact="admin at sucs.org";
+
+$admin = isset($session->groups[$admin_group]);
+
+// If you're an admin and the path ends in Edit/ then a number put it into edit mode
+// create canedit rules
+$canedit=isset($pathlist[($component[depth]/2)+1]);
+$canedit=$canedit && isset($pathlist[($component[depth]/2)+2]);
+$canedit=$canedit && $pathlist[($component[depth]/2)+1]=='Edit';
+$canedit=$canedit && is_numeric($pathlist[($component[depth]/2)+2]);
+$canedit=$canedit && $admin;
+// Apply canedit rules
+if ($canedit){
+	$id = $pathlist[($component[depth]/2)+2];
+	$items = $DB->GetAll("SELECT id, title, category, description, donated_by, status FROM inventory WHERE id=? AND requested_by IS NULL",$id);
+	if(sizeof($items) === 1){
+		$item = $items[0];
+		$smarty->assign("item", $item);
+		$mode = "edit";
+	}
+}
+
+// If you're an admin and the path ends in Add put it into add mode
+// create canadd rules
+$canadd=isset($pathlist[($component[depth]/2)+1]);
+$canadd=$canadd && $pathlist[($component[depth]/2)+1]=='Add';
+$canadd=$canadd && $admin;
+// Apply canadd rules
+if ($canadd){$mode = "add";}
+
+
+// Process actions before retrieving the data
+// List request data
+if ($session->loggedin && isset($_REQUEST['action'])) {
+	// Junk Requests
+        if ($_REQUEST['action'] == "Request") {
+		// Request Item if its available
+                $query = "UPDATE inventory SET requested_by=?, requested_on=now() WHERE id=? AND requested_by IS NULL";
+                $DB->Query($query, array($session->username, $_REQUEST['item']));
+
+		// mail someone so we know that this has been requested 
+				$iteminfo = $DB->GetRow("SELECT title, description FROM inventory WHERE id=?", array($_REQUEST['item']));
+				$msgbody = "User {$session->username} has requested the junk item:\n\n";
+				$msgbody .= "{$iteminfo['title']}: {$iteminfo['description']}\n\n";
+				$msgbody .= "Please ensure this is taken away and never brought back.";
+				mail($junk_contact,"Junk item requested",$msgbody);
+
+        }
+	elseif ($_REQUEST['action'] == "Un-Request") {
+		// Un-Request Item
+		if ($admin){
+			// if you're admin just do it
+			$query = "UPDATE inventory SET requested_by=null, requested_on=null WHERE id=?";
+                        $array = array($_REQUEST['item']);
+		}
+		else{
+			// if not admin check if you requested it first
+			$query = "UPDATE inventory SET requested_by=null, requested_on=null WHERE id=? AND requested_by=?";
+			$array = array($_REQUEST['item'], $session->username);
+		}
+		$DB->Query($query, $array);
+	}
+	elseif ($_REQUEST['action'] == "Take" && $admin){
+		// Take item, if you're admin
+		$query = "UPDATE inventory SET taken_on=now() WHERE id=? AND requested_by IS NOT NULL";
+		$DB->Query($query, $_REQUEST['item']);
+	}
+	elseif ($_REQUEST['action'] == "Remove" && $admin){
+		// Remove item, if you're admin
+		$query = "DELETE FROM inventory WHERE id=?";
+		if ($DB->Query($query, $_REQUEST['item'])) {
+			message_flash("Item removed");
+		} else {
+			trigger_error("Failed to remove item");
+		}
+	}
+	elseif ($_REQUEST['action'] == "Not Junk" && $admin){
+		// Mark item as not junk if it's not been requested and you're admin
+		$query = "UPDATE inventory SET status='unknown' WHERE id=? AND requested_by IS NULL";
+		$DB->Query($query, $_REQUEST['item']);
+	}
+	elseif ($_REQUEST['action'] =="Junk" && $admin){
+		// Mark item as junk, if you're admin
+		$query = "UPDATE inventory SET status='junk' WHERE id=?";
+                $DB->Query($query, $_REQUEST['item']);
+	}
+
+}
+// Update/Add item
+if ($session->loggedin && $admin && (isset($_REQUEST['update']) || isset($_REQUEST['add']))) {
+		// try to guess which category field the user meant us to see
+		// ideally we'd use an html combo box, but since they don't exist...
+		if ($_REQUEST['categorymenu'] == "") {
+			$category = $_REQUEST['category'];
+		} else {
+			$category = $_REQUEST['categorymenu'];
+		}
+	
+         // Update/Add item if title and category are filled in else error
+         if ($_REQUEST['title'] != "" && $category != "") {
+		// if the description is blank, return null
+		if ($_REQUEST['description'] == ""){
+			$description = null;
+		}
+		else{
+			$description = $_REQUEST['description'];
+		}
+		// if the donated_by is blank, return null
+		if ($_REQUEST['donated_by'] == ""){
+                         $donated_by = null;
+                }
+                else{
+                        $donated_by = $_REQUEST['donated_by'];
+                }
+		// run the query
+		if(isset($_REQUEST['update'])){
+			$query = "UPDATE inventory SET title=?, category=?, description=?, donated_by=?, status=? WHERE id=?";
+			$array = array($_REQUEST['title'], $category, $description, $donated_by, $_REQUEST['status'], $_REQUEST['id']);
+			if ($DB->Query($query, $array)) {
+				message_flash("Item Updated");
+			} else {
+				trigger_error("Item update failed :-(", E_USER_ERROR); 
+			}
+		}
+		elseif(isset($_REQUEST['add'])){
+			$query = "INSERT INTO inventory (title, category, description, donated_by, status) VALUES (?, ?, ?, ?, ?)";
+			$array = array($_REQUEST['title'], $category, $description, $donated_by, $_REQUEST['status']);
+			if ($DB->Query($query, $array)) { 
+				message_flash("Item Added");
+			} else {
+				trigger_error("Adding item failed :-( - ".$DB->ErrorMsg(), E_USER_ERROR);
+			}
+		}
+	 }
+	 else{
+		 trigger_error("Required field(s) missing", E_USER_WARNING);
+	 }
+}
+
+// Remove old taken junk
+$DB->Query("DELETE FROM inventory WHERE (taken_on + interval'7 days')  < now()");
+
+
+if ($mode == 'list'){
+	// Get junk from database, and give admin the full list
+	if ($admin == true){
+		$junk = $DB->GetAll("SELECT * FROM inventory ORDER BY category, title, id");
+	}
+	else{
+		$junk = $DB->GetAll("SELECT * FROM inventory WHERE status = 'junk' ORDER BY category, title, id");
+	}
+	//
+	// Check there is some junk
+	if (sizeof($junk) < 1) {
+		$mode = "nojunk";
+	} else {
+
+		// group the junk by status then by category 
+		foreach($junk as $junkitem) {
+			if ($junkitem['status'] != 'junk') {
+				$status = "unknown";
+			} else if ($junkitem['requested_by'] == null) {
+				$status = "available"; 
+			} else if ($junkitem['taken_on'] == null) {
+				$status = "requested";
+			} else {
+				$status = "taken";
+			} 
+			
+			$sortedjunk[$status][$junkitem['category']][] = $junkitem; 
+		}
+		$smarty->assign("junk", $sortedjunk);
+	}
+
+	
+} else {
+	$categories = $DB->GetCol("SELECT DISTINCT category FROM inventory ORDER BY category ASC");
+	$smarty->assign("categories", $categories); 
+}
+// Generate output
+
+$smarty->assign("statuses",array("unknown", "in use", "wanted", "junk"));
+$smarty->assign("componentpath", $baseurl . $component[path]);
+$smarty->assign("mode", $mode);
+$smarty->assign("admin", $admin);
+
+$output =  $smarty->fetch("junk.tpl");
+
+$smarty->assign("title", "Junk List");
+$smarty->assign("body", $output);
+
+?>

Modified: trunk/components/library.php
===================================================================
--- trunk/components/library.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/library.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -35,8 +35,14 @@
 	if (isset($pathlist[$library_index + 2])) {
 		$tag = $pathlist[$library_index + 2];
 		// we're displaying books with a specific tag
-		$categories = $DB->GetOne("SELECT count(name) FROM bookcategories WHERE name=?", array($tag));		
-		if ($categories['count'] == 1) {
+		//The following line doesn't do what I think you think it does.
+		//It will return a string if the tag exists, "1" and "0" when a tag doesn't exist
+		$categories = $DB->GetOne("SELECT count(name) FROM bookcategories WHERE name=?", array($tag));
+		//debug stuff, LOOK IT'S A STRING
+		//var_dump($categories);
+		//if ($categories['count'] == 1) {
+		//$categories is not an aray, it's a string, yeah i know == != good_programing
+		if ($categories == 1) {
 			$mode = "tagdisplay";
 			$query = "SELECT b.id, b.title FROM books AS b JOIN booktags AS bt ON b.id= bt.bookid"; 
 			$query .= " JOIN bookcategories AS bc ON bc.id = bt.tag WHERE bc.name=?";
@@ -55,6 +61,7 @@
 	$mode = "display";
 	$checkout_request = false;
 	$book_index = intval($pathlist[$library_index + 1]);
+	if (isset($session->groups[$permission])) $smarty->assign('editable', true);
 
 // Check this book actually exists
 	$loans = $DB->GetAll("SELECT onloan FROM books WHERE id=? LIMIT 1", array($book_index));
@@ -62,7 +69,7 @@
 		$mode = "bookerror";
 	} else {
 
-	// See if we're supposed to be loaning or returning this book 
+	// See if we're supposed to be loaning/returning/editing/saving this book 
 		if ($session->loggedin && isset($_REQUEST['action'])) {
 			if ($_REQUEST['action'] == "loan") {
 				if (isset($session->groups[$permission])) {
@@ -77,6 +84,25 @@
 			} elseif (($_REQUEST['action'] == "return") && isset($session->groups[$permission])) {
 				// update DB
 				$DB->Query("UPDATE books SET onloan='f', loandate=NULL WHERE id=?", array($book_index));
+			} elseif (($_REQUEST['action'] == "edit") && isset($session->groups[$permission])) {
+				// we're an editor and want to edit this book
+				$smarty->assign("editing", true); 
+			} elseif (($_REQUEST['action'] == "save") && isset($session->groups[$permission])) {
+				// save edited book
+				$book['title'] = $_REQUEST['title'];
+				$book['author'] = $_REQUEST['author'];
+				$book['publisher'] = $_REQUEST['publisher'];
+				$book['description'] = $_REQUEST['description'];
+
+				if ($DB->AutoExecute('books', $book, 'UPDATE', "id=".$DB->qstr($book_index))) { 
+					message_flash_postponed("Book Updated!");
+					//redirect to prevent form resubmission
+					header('HTTP/1.1 303 See Other');
+					header("Location: $baseurl$path"); 
+				} else {
+					trigger_error("Error updating book: ".$DB->ErrorMsg(), E_USER_WARNING);
+				}
+
 			}
 		}
 
@@ -98,11 +124,27 @@
 		$book['author'] = htmlentities2($book['author']);
 		$book['onloan'] = ($book['onloan'] == 't') ? true : false;
 		
-	// Extract amazon data (maybe this should be stored in separate field in the db?)
-		$simple_xml = simplexml_load_string($book['amazon_data']);
 
-		//FIXME: figure out how to tell if there was usable amazon data after all
-		//$book['description'] = $simple_xml->Items->Item->EditorialReviews->EditorialReview->Content;
+		if (!isset($book['description'])) {
+			// no book description in the database, try using Amazon data
+
+			// Extract amazon data (maybe this should be stored in separate fields in the db?)
+			$simple_xml = simplexml_load_string($book['amazon_data']);
+
+			$book['description'] = @$simple_xml->Items->Item->EditorialReviews->EditorialReview->Content;
+			if (isset($book['description'])) {
+				// tidy description markup
+				$tidy_config['doctype'] = 'omit';
+				$tidy_config['output-xhtml'] = true;
+				$tidy_config['show-body-only'] = true;
+				$tidy_config['logical-emphasis'] = true;
+				$book['description'] = tidy_repair_string($book['description'], $tidy_config);
+
+				// update db so we don't have to do this next time
+				$DB->Execute("UPDATE books SET description=? WHERE id=?", array($book['description'],$book['id']));
+			}
+		}
+
 		$smarty->assign("book", $book);
 
 

Copied: trunk/components/libraryadmin.php (from rev 656, branches/sucs-site/components/libraryadmin.php)
===================================================================
--- trunk/components/libraryadmin.php	                        (rev 0)
+++ trunk/components/libraryadmin.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,79 @@
+<?php
+
+// you gotta be this high to enter
+$permission="librarian";
+//include ISBN validation library
+require_once('../lib/Validate/ISPN.php');
+
+$error = array();
+
+function fetch_isbndb_data($isbn) {
+
+	$url1 = "http://isbndb.com/api/books.xml?access_key=I6AH5WJI&index1=isbn&value1=";
+
+	return file_get_contents($url1.$isbn);
+}
+
+function valid_isbn($isbn) {
+
+        return Validate_ISPN::isbn($isbn);
+}
+
+if ($session->groups[$permission]) {
+
+	if ($_REQUEST['action'] == "search") {
+
+		$isbn = $_REQUEST['isbn'];
+		$isbn = str_replace(array('ISBN', '-', ' ', "\t", "\n"), '', $isbn);
+
+		if (valid_isbn($isbn)) {
+			$xmlresult = fetch_isbndb_data($isbn);
+			$simple_xml = simplexml_load_string($xmlresult);
+			$book['isbn'] = $isbn;
+			$book['title'] = $simple_xml->BookList->BookData->Title;
+			$book['author'] = $simple_xml->BookList->BookData->AuthorsText;
+			if (substr(trim($book['author']),-1)==',') {$book['author']=substr(trim($book['author']),0,-1);}
+			$book['publisher'] = $simple_xml->BookList->BookData->PublisherText;
+			$book['image_url'] = ""; 
+			$smarty->assign("book", $book);
+		} else {
+			// invalid isbn entered
+			trigger_error("invalid ISBN number entered", E_USER_WARNING);
+		}
+
+		
+	} elseif ($_REQUEST['action'] == "add") {
+		$book = array();
+		$book['isbn'] = $_REQUEST['isbn'];
+		$book['title'] = $_REQUEST['title'];
+		$book['author'] = $_REQUEST['author'];
+		$book['publisher'] = $_REQUEST['publisher'];
+		$book['image_url'] = $_REQUEST['image_url'];
+
+		// Validate that we have enough info to add
+		if (($book['isbn'] != "") && (!valid_isbn($book['isbn']))) {
+			trigger_error("invalid ISBN", E_USER_WARNING);
+		} elseif (trim($book['title']) == "") {
+			trigger_error("you must supply a title", E_USER_WARNING);
+		} elseif (trim($book['author']) == "") {
+			trigger_error("you must supply an author"); 
+		} else {
+			$insertdata = array($book['title'], $book['author'], $book['publisher']);
+			if (valid_isbn($book['isbn'])) {
+				$book['amazon_data'] = fetch_isbndb_data($book['isbn']);
+				$newinsertdata = array($book['isbn'], $book['image_url'], $book['amazon_data']);
+				$insertdata = array_merge($insertdata, $newinsertdata);
+				$DB->Query("INSERT INTO books (title, author, publisher, isbn, image_url, amazon_data) VALUES (?,?,?,?,?,?)", $insertdata);
+			} else {
+				$DB->Query("INSERT INTO books (title, author, publisher) VALUES (?,?,?)", $insertdata);
+			}
+		}
+
+	}
+		$result = $smarty->fetch("library-addbook.tpl");
+}
+
+$smarty->assign("title", "Library Admin");
+$smarty->assign("body", $result);
+
+?>

Modified: trunk/components/members.php
===================================================================
--- trunk/components/members.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/members.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -31,7 +31,7 @@
 		// Redirect if we have found a valid single user
 		if (count($usernames) == 1) {
 			$smarty->assign('who', $usernames[0]['uid']);
-			// Add banana widget to the sidebar 
+			// Add banana widget to the sidebar
 			$who = $usernames[0]['uid'];
 			include("../lib/banana-admin.php");
 			// Needs Redirection
@@ -53,57 +53,32 @@
 				if (file_exists( $usernames[0]['homedir'] . '/.plan')) {
 					$usernames[0]['plan'] = file_get_contents($usernames[0]['homedir'] . '/.plan');
 				}
-				// Website	
-				if ( file_exists( $usernames[0]['homedir'] . '/public_html') &&
-				     !file_exists( $usernames[0]['homedir'] . '/public_html/robots.txt'))  {
+				// Website
+				if ( file_exists( $usernames[0]['homedir'] . '/public_html')) {
 					$usernames[0]['website'] = true;
 				}
-				// Blog
-				require_once("/usr/share/adodb/adodb.inc.php");
-				$BlogDB = NewADOConnection('postgres8');
-				$BlogDB->Connect('dbname=blogs');
-				$BlogDB->SetFetchMode(ADODB_FETCH_ASSOC);
-				require_once('../lib/blog/validation.lib.php');
-				if (blogger($usernames[0]['uid'])) {
-					$usernames[0]['blog'] = $BlogDB->GetOne("select title from users where username='".$usernames[0]['uid']."'");
-				}
 				// Bananas stuff
 				$bananasql = "SELECT *, date_trunc('second', whn) FROM awards ";
 				$bananasql .= "WHERE username ~* ? ORDER BY WHN DESC";
 				$awards = $DB->GetAll($bananasql, array("^".$usernames[0]['uid']."$"));
-				
-				// add academic year to each award, perform slightly nasty hack to add sum for academic year to last of the year
-				$yearSum = 0;
-				unset($acYear);
-				unset($yearStart);
-				foreach ($awards as $i => $award) {
-					$awards[$i]['acYear'] = academicYear(strtotime($award['whn']));
-					if ($acYear != $awards[$i]['acYear']) {
-						if(isset($yearStart)) {
-							$awards[$yearStart]['yearSum'] = $yearSum;
-							$yearSum = 0;
-						}
-						$yearSum += $award['score'];
-						$acYear = $awards[$i]['acYear'];
-						$yearStart = $i;
-					} else {
-						$yearSum += $award['score'];
-					}
+
+				// arrange by academic year, calculate sums as we go
+				foreach ($awards as $award) {
+					$acyear = academicYear(strtotime($award['whn']));
+					$awards_by_year[$acyear]['awards'][] = $award;
+					$awards_by_year[$acyear]['sum'] += $award['score'];
+					$bananasum += $award['score'];
 				}
-				if(isset($yearStart)) $awards[$yearStart]['yearSum'] = $yearSum;
-				
-				
-				$usernames[0]['awards'] = $awards; 
-				$bananasumsql = "select sum(score) as sum from awards where username ~* ?";
-				$bananasum = $DB->GetAll($bananasumsql, array("^".$usernames[0]['uid']."$"));
-				$usernames[0]['bananascore'] = $bananasum[0]['sum'];
+
+				$usernames[0]['awardsbyyear'] = &$awards_by_year;
+				$usernames[0]['bananascore'] = $bananasum;
 			}
 		}
 		$smarty->assign('results', $usernames);
-	
+
 	} else {
 	// generate fun data to put on index page
-		
+
 		// top 5
 		$stats['top'] = $DB->GetAll("SELECT username, sum(score) as sum FROM awards GROUP BY username ORDER BY sum DESC LIMIT 5");
 
@@ -154,7 +129,7 @@
                                 $stats['recent'][$i]['real'] = FALSE;
                         }
                 }
-	
+
 		$smarty->assign("stats", $stats);
 		$secondary = $smarty->get_template_vars("secondary");
 		$secondary .= $smarty->fetch("banana-leaders.tpl");
@@ -166,15 +141,14 @@
 	$usernames = $members->getMemberList();
 
 	foreach ($usernames as $user) {
-		if ( file_exists( $user['homedir'] . '/public_html') &&
-		     !file_exists( $user['homedir'] . '/public_html/robots.txt'))  {
+		if ( file_exists( $user['homedir'] . '/public_html')) {
 			$public_usernames[] = $user;
 		}
 	}
 	$smarty->assign("public_members", $public_usernames);
 }
-	
 
+
 $smarty->assign('url', $component['path']);
 $smarty->assign('extra_styles', "/css/members.css");
 $result = $smarty->fetch('members.tpl');

Copied: trunk/components/membershiprenew.php (from rev 656, branches/sucs-site/components/membershiprenew.php)
===================================================================
--- trunk/components/membershiprenew.php	                        (rev 0)
+++ trunk/components/membershiprenew.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,148 @@
+<?php
+include_once("../lib/date.php");
+// Config options
+$inform="treasurer at sucs.org";
+$permission="sucsstaff";
+// Enable and disable database updating
+$enable=TRUE;
+
+// Set next payment date
+$paydate = paidUntil(time());
+
+// Only staff can use this page
+if (isset($session->groups[$permission])) {
+    $smarty->assign("staff", TRUE);
+//	$sucsDB->debug = true;
+
+	// handle updates
+    if(isset($_POST['uid']) && isset($_POST['lastupdate'])){
+        // Check data hasn't changed and that nothing is broked
+        $query = "SELECT * FROM members WHERE uid=? AND lastupdate=?";
+        $array = array($_POST['uid'], $_POST['lastupdate']);
+        $data = $sucsDB->GetAll($query,$array);
+
+        // If there is only one record then everything is fine
+        if(sizeof($data)==1){
+            // get info on currently logged in user
+            $user = posix_getpwnam($session->username);
+
+            // Update record
+            $record = $data[0];
+            $query = "UPDATE members";
+			$query .= " SET paid = ?, lastupdate = DEFAULT, lastedit = ?";
+			$query .= " WHERE uid = ?";
+            $array = array($paydate,$user['uid'],$_POST['uid']);
+            if($enable){
+                $sucsDB->query($query,$array);
+            }
+
+            // emailing contact (tresurer)
+			$message  = "Account renewal notification\n\n";
+			$message .= "Account   : ".$record['username']."\n";
+			$message .= "User Type : ".$record['type']."\n";
+			$message .= "Renewed by: ".$user['name']."\n\n";
+			$message .= "Regards\n  eclipse's script";
+			mail($inform,"Account Renewal",$message);
+
+			// emailing user
+			$message = "Your Swansea University Computer Society (SUCS) membership has been renewed\n\n";
+			$message .= "Username: ".$record['username']."\n";
+			$message .= "If you do not know or have forgotten your password, please email admin at sucs.org to arrange for it to be changed.\n\n";
+			$message .= "Regards\n  The SUCS admin";
+			$header = "From: admin at sucs.org\r\n";
+			$header .= "Reply-To: admin at sucs.org";
+			// Personal account
+			mail($record['email'],"SUCS account renewal",$message,$header);
+			// sucs account
+			mail($record['username']."@sucs.org","SUCS account renewal",$message,$header);
+
+            message_flash("Renewed account for: ".htmlentities($record['username']));
+        }
+        else{
+            trigger_error("Number of recored returned: ".sizeof($data).". Expected: 1.", E_USER_ERROR);
+        }
+    }
+
+    // if sort is specified in GET
+    if(isset($_GET["sort"])){
+        $sortoptions = array("username","sid","realname");
+        // and is a valid option
+        if(in_array($_GET["sort"],$sortoptions,TRUE)){
+            // use it
+            $sort=$_GET["sort"];
+        }
+        // else use username
+        else{
+            $sort='username';
+        }
+        $getsort=$sort;
+    }
+    //else use username
+    else{
+        $sort='username';
+    }
+
+
+    //Get members details
+    $query = "SELECT * FROM members, member_type";
+	$query .= " WHERE paid != ?";
+	$query .= " AND (type = 1 OR type = 2 OR type = 5)";
+	$query .= " AND type=member_type.id";
+	$query .= " ORDER BY paid,type,".$sort;
+	$array = array($paydate);
+	$data = $sucsDB->GetAll($query, $array);
+    $smarty->assign("members", $data);
+
+    // set refresh rate
+  	$autorefresh=$_GET["autorefresh"];
+  	// if autorefresh is not 'n'
+    if($autorefresh!="n"){
+        // and is a decimal value
+	    if(ctype_digit($autorefresh)){
+	        // use it
+            $refreshval=$autorefresh;
+            // set passthrough
+            $getrefresh=$refreshval;
+	    }
+	    else{
+	        // If no valid value assigned, default to OFF
+	        $refreshval="n";
+	    }
+	    $optrefresh=$refreshval;
+	    $smarty->assign("refresh", $refreshval);
+    }
+    else{
+        // set passthrough
+        $getrefresh='n';
+        $optrefresh='n';
+    }
+
+    // compile passthrough url
+    // sort
+    if(isset($getsort)){
+        $getout="?sort=".$getsort;
+    }
+
+    // autorefresh
+    if(isset($getrefresh)){
+        if(isset($getout)){
+            $getout .= "&autorefresh=".$getrefresh;
+        }
+        else{
+            $getout = "?autorefresh=".$getrefresh;
+        }
+    }
+
+    // set smarty variables
+    $smarty->assign("self",$baseurl.$path.$getout);
+    $smarty->assign("optionrefresh",$optrefresh);
+    $smarty->assign("optionsort",$sort);
+    $smarty->assign("paydate",$paydate);
+
+}
+$side = $smarty->fetch('membershiprenew-options.tpl');
+$body = $smarty->fetch('membershiprenew.tpl');
+$smarty->assign('secondary',$side);
+$smarty->assign('title', "Renew Membership");
+$smarty->assign('body', $body);
+?>

Modified: trunk/components/menu.php
===================================================================
--- trunk/components/menu.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/menu.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -7,7 +7,7 @@
 
 function translate($word) {
 	global $language, $DB;
-	
+
 	if ($language['code']!="en") {
 		$query=$DB->GetRow("select title, title".$language['db']." from menu where title='".$word."'");
 		if ($query['title'.$language['db']]!="") return $query['title'.$language['db']];
@@ -60,9 +60,25 @@
 $menu = parseMenu($res);
 
 // this needs to choose the actual current one
-$res = $DB->GetAll("select * from menu where parent=".getPageID($pagename)." order by menuorder");
-if (count($res)>0) {
-	$submenu = parseMenu($res);
+// subpages/submenu items can have permissions attached to them as well!
+
+$query2  = "select * from menu where parent=";
+$query2 .= "'";
+$query2 .= getPageID($pagename);
+$query2 .= "'";
+$query2 .= " and (permission is NULL";
+
+if ($session->loggedin) $query2 .= " or permission='users'";
+
+foreach ($session->groups as $group => $value) {
+        $query2 .= " or permission='$group'";
+        }
+
+$query2 .= ") order by menuorder";
+
+$res2 = $DB->GetAll($query2);
+if (count($res2)>0) {
+	$submenu = parseMenu($res2);
 	$menu[translate($pagename)] = $submenu;
 }
 

Modified: trunk/components/milliways.php
===================================================================
--- trunk/components/milliways.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/milliways.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,19 +1,259 @@
 <?php
 
+function parseIdleTime($idletime) {
+	$idlearray = preg_split("/[hms]/",$idletime);
+	if (strstr($idletime,'h')) {
+		$hours = $idlearray[0];
+		$minutes = $idlearray[1];
+		$seconds = 0;
+	} elseif (strstr($idletime,'m')) {
+		$hours = 0;
+		$minutes = $idlearray[0];
+		$seconds = $idlearray[1];
+	} else {
+		$hours = 0;
+		$minutes = 0;
+		$seconds = $idlearray[0];
+	}
+
+	return (intval($hours * 3600)) + (intval($minutes) * 60) + intval($seconds);
+
+}
+
+function compare_idletime($a, $b) {
+	return strnatcmp($a['idleseconds'], $b['idleseconds']);
+}
+
+$mwpath = array_search("Milliways", $pathlist);
+
+$newpath = $baseurl;
+for($i=0;$i<=$mwpath;$i++) {
+	if ($i!=0) $newpath .= "/";
+	$newpath .= $pathlist[$i];
+}
+$smarty->assign("mwpath", $newpath);
+
+$cal = cal_info(CAL_JULIAN);
+
+if (strtolower($pathlist[$mwpath+1]) == "uri") {
+	$latest = FALSE;
+	$today = FALSE;
+	unset($search);
+	if (isset($pathlist[$mwpath+2])) {
+		if ($pathlist[$mwpath+2] == "search" && isset($pathlist[$mwpath+3]))  {
+			$search = $pathlist[$mwpath+3];
+
+		} else {
+			$today = strtotime($pathlist[$mwpath+2]);
+		}
+	}
+	if ($today === FALSE && !isset($search)) {
+		$today = time();
+		$latest = TRUE;
+	}
+
+	$smarty->assign("extra_scripts", array(
+		'<meta name="ROBOTS" content="NOINDEX" />',
+		'<meta name="ROBOTS" content="NOFOLLOW" />'));
+
+	$mwdb = new PDO('sqlite:/var/lib/mw/mwuri.db');
+	$res = $mwdb->prepare("select distinct strftime('%Y',added) from mwuri");
+	$res->execute();
+	$yearlist = $res->fetchAll(PDO::FETCH_COLUMN,0);
+	$smarty->assign("yearlist",$yearlist);
+
+	$res= $mwdb->prepare("select distinct strftime('%m',added) from mwuri where strftime('%Y',added) = ?");
+	$res->execute(array(date("Y",$today)));
+	$mlist = $res->fetchAll(PDO::FETCH_COLUMN,0);
+	$monthlist = array();
+	foreach( $mlist as $m) {
+		$monthlist[$m] = $cal['abbrevmonths'][(int)$m];
+	}
+	$smarty->assign("monthlist",$monthlist);
+
+	$res= $mwdb->prepare("select distinct strftime('%d',added) from mwuri where strftime('%Y-%m',added) = ?");
+	$res->execute(array(date("Y-m",$today)));
+	$daylist = $res->fetchAll(PDO::FETCH_COLUMN,0);
+	$smarty->assign("daylist",$daylist);
+
+	if ($today === FALSE && isset($search)) {
+		// do a search
+		$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri where title like ? or url like ? order by added desc");
+		$term = "%".$search."%";
+		$res->execute(array($term,$term));
+		$data = $res->fetchAll(PDO::FETCH_ASSOC);
+	} else {
+		//standard date based lookup
+		$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri where date(added,'localtime')=? order by added desc");
+		$res->execute(array(date("Y-m-d",$today)));
+		$data = $res->fetchAll(PDO::FETCH_ASSOC);
+		if ($latest && count($data == 0)) {
+			$day = end($yearlist)."-".end($monthlist)."-".end($daylist);
+			$today = strtotime($day);
+			$res->execute(array(date("Y-m-d",$today)));
+			$data = $res->fetchAll(PDO::FETCH_ASSOC);
+		}
+	}
+	foreach($data as $k => $row)
+	{
+		if ($row['tags']) {
+			$json = json_decode($row['tags'], TRUE);
+			if (is_array($json))
+				$data[$k]['taglist'] = $json[0]['top_tags'];
+		}
+	}
+	$smarty->assign("urilist", $data);
+
+	$smarty->assign("thisyear", date("Y",$today));
+	$smarty->assign("thismonth", date("m",$today));
+	$smarty->assign("thisday", date("d",$today));
+
+	$output = $smarty->fetch($base."templates/milliways_uri.tpl");
+	$smarty->assign("title", "Milliways URI");
+	$smarty->assign("body", $output);
+	$smarty->assign("extra_styles", "/css/milliways.css");
+	$smarty->assign("refresh", 120);
+	return;
+}
+
+if (strtolower($pathlist[$mwpath+1]) == "status") {
+	$today = FALSE;
+	$wantuser = FALSE;
+	if (isset($pathlist[$mwpath+2])) {
+		if ($pathlist[$mwpath+2] == "user" && isset($pathlist[$mwpath+3])) 
+			$wantuser = $pathlist[$mwpath+3];
+		else
+			$today = strtotime($pathlist[$mwpath+2]);
+	}
+	if ($today === FALSE)
+		$today = time();
+
+	$smarty->assign("extra_scripts", array(
+		'<meta name="ROBOTS" content="NOINDEX" />',
+		'<meta name="ROBOTS" content="NOFOLLOW" />'));
+
+	$mwdb = new PDO('sqlite:/var/lib/mw/mwuri.db');
+	if ($wantuser !== FALSE) {
+		$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwdoing where user=? order by added desc");
+		$res->execute(array($wantuser));
+	} else {
+		$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwdoing where strftime('%Y-%m',added,'localtime')=? order by added desc");
+		$res->execute(array(date("Y-m",$today)));
+	}
+	//$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwdoing where date(added,'localtime')=? order by added desc");
+	//$res->execute(array(date("Y-m-d",$today)));
+	$data = $res->fetchAll(PDO::FETCH_ASSOC);
+	$smarty->assign("statuslist", $data);
+
+	$res = $mwdb->prepare("select distinct strftime('%Y',added) from mwdoing");
+	$res->execute();
+	$yearlist = $res->fetchAll(PDO::FETCH_COLUMN,0);
+	$smarty->assign("yearlist",$yearlist);
+
+	$res= $mwdb->prepare("select distinct strftime('%m',added) from mwdoing where strftime('%Y',added) = ?");
+	$res->execute(array(date("Y",$today)));
+	$mlist = $res->fetchAll(PDO::FETCH_COLUMN,0);
+	$monthlist = array();
+	foreach( $mlist as $m) {
+		$monthlist[$m] = $cal['abbrevmonths'][(int)$m];
+	}
+	$smarty->assign("monthlist",$monthlist);
+
+	$res= $mwdb->prepare("select distinct strftime('%d',added) from mwdoing where strftime('%Y-%m',added) = ?");
+	$res->execute(array(date("Y-m",$today)));
+	$daylist = $res->fetchAll(PDO::FETCH_COLUMN,0);
+	$smarty->assign("daylist",$daylist);
+
+	$smarty->assign("thisyear", date("Y",$today));
+	$smarty->assign("thismonth", date("m",$today));
+	$smarty->assign("thisday", date("d",$today));
+
+	$output = $smarty->fetch($base."templates/milliways_status.tpl");
+	$smarty->assign("title", "Milliways Status");
+	$smarty->assign("body", $output);
+	$smarty->assign("extra_styles", "/css/milliways.css");
+	$smarty->assign("refresh", 120);
+	return;
+}
+
+if (strtolower($pathlist[$mwpath+1]) == "tag") {
+	$smarty->assign("extra_scripts", array(
+		'<meta name="ROBOTS" content="NOINDEX" />',
+		'<meta name="ROBOTS" content="NOFOLLOW" />'));
+
+	$mwdb = new PDO('sqlite:/var/lib/mw/mwuri.db');
+	if (isset($pathlist[$mwpath+2])) {
+	$res = $mwdb->prepare("select *, date(added) as day, substr(tag,2) as name from mwtag where tag=? order by added desc");
+	$res->execute(array('#'.$pathlist[$mwpath+2]));
+	$data = $res->fetchAll(PDO::FETCH_ASSOC);
+	$smarty->assign("taglist", $data);
+	$output = $smarty->fetch($base."templates/milliways_tag.tpl");
+	} else {
+	$res = $mwdb->prepare("select distinct tag, substr(tag,2) as name, count(tag) as count from mwtag group by tag order by count(tag) desc limit 20");
+	$res->execute();
+	$data = $res->fetchAll(PDO::FETCH_ASSOC);
+	$smarty->assign("toplist", $data);
+
+	$res = $mwdb->prepare("select distinct tag, substr(tag,2) as name, count(tag) as count, max(added) as dated, date(max(added)) as day from mwtag group by tag order by max(added) desc limit 20");
+	$res->execute();
+	$data = $res->fetchAll(PDO::FETCH_ASSOC);
+	$smarty->assign("latestlist", $data);
+
+	$output = $smarty->fetch($base."templates/milliways_taglist.tpl");
+	}
+
+	$smarty->assign("title", "Milliways Tags");
+	$smarty->assign("body", $output);
+	$smarty->assign("extra_styles", "/css/milliways.css");
+	$smarty->assign("refresh", 120);
+	return;
+}
+
 exec("/usr/bin/mw -who", $wholist, $ret);
 $people = array();
+$idlers = array();
 foreach ($wholist as $person) {
     $pid = strtok($person, " ");
     if ($pid == "" || $pid == "Name" || substr($pid,0,5)=="-----") continue;
-    $people[] = array(
+    $person = array(
 	"username" => trim(substr($person, 1, 16)),
 	"idle"     => trim(substr($person, 18, 6)),
+	"idleseconds" => parseIdleTime(trim(substr($person, 18, 6))),
 	"what"     => substr($person,25));
+
+	if ($person['idleseconds'] > 10800) {
+		$idlers[] = $person;
+	} else {
+		$people[] = $person;
+	}
 }
 
+usort($people, 'compare_idletime');
+usort($idlers, 'compare_idletime');
+
+$output .= print_r($pathlist, true);
+
+// summary lists
+$mwdb = new PDO('sqlite:/var/lib/mw/mwuri.db');
+$res = $mwdb->prepare("select *, time(added,'localtime') as hour, date(added,'localtime') as day from mwuri order by added desc limit 5");
+$res->execute();
+$urilist = $res->fetchAll(PDO::FETCH_ASSOC);
+foreach ($urilist as $k=>$v) {
+	if ($v['title'] == "") $urilist[$k]['title']=$v['url'];
+	$urilist[$k]['title']=filter_var(trim($urilist[$k]['title']),FILTER_SANITIZE_STRING, FILTER_FLAG_STRIP_HIGH | FILTER_FLAG_STRIP_LOW);
+}
+$smarty->assign("urilist", $urilist);
+
+$res = $mwdb->prepare("select distinct tag, substr(tag,2) as name, count(tag) as count, max(added) as dated, date(max(added)) as day from mwtag group by tag order by max(added) desc limit 5");
+$res->execute();
+$taglist = $res->fetchAll(PDO::FETCH_ASSOC);
+$smarty->assign("taglist", $taglist);
+
 $smarty->assign("people",$people);
-$output = $smarty->fetch(SUCS_BASEDIR."templates/milliways.tpl");
+$smarty->assign("idlers",$idlers);
+$output = $smarty->fetch($base."templates/milliways.tpl");
 $smarty->assign("title", "Milliways");
-$smarty->assign("body", $output);
+$smarty->assign("body", file_get_contents($base."static/fragments/Milliways.txt"));
+$smarty->assign("secondary", $output);
 $smarty->assign("refresh", 120);
 ?>

Modified: trunk/components/motd.php
===================================================================
--- trunk/components/motd.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/motd.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -10,17 +10,34 @@
        $trans_tbl = array_flip($trans_tbl);
        $text = strtr($text, $trans_tbl);
    }
+   $text = preg_replace('~&ndash\;~i', '-', $text);
    $text = preg_replace('~&#x([0-9a-f]+);~ei', 'chr(hexdec("\\1"))', $text);
    $text = preg_replace('~&#([0-9]+);~e', 'chr("\\1")', $text);
    return $text;
 }
 
+//function to count and collect hyperlinks
+$links_count = 0;
+function linkcounter($uri) {
+	global $links_count, $uris;
+	$uris[++$links_count] = $uri;
+	return $links_count;
+}
+
+$poemmode = 0;
+
 $news = $DB->GetAll("SELECT * FROM news WHERE sticky=true AND expiry > now() ORDER BY date DESC");
+
 if (count($news)<3) {
   $news = $DB->GetAll("(SELECT * FROM news WHERE sticky=false AND expiry > now() ORDER by date DESC LIMIT ".(3-count($news)).") UNION SELECT * FROM news WHERE sticky=true AND expiry > now() ORDER BY date DESC");
 }
 
+if (count($news)<1) {
+    $news = $DB->GetAll("SELECT * FROM poems ORDER BY RANDOM() LIMIT 1");
+    $poemmode = 1;
+}
 
+
 $motd = "----------------------------- MESSAGE OF THE DAY ------------------------------\n\n";
 for ($i=count($news)-1;$i>-1;$i--) {
 $nitem = str_replace("\n", "", $news[$i]);
@@ -31,14 +48,36 @@
 $body = str_replace("<li>", "  * ", $body);
 $body = str_replace("</li>", "\n    ", $body);
 $body = str_replace(" ", " ", $body);
+$body = str_replace("…", "...", $body);
+$body = str_replace("'", "'", $body);
+// remove hyperlinks, collect to display later
+$body = preg_replace(":<a href=['\"](.+?)['\"].*?>(.*?)</a>:e", "'\\2['.linkcounter('\\1').']'", $body);
 $body = strip_tags($body);
 $body = decode_entities($body);
 $body = wordwrap($body, 75, "\n    ", 1);
 $body = rtrim($body);
 $motd .="    ".$body."\n";
-$motd .= str_pad($nitem['author'], 78, " ", STR_PAD_LEFT)."\n\n";
+if (isset($uris)) {
+	$footer = "----\n";
+	foreach ($uris as $urinum => $uri) {
+			$footer .= "    [$urinum]: $uri\n";
+			//remove uri from list so it won't show up on the next post
+			unset($uris[$urinum]);
+	}
+	$motd .= "    ".$footer;
 }
+$motd .= str_pad($nitem['author'], 78, " ", STR_PAD_LEFT)."\n";
+
+if ($poemmode == 1 && $nitem['submitter'] != '') {
+	$motd .= str_pad("Submitted by ".$nitem['submitter'], 78, " ", STR_PAD_LEFT)."\n";
+}
+$motd .= "\n";
+}
 $motd .= "---------------------------- [ http://sucs.org/ ] -----------------------------\n";
 
-file_put_contents($motd_file, $motd);
+//if (time()-filemtime($motd_file) < 86000  && $poemmode == 1) { //86000 to allow a little slack depending on when cron runs
+    // print "MOTD too recent to replace with a poem!\n";
+//} else {
+    file_put_contents($motd_file, $motd);
+//}
 ?>

Copied: trunk/components/motd_wrapper.php (from rev 656, branches/sucs-site/components/motd_wrapper.php)
===================================================================
--- trunk/components/motd_wrapper.php	                        (rev 0)
+++ trunk/components/motd_wrapper.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,14 @@
+<?PHP
+require("/var/www/sucssite/htdocs/settings.php");
+
+require("/usr/share/php/adodb/adodb.inc.php");
+
+$dbname = 'sucssite';
+$dbuser = 'apache';
+
+$DB = NewADOConnection('postgres8');
+$DB->Connect('dbname='.$dbname.' user='.$dbuser);
+$DB->SetCharSet('utf8');
+$DB->SetFetchMode(ADODB_FETCH_ASSOC);
+
+include($base."components/motd.php");

Modified: trunk/components/mw.php
===================================================================
--- trunk/components/mw.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/mw.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -4,7 +4,7 @@
 
 function load_folders()
 {
-	$f = fopen("/usr/lib64/mw/folders.bb", "r");
+	$f = fopen("/var/lib/mw/folders.bb", "r");
 
 	$folders = array();
 	while (!feof($f) && $fol=fread($f,64)) {
@@ -35,8 +35,8 @@
 function load_index($folname, $getbody=FALSE)
 {
 	$index = array();
-	$f = @fopen("/usr/lib64/mw/$folname.i", "r");
-	$body = @fopen("/usr/lib64/mw/$folname.t", "r");
+	$f = @fopen("/var/lib/mw/$folname.i", "r");
+	$body = @fopen("/var/lib/mw/$folname.t", "r");
 	if ($f === FALSE || $body === FALSE) return array();
 
 
@@ -94,9 +94,9 @@
 	$subject = strip_tags($_POST['subject']);
 	$body = strip_tags( $_POST['body']);
 
-	$to = ereg_replace('[^[:alnum:][:punct:][:space:]]*','',trim($to));
-	$subject = ereg_replace('[^[:alnum:][:punct:][:space:]]*','',trim($subject));
-	$body = ereg_replace("\n\\.\n","\n .\n",$body);
+	$to = preg_replace('/[^[:alnum:][:punct:][:space:]]*/','',trim($to));
+	$subject = preg_replace('/[^[:alnum:][:punct:][:space:]]*/','',trim($subject));
+	$body = preg_replace("/\n\\.\n","\n .\n/",$body);
 
 	$deb = fopen("/tmp/mwdebug.txt","w");
 	fwrite($deb, "folder: '$folder'\n");

Modified: trunk/components/news.php
===================================================================
--- trunk/components/news.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/news.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,7 +1,9 @@
 <?php
+// Ensure we have a trailing slash so that relative links within the page work
+if ($_SERVER['PATH_INFO']=="/News") header("Location: ".$baseurl."/News/");
 
 // A user must be in the staff group in order to edit content in this component
-$permission = "html";
+$permission = "sucsstaff";
 $newstable = "news";
 
 if (isset($session->groups[$permission])) {
@@ -15,17 +17,16 @@
 			$record['sticky'] = 't';
 		else
 			$record['sticky'] = 'f';
-		
+
 		if ($_REQUEST['id']=="*") {
 			$record['author'] = $session->username;
 			$record['date'] = "now";
-			$record['shorttitle'] = $_REQUEST['edittitle'];
 			$DB->AutoExecute($newstable, $record, 'INSERT');
 		} else {
 			$DB->AutoExecute($newstable, $record, 'UPDATE', "id=".$DB->qstr($_REQUEST['id']));
 		}
 		include("motd.php");
-		
+
 		break;
 	case "Delete":
 		$deleted = $DB->Execute("DELETE FROM $newstable WHERE id=?", array($_REQUEST['id']));
@@ -42,8 +43,7 @@
 if (@$pathlist[2]!="") $query .= " WHERE title=".$DB->qstr($pathlist[2]);
 $query .= " ORDER BY date DESC";
 
-$newsarray = $DB->GetArray($query);
-if (!empty($newsarray)) $smarty->assign("news", $newsarray);
+$smarty->assign("news", $DB->GetArray($query));
 
 $output = $smarty->fetch("news.tpl");
 $smarty->assign("title", "News");
@@ -55,15 +55,15 @@
 		$news = array(array("id" => "*"));
 		$smarty->assign("news", $news);
 	case "edit":
+		$output = $smarty->fetch("news_edit.tpl");
 		$smarty->assign("action", "edit");
 		$smarty->assign("title", "Edit News");
-		$output = $smarty->fetch("news_edit.tpl");
 		break;
 	case "delete-query":
-		$output = $smarty->fetch('news_delete.tpl').$output;		
+		$output = $smarty->fetch('news_delete.tpl').$output;
 		break;
 	case "expire-query":
-		$output = $smarty->fetch('news_expire.tpl').$output;		
+		$output = $smarty->fetch('news_expire.tpl').$output;
 		break;
 	case "Delete":
 		if ($deleted) $output = "News item deleted";

Modified: trunk/components/options.php
===================================================================
--- trunk/components/options.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/options.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -2,6 +2,7 @@
 
 // e-mail, password validation functions
 require_once("../lib/validation.php");
+require_once("Net/MAC.php");
 include_once("../lib/date.php");
 
 
@@ -9,7 +10,6 @@
 // These could possibly be moved somewhere saner?
 define('GUESTNET_LOW','137.44.10.130'); // These could possibly be a set of ranges or a subnet which might be saner?
 define('GUESTNET_HIGH','137.44.10.134'); // These could possibly be a set of ranges or a subnet which might be saner?
-$sucsdbname = 'sucs'; // This was stored in config, I just don't have it here in the test
 
 // Helper Functions
 // Could these be moved to some kind of library?
@@ -26,12 +26,7 @@
 		trigger_error("New passwords do not match", E_USER_WARNING);
 		return FALSE;
 	}
-/*
-	if (!strongPassword($newpass1)) {
-		trigger_error("New password is too weak.", E_USER_WARNING);
-		return FALSE;
-	}
-*/
+
 	$reason = weakPassword($newpass1);
 	if ($reason !== FALSE) {
 		trigger_error("New password is weak: $reason", E_USER_WARNING);
@@ -42,7 +37,7 @@
 		trigger_error("LDAP connect failed", E_USER_ERROR);
 		return FALSE;
 	}
-	
+
 	if (!($ldapbind = ldap_bind($ldap, "uid=".$session->username.",ou=People,dc=sucs,dc=org",$oldpass))) {
 		trigger_error("Existing password incorrect", E_USER_WARNING);
 		ldap_close($ldap);
@@ -62,14 +57,14 @@
 	global $sucsDB, $session, $error;
 	// Do some kind of checking here
 	// Check valid email (do we have a function for this?
-	if (!validEmail($externalEmail)) 
+	if (!validEmail($externalEmail))
 		return FALSE; // Valid Email handles errors itself
 	// Check valid phone number (do we have a function for this?)
 	if (empty($phone) || (strlen($phone) < 6)) {
 		trigger_error("You must have a contact phone number!", E_USER_WARNING);
 		return FALSE;
 	}
-	// Update 
+	// Update
 	if ($sucsDB->Execute('UPDATE members SET address = ?,phone = ?, email = ?, lastupdate = now(), lastedit = uid WHERE username = ?', 
 			array($address, $phone, $externalEmail, $session->username)) === FALSE) {
 		trigger_error("There was an error updating your contact details. Please contact admin.", E_USER_ERROR);
@@ -80,7 +75,7 @@
 
 function changeGuestnetDetails($wiredMAC) {
 	global $sucsDB, $session, $error;
-	// Get UID as we don't have it yet	
+	// Get UID as we don't have it yet
 	if(($uid = $sucsDB->GetOne("SELECt uid FROM members WHERE username = ?", array($session->username))) === FALSE) {
 		trigger_error("There was an error updating your GuestNET MAC Address. Please contact admin. (UID)", E_USER_ERROR);
 		return FALSE;
@@ -91,7 +86,7 @@
 		return FALSE;
 	}
 	exec('/usr/local/bin/update-dhcpd', $placeholder, $returnVar);
-	
+
 	if ($returnVar == 0) {
 		return TRUE;
 		//  $message[] = 'GuestNet MAC Address updated. Please wait a minute or two for the changes to take effect.';
@@ -103,8 +98,11 @@
 
 // Checks whether the given string mac address is valid
 function isValidMACAddr($mac) {
-	// Put code here if needed
-	return TRUE;
+    if (Net_MAC::check($mac)) {
+        return TRUE;
+    }else{
+        return FALSE;
+    }
 }
 
 // Returns the users GuestNet MAC Address if they have one and false otherwise
@@ -113,7 +111,7 @@
 	// Sanity Check ip?
 	// Check we are in the correct ip range (unregistered GuestNET addresses)
 	if (ip2long($ip) && (ip2long($ip) >= ip2long(GUESTNET_LOW)) && (ip2long($ip) <= ip2long(GUESTNET_HIGH))) {
-	
+
 		exec("sudo /usr/local/sbin/gw-copy-arp.sh", $placeholder, $returnVar);
 		if ($returnVar == 0) {
 			$arpLines = file('/tmp/gwarp');
@@ -159,8 +157,14 @@
 // Takes an entry from $_FILES and makes this the new hackergotchi
 function updateHackergotchi($fileDetails) {
 	global $session;
-	if ( ((list($width, $height, $type, $attr) = @getimagesize($fileDetails['tmp_name'])) !== false) && 
-	     ($type == IMAGETYPE_PNG) && ($width <= 128) && ($height <= 128)) {
+	if ( ((list($width, $height, $type, $attr) = @getimagesize($fileDetails['tmp_name'])) !== false)) {
+		if ($type != IMAGETYPE_PNG) {
+			trigger_error("Uploaded hackergotchi is not in PNG format. Please convert your image to PNG and try again.", E_USER_ERROR);
+			return FALSE;
+		} else if (($width > 128) || ($height > 128)) {
+			trigger_error("Uploaded hackergotchi is too large. Hackergotchis must be 128x128 pixels or smaller.", E_USER_ERROR);
+			return FALSE;
+		}
 
 		$imagefilepath = hackergotchiPath($session->username);
 
@@ -211,10 +215,8 @@
 
 if ($session->loggedin === TRUE) {
 
-	$sucsDB = NewADOConnection('postgres8');
-	$sucsDB->Connect('dbname='.$sucsdbname);
-	$sucsDB->SetFetchMode(ADODB_FETCH_ASSOC);
-	
+//	$sucsDB->debug = true;
+
 	$newGuestNetMAC = getGuestNetMAC();
 
 	// Handle Postbacks
@@ -241,7 +243,7 @@
 			case 'updatehackergotchi' :
 				if (updateHackergotchi($_FILES['hackergotchi'])) {
 					message_flash('Hackergotchi Updated');
-				} 
+				}
 				break;
 			case 'clearhackergotchi' :
 				if (clearHackergotchi()) {
@@ -265,7 +267,6 @@
 
 
 	$member = $sucsDB->GetRow("select * from members left join member_type on members.type=member_type.id where username='".$session->username."'");
-	$smarty->assign('member', $member);
 	$smarty->assign('paydate', $paydate);
 
 	if(($currentGuestNetMAC = $sucsDB->GetOne('SELECT * FROM guestnet WHERE uid=?', array((int)$member['uid']))) !== FALSE) {
@@ -278,6 +279,7 @@
 		$smarty->assign('newGuestNetMAC', $newGuestNetMAC);
 	}
 
+$smarty->assign('member', $member);
 
 }
 

Modified: trunk/components/pagemap.php
===================================================================
--- trunk/components/pagemap.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/pagemap.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,8 +1,15 @@
 <?php
 
-unset($output);
+$permission="html";
 
-if (@$pathlist[3] == "Edit") {
+// Only html group members can use this page - horrible emergency bodge
+if (isset($session->groups[$permission])) {
+    $smarty->assign("html", TRUE);
+
+
+    unset($output);
+
+    if (@$pathlist[3] == "Edit") {
 	if (isset($_REQUEST['mapid'])) {
 		$id = (int)$_REQUEST['mapid'];
 
@@ -18,8 +25,10 @@
 		header("Location: /Admin/Pagemap");
 		exit;
 	}
-} 
+    } 
 
+}
+
 if (!isset($output)) {
 	$smarty->assign("map",$DB->GetAll("SELECT * FROM pagemap ORDER BY depth, path"));
 	$output = $smarty->fetch(SUCS_BASEDIR."templates/pagemap.tpl");

Modified: trunk/components/pastebin.php
===================================================================
--- trunk/components/pastebin.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/pastebin.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -29,7 +29,7 @@
 
 
 // Debugging
-error_reporting(E_ALL);
+//error_reporting(E_ALL);
 
 // Config
 define('_LIST_LIMIT', 15);
@@ -39,7 +39,8 @@
 define('_TABLE_NAME', 'pastebin');
 
 $smarty->assign('urifragment', '/Tools/PasteBin/');
-$smarty->assign('uri', 'http://'.$_SERVER['SERVER_NAME'].'/pb/');
+$pburi = 'https://'.$_SERVER['SERVER_NAME'].$baseurl;
+$smarty->assign('uri', $pburi.'/pb/');
 
 // Init
 $id = '';
@@ -69,7 +70,8 @@
 require_once 'Text/Highlighter/Renderer/Html.php';
 require_once '../lib/ArrayRenderer.php';
 
-PEAR::setErrorHandling(PEAR_ERROR_TRIGGER, E_USER_WARNING);
+//yay php5.4
+(new PEAR)->setErrorHandling(PEAR_ERROR_TRIGGER, E_USER_WARNING);
 
 // Grabbed from blog.lib.php
 // Returns a textual diff between two time stamps
@@ -116,7 +118,6 @@
 	'JAVASCRIPT' => 'Javascript',
 	'MYSQL' => 'MySQL',
 	'PERL' => 'Perl',
-	'PHP' => 'PHP',
 	'PYTHON' => 'Python',
 	'RUBY' => 'Ruby',
 	'SQL' => 'SQL',
@@ -163,12 +164,16 @@
 		} else {
 			// Additional user validation needed here
 			//$retainTil = date('Y/m/d H:i:s', time() + $retain);
+			$id = $DB->GetOne("SELECT nextval('pastebin_id_seq'::regclass)");
 			$DB->Execute(
-				'INSERT INTO ' . _TABLE_NAME . ' ( code, username, retain_til, language) ' .
-				'VALUES (?, ?, ?, ?)', 
-				array( $code, $session->username, $retainTil, $pblang));
-			//$id = $DB->Insert_ID();
-			$id = $DB->GetOne('SELECT id FROM ' . _TABLE_NAME . ' WHERE code = ? AND username = ? AND retain_til = ?', array($code,$session->username,$retainTil));
+				'INSERT INTO ' . _TABLE_NAME . ' ( id, code, username, retain_til, language) ' .
+				'VALUES (?, ?, ?, ?, ?)', 
+				array( $id, $code, $session->username, $retainTil, $pblang));
+
+			//bump user to uri of newly pasted item
+			header('Status: 303 See Other');
+			header("Location: $pburi/Tools/PasteBin/$id");
+
 			$userInfo = 'Created By ' . $session->username . ' at ' . date('Y/m/d H:i');
 			$smarty->assign('id', $id);
 			$smarty->assign('userInfo', $userInfo);
@@ -212,14 +217,17 @@
 	// an else
 	if (!empty($code)) {
 		// Highlight the code
-		$renderer = new Text_Highlighter_Renderer_Array();
-		$hl = &Text_Highlighter::factory($pblang);
+		if ($pblang == 'NONE') {
+			$pblang = 'HTML';
+		}
+		$renderer = new Text_Highlighter_Renderer_Array_dez();
+		$tmpobj = new Text_Highlighter;
+		$hl =& $tmpobj->factory($pblang);
 		$hl->setRenderer($renderer);
 		// Have to decode again here for the highlighting
 		// It might be a little better if we kept the unencoded version from above
 		$highlightedCode = $hl->highlight(html_entity_decode($code, ENT_QUOTES,'UTF-8'));
 		$smarty->assign('highlightedCode', $highlightedCode);
-		
 	}
 }
 // Sort Out Languages

Deleted: trunk/components/planet.php
===================================================================
--- trunk/components/planet.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/planet.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,10 +0,0 @@
-<?php
-
-$smarty->assign("title", "Planet SUCS");
-$smarty->assign("rss_url", "http://planet.sucs.org/rss20.xml");
-$smarty->assign("atom_url", "http://planet.sucs.org/atom.xml");
-// Read planet output from where (we hope) Planet wrote it
-$body = file_get_contents(SUCS_BASEDIR."static/Community/Planet.txt");
-$smarty->assign("body", $body);
-
-?>

Deleted: trunk/components/planetposts.php
===================================================================
--- trunk/components/planetposts.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/planetposts.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,27 +0,0 @@
-<?php
-
-// number of recent planet entries we want to return
-$num_entries = 5;
-
-unset($result);
-$planetposts = array();
-
-$xmldata = file_get_contents("../htdocs/planet/atom.xml");
-$simplexml = simplexml_load_string($xmldata);
-$xml = $simplexml->children('http://www.w3.org/2005/Atom');
-
-foreach ($xml->entry as $entry) {
-	$planetposts[] = array(
-		"post" => $entry->title, 
-		"post_uri" => $entry->link->attributes()->href, 
-		"user" => $entry->author->name,
-		"user_uri" => $entry->author->uri
-		);
-}
-
-$planetposts = array_slice($planetposts, 0, $num_entries);
-
-$smarty->assign('planetposts', $planetposts);
-$result = $smarty->fetch('planetposts.tpl');
-
-?>

Copied: trunk/components/printer.graph.php (from rev 656, branches/sucs-site/components/printer.graph.php)
===================================================================
--- trunk/components/printer.graph.php	                        (rev 0)
+++ trunk/components/printer.graph.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,28 @@
+<?
+
+$res = $sucsDB->Execute("select username, sum(pages) as pages from printer where username != 'old' group by username order by sum(pages) desc");
+$num = $res->RecordCount();
+	for ($i=0;$i<$num;$i++) {
+		$row[$i] = $res->FetchRow();
+		if ($i < 12)
+		{
+			$item[]=$row[$i]['username'];
+			$slice[]=$row[$i]['pages'];
+		}
+		else {
+			$otherSize += $row[$i]['pages'];
+		}
+	}
+//	$itemName[]="Other";
+//	$sliceSize[]=$otherSize;
+
+	$slice = array_merge(array($otherSize),$slice);
+	$item = array_merge(array("Other"), $item);
+
+/*	echo "<pre>";
+	print_r($slice);
+	print_r($item);*/
+
+	include("../../lib/pieChart.php");
+	piechart("Top 12, Users of Printing", $slice, $item,0)
+?>
\ No newline at end of file

Copied: trunk/components/printer.php (from rev 656, branches/sucs-site/components/printer.php)
===================================================================
--- trunk/components/printer.php	                        (rev 0)
+++ trunk/components/printer.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,152 @@
+<?PHP
+/******
+ * Printer Shame List
+ * Ported from old site by tswsl1989
+ *
+ */
+$max=10; //Set this to number of users to display in chart
+
+$timestamp = '2014-02-05 18:29:02+00'; //display printer stats since this time
+
+$smarty->assign('title',"Printer Statistics");
+
+// $out="<img src=\"/images/printer.graph.php\" alt=\"pie chart of top 12 printer users\"/>";
+$table="<table border=1 cellpadding=3>\n<tr>\n<th>Username</th>\n<th>Pages</th>\n<th>Projected Monthly Usage</th>\n<th>Printed This Month</th>\n<th>What it would cost in the library</th></tr>\n";
+
+//pull in all the current users (ie not old) who have printed stuff
+$res = $sucsDB->Execute("select username, sum(pages) as pages from printer where username != 'old' AND start > '".$timestamp."' group by username order by sum(pages) desc");
+$num = $res->RecordCount();
+//for each row stuff the infomation into an array, then free up the database resorces
+for ($i=0;$i<$num;$i++) {
+	$data[$i] = $res->FetchRow();
+	$data[$i]['month'] = 0;
+}
+$res->Close();
+
+//get the second since epoch
+$thisSecond = time();
+//for each user who has printed stuff add the first printed time (since epoch) to the array 
+for ($i=0;$i<$num;$i++) {
+	$res = $sucsDB->Execute("select date_part('epoch',start) as first from printer where username ='".$data[$i]['username']."' order by start asc limit 1;");
+	$temp = $res->FetchRow();
+	$data[$i]['first'] = $temp['first'];
+	$res->Close();
+}
+
+$res = $sucsDB->Execute("select username, pages, start from printer where username != 'old'");
+$datesnum = $res->RecordCount();//for each row stuff the infomation into an array, then free up the database resorces
+for ($i=0;$i<$datesnum;$i++) {
+	$dates[$i] = $res->FetchRow($res, $i);
+}
+$res->Close();
+
+
+// get the current month
+$theMonth = date("m");
+$theYear = date("Y");
+for ($i=0;$i<$datesnum;$i++) {
+	$userMonth = substr($dates[$i]['start'], 5, 2);
+	$userYear = substr($dates[$i]['start'], 0, 4);
+	if (($userMonth == $theMonth) && ($userYear == $theYear)) {
+		for ($j=0;$j<$num;$j++) {
+			if ($data[$j]['username'] == $dates[$i]['username']) {
+				$data[$j]['month'] += $dates[$i]['pages'];
+			}
+		}
+	}
+}
+
+//start the total counter
+$total = 0;
+//for each user.. print a row in the table
+for ($i=0;$i<$num;$i++) {
+	$table.="<tr align=\"center\">\n";
+	$table.="<td>{$data[$i]['username']}</td>\n";
+	$table.="<td>{$data[$i]['pages']}</td>\n";
+	//avg pages per month = seconds in a month / (now - first print) * pages
+	$crazyGuess = round((2629743.83/($thisSecond-$data[$i]['first']))*$data[$i]['pages']);
+	//if the user has only started printing in the last month its not sensible to give a guess of average useage
+	if ($thisSecond-$data[$i]['first'] <= 2629743.83) {
+		$table.="<td>Not enough data</td>\n";
+	}
+	//traffic lights for pinter useage, adjust values as required
+	elseif($crazyGuess <= 25) {
+		$table.="<td BGCOLOR=\"Green\">".$crazyGuess."</td>\n";
+	}
+	elseif($crazyGuess <= 33) {
+		$table.="<td BGCOLOR=\"Orange\">".$crazyGuess."</td>\n";
+	}
+	else{
+		$table.="<td BGCOLOR=\"Red\">".$crazyGuess."</td>\n";
+	}
+	if ($data[$i]['month'] >= 300) {
+		$table.="<td BGCOLOR=\"Red\">{$data[$i]['month']}</td>\n";
+	} else {
+		$table.="<td>{$data[$i]['month']}</td>\n";
+	}
+	$table.="<td>".sprintf("£ %01.2f",round(0.05*$data[$i]['pages'],2))."</td>\n";
+	//add this users useage to the total
+	$total += $data[$i]['pages'];
+	$table.="</tr>\n";
+}
+
+//get the first print date
+$date['first'] = getdate("1391624942");
+
+//get the last print date
+$res = $sucsDB->Execute("select date_part('epoch',start) as last from printer order by start desc limit 1;");
+$temp = $res->FetchRow();
+$date['last'] = getdate($temp['last']);
+$res->Close();
+//get the number of pages printed by "old" users and add it to the total
+$res = $sucsDB->Execute("select sum(pages) as pages from printer where username = 'old' group by username order by sum(pages) desc");
+$old = $res->FetchRow();
+$old = $old[0];
+$res->Close();
+$total += $old;
+//Output two lines at the bottem of the table, one for "old" users and the other for the total
+$table.="<tr align=\"center\">\n\t<th>Old Users</th>\n\t<th>$old</th>\n\t<th>n/a</th>\n</tr>";
+$table.="<tr align=\"center\">\n\t<th>Total</th>\n\t<th>$total</th>\n\t<th>".round((2629743.83/($thisSecond-$date['first'][0]))*$total)."</th>\n</tr>";
+$table.="</table>\n";
+
+//output the dates of the first and last prints recorded
+$out.="<script type=\"text/javascript\" src=\"https://www.google.com/jsapi\"></script>
+    <script type=\"text/javascript\">
+      google.load(\"visualization\", \"1\", {packages:[\"corechart\"]});
+      google.setOnLoadCallback(drawChart);
+      function drawChart() {
+        var data = new google.visualization.DataTable();
+        data.addColumn('string', 'User');
+	data.addColumn('number', 'Pages Printed');
+        data.addRows(".($max+2).");\n";
+for( $i=0; $i<($max+1); $i++ ){
+	$out.="data.setValue(".($i).", 0, '".$data[$i]['username']."');\n";
+	$out.="data.setValue(".($i).", 1,".$data[$i]['pages'].");\n";
+}
+$others=0;
+for ( $i=$max; $i<count($data); $i++ ) {
+	$others+=$data[$i]['pages'];
+}
+$out.="data.setValue(".($max+1).", 0, 'Others');\ndata.setValue(".($max+1).",1, $others);\n";
+$out.="\t\tvar chart = new google.visualization.PieChart(document.getElementById('chart_div'));
+        chart.draw(data, {width: 500, height: 360, backgroundColor: 'none', is3D: true, title: 'Printer Usage'});
+      }
+    </script>";
+$out.="<div id=\"chart_div\" style=\"background: none;\"></div>";
+$out.="<p>First Data -  ".$date['first'][weekday].", ".$date['first'][mday]." ".$date['first'][month]." ".$date['first'][year].", at ".sprintf("%02d:%02d:%02d",$date['first'][hours],$date['first'][minutes],$date['first'][seconds])."<br />";
+$out.="Last Data -  ".$date['last'][weekday].", ".$date['last'][mday]." ".$date['last'][month]." ".$date['last'][year].", at ".sprintf("%02d:%02d:%02d",$date['last'][hours],$date['last'][minutes],$date['last'][seconds])."</p>";
+//do some silly maths to work out lots of silly things
+$paperarea = round(0.21*0.297*$total,3); //area of paper
+$paperweight = round($paperarea*.08, 3); //how much that would weigh
+$numtrees = round($paperweight/730.296, 6); //*very* roughly how many trees that would be
+$cost = sprintf("£%01.2f",round(0.05*$total,2));
+$out.="<p>That's ".$paperarea."m<sup>2</sup> of paper, weighing ".$paperweight."kg!<br>\n";
+$out.="This is equivalent to approximately ".$numtrees." trees.<br>\n";
+$out.="That would have cost our members a grand total of ".$cost." if it were printed in the library.. not bad for £5 each!";
+
+//done
+$out.="<p>Note: The number of pages is the number spooled and may be more than the actual number printed</p>";
+$out.=$table;
+$sucsDB->Close();
+$smarty->assign('body',$out);
+?>

Modified: trunk/components/projects.php
===================================================================
--- trunk/components/projects.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/projects.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -8,28 +8,33 @@
 		$object=array();
 		$object['filename'] = $file;
 		$ini_array = array();
-		$ini_data = file("/var/projects/trac/".$file."/conf/trac.ini");
+		$filepath = "/var/projects/trac/".$file."/conf/trac.ini";
+
+		// read trac.ini for this project
+		if (is_readable($filepath) && ($ini_data = file($filepath)) != FALSE) {
 		
-		$projectsection = FALSE;
-		foreach ($ini_data as $ini_line) {
-			if (trim($ini_line) == "[project]") {
-				$projectsection = TRUE;		
-			} else if ($projectsection && (1 == preg_match("/^\[.*\]$/", trim($ini_line)))) {
-				$projectsection = FALSE;
-			} else if ($projectsection) { 
-				list($key, $value) = split("=", $ini_line);
-				$ini_array[trim($key)] = trim($value);
+			$projectsection = FALSE;
+			foreach ($ini_data as $ini_line) {
+				if (trim($ini_line) == "[project]") {
+					$projectsection = TRUE;		
+				} else if ($projectsection && (1 == preg_match("/^\[.*\]$/", trim($ini_line)))) {
+					$projectsection = FALSE;
+				} else if ($projectsection) { 
+					list($key, $value) = preg_split("/=/", $ini_line);
+					$ini_array[trim($key)] = trim($value);
+				}
 			}
-		}
 
-		if (isset($ini_array['public']) && ($ini_array['public'] == "true")) {
+			// only list projects whose trac.ini sets public = true
+			if (isset($ini_array['public']) && ($ini_array['public'] == "true")) {
 
-			$object['name'] = $ini_array['name'];
-			if ($object['name']=="") $object['name'] = $file;
-			
-			$object['descr'] = $ini_array['descr'];
-			
-			$projects[$file]=$object;
+				$object['name'] = $ini_array['name'];
+				if ($object['name']=="") $object['name'] = $file;
+				
+				$object['descr'] = $ini_array['descr'];
+				
+				$projects[$file]=$object;
+			}
 		}
 	}
 }

Copied: trunk/components/signup-admin.php (from rev 656, branches/sucs-site/components/signup-admin.php)
===================================================================
--- trunk/components/signup-admin.php	                        (rev 0)
+++ trunk/components/signup-admin.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,44 @@
+<?php
+// Config options
+$permission="sucsstaff";
+// TODO: DEV: UNSTICK THIS BEFORE DEPLOY
+if (isset($session->groups[$permission])) {
+	$smarty->assign("staff",TRUE);
+
+	//get unused signup slips
+	$query  = "SELECT signup.id, signup.sid, member_type.typename, members.username, signup.card";
+       	$query .= " FROM signup LEFT JOIN member_type ON signup.type = member_type.id LEFT JOIN members ON signup.issuedby=members.uid";
+	$query .= " WHERE";
+	$query .= " signup.activated is NULL";
+	$query .= " or signup.username is NULL";
+	$query .= " ORDER BY signup.id";
+	$query .= ";";
+	$data = $sucsDB->GetAll($query);
+        // process responces
+        if(isset($_POST['command'])){
+                if($_POST['command']=='update'){
+			$changed = 0;
+			$upquery  = "UPDATE signup";
+                        $upquery .= " SET sid = ?";
+			$upquery .= " WHERE id = ?";
+			$upquery .= ";";
+			foreach($data as $value){
+				if(array_key_exists('sid:'.$value['id'],$_POST) && $_POST['sid:'.$value['id']]!=$value['sid']){
+					$uparray = array($_POST['sid:'.$value['id']],$value['id']);
+					$sucsDB->query($upquery,$uparray);
+					$changed++;
+				}
+			}
+                        message_flash($changed." record(s) updated");
+
+                }
+	}
+	$data = $sucsDB->GetAll($query);
+	//set smarty stuff
+	$smarty->assign("signups",$data);
+	$smarty->assign("self",$baseurl.$path.$getout);
+}
+$body = $smarty->fetch("signup-admin.tpl");
+$smarty->assign('title', "Signup Slip Admin");
+$smarty->assign('body', $body);
+?>

Modified: trunk/components/signup.php
===================================================================
--- trunk/components/signup.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/signup.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,11 +1,396 @@
 <?php
-/* Temporary Component to get the signup stuff working with new SUCS site */
+//ob_start();
+//include("../member/signup.php");
+//$output = ob_get_contents();
+//ob_end_clean();
+//
 
-ob_start();
-include("../member/signup.php");
-$output = ob_get_contents();
-ob_end_clean();
+// -------------------------------------------------------------
+// DEV: CHANGE THIS FOR DEV MODE
+// -------------------------------------------------------------
 
+//$script_path="/home/member/eclipse/signuptests/";
+$script_path="sudo /usr/local/sbin/";
+
+// DEV: CHNAGE THIS FOR DEV MODE
+//$error_email="eclipse at sucs.org";
+$error_email="admin at sucs.org";
+
+$override_permission="sucsstaff";
+
+// is the validation (mostly) overridable
+$overridable=isset($session->groups[$override_permission]);
+
+// ------------------------------------------------
+// DEV: UNCOMMENT THIS FOR DEV MODE
+// ------------------------------------------------
+
+//$overridable=true;
+
+//set defaults
+$mode = 'login';
+
+//login
+if(isset($_REQUEST['signupid'])&&isset($_REQUEST['signuppw'])){
+    //set signup details
+    $signupid = $_REQUEST['signupid'];
+    $signuppw = $_REQUEST['signuppw'];
+
+    //$sucsDB->debug = true;
+
+    // get row(s)
+    $query = "SELECT * FROM signup WHERE id=? AND password=?";
+    $array = array($signupid,$signuppw);
+    $data = $sucsDB->GetAll($query,$array);
+    // if data was returned and it was exactly 1 row
+    if(is_array($data)&&sizeof($data)==1){
+	$row=$data[0];
+	// if the id hasnt already been used
+	if(!(isset($row[activated])&&isset($row[username]))){
+	    // pass on the id and passwd and id the validation is overridable
+	    $smarty->assign("signupid",$signupid);
+	    $smarty->assign("signuppw",$signuppw);
+	    $smarty->assign("overridable",$overridable);
+	    $smarty->assign("usertype",$row[type]);
+	    // if accepting the form
+	    if(isset($_REQUEST['username']) && isset($_REQUEST['realname']) && isset($_REQUEST['email']) && isset($_REQUEST['phone'])){
+		require_once("../lib/validation.php");
+		$override = $overridable && (isset($_POST['override']) && $_POST['override']=="on");
+		$valid=true;
+		$errors=array();
+		$fields=array();
+		if(!validUsername($_REQUEST['username'])){
+		    $valid=false;
+		    $errors['username']=$error;
+		}
+		$fields['username']=$_REQUEST['username'];
+		if(!(validSignupEmail($_REQUEST['email']) || $override)){
+		    $valid=false;
+		    $errors['email']=$error;
+		}
+		$fields['email']=$_REQUEST['email'];
+		if(!(validPhone($_REQUEST['phone']) || $override)){
+		    $valid=false;
+		    $errors['phone']=$error;
+		}
+		$fields['phone']=sanitizePhone($_REQUEST['phone']);
+		if($row[type]!=2){
+		    if(!(validAddress($_REQUEST['address']) || $override)){
+			$valid=false;
+			$errors['address']=$error;
+		    }
+		    $fields['address']=sanitizeAddress($_POST['address']);
+		    if(!validRealName($_REQUEST['realname'],$override)){
+			$valid=false;
+			$errors['realname']=$error;
+		    }
+		    $fields['realname']=$_REQUEST['realname'];
+		}
+		else{
+		    if(!(validRealName($_REQUEST['contact'],false) || $override)){
+			$valid=false;
+			$errors['contact']=$error;
+		    }
+		    $fields['contact']=$_REQUEST['contact'];
+		    if(!validSocName($_REQUEST['realname'], $override)){
+			$valid=false;
+			$errors['realname']=$error;
+		    }
+		    $fields['realname']=$_REQUEST['realname'];
+		}
+		if($row[type]==1){
+			if(!validSID($_REQUEST['studentid'],$override)){
+			    $valid=false;
+			    $errors['studentid']=$error;
+			}
+			$fields['studentid']=$_REQUEST['studentid'];
+		}
+
+		if($valid){
+		    // include membership adding functions
+		    require_once("../lib/member_functions.php");
+		    $mode='result';
+		    $failed=false;
+
+		    // invalidate signup slip
+		    $query = "UPDATE signup SET sid=?, username=?, activated=now() WHERE id=?";
+
+		    unset($atribs);
+		    $atribs[0]=$fields['studentid'];
+		    $atribs[1]=$fields['username'];
+		    $atribs[2]=$signupid;
+		    $responce = $sucsDB->Execute($query,$atribs);
+		    if(!$responce){
+			    mail(
+				    $error_email,
+				    "Signup Error",
+				    "Unable to invalidate signup slip: ".$signupid."\nAborting\nError message:\n".$sucsDB->ErrorMsg(),
+				    "From: \"SUCS Admin\" <admin at sucs.org>"
+			    );
+			    $failed=true;
+		    }
+		    else{
+			    // determine the uid range
+			    if($row[type]==2){
+				    $baseuid=8;
+			    }
+			    else{
+				    $baseuid=29;
+			    }
+			    $minuid=$baseuid*1000;
+			    $maxuid=$minuid+999;
+			    //get the new uid
+			    $uid=findUid($minuid,$maxuid);
+			    // make a password
+			    $password=make_password();
+			    // make the ldif
+			    $ldif=generateLdif($uid,$password,$row[type],$fields['realname'],$fields['username']);
+			    // write ldif file
+			    file_put_contents('/tmp/useradd.'.$fields['username'].'.ldif',$ldif);
+			    exec(
+				    $script_path.'useradd.apache '.
+				    escapeshellarg($fields['username']).' '.
+				    escapeshellarg($fields['studentid']).' '.
+				    escapeshellarg($fields['email']).
+				    ' 2>&1',
+				    $execoutputarr,
+				    $execreturn
+			    );
+			    if($execreturn!=0){
+				$execoutputstr=implode("\n",$execoutputarr);
+				mail(
+				    $error_email,
+				    "Error creating user for signup id: ".$signupid,
+				    $execoutputstr,
+				    "From: \"SUCS Admin\" <admin at sucs.org>"
+			    	);
+				$failed=true;
+			    }
+			    // DEV: STICK THIS FOR DEV
+			    if(posix_getpwnam($fields['username'])){
+				    $query="SELECT count(*) from members where username = ?";
+				    $data = $sucsDB->GetAll($query,array($fields['username']));
+				    if($data[0]['count']!=0){
+					    mail(
+						    $error_email,
+						    "Signup Error",
+						    "User ".$fields['username']." already exists in the databse, THIS SHOULD NEVER HAPPEN\n Love the signup system.\n\nP.S. the signup id is: ".$signupid,
+						    "From: \"SUCS Admin\" <admin at sucs.org>"
+					    );
+					    $failed=true;
+				    }
+				    else{
+					    $query  = "INSERT INTO members (";
+					    $query .= "uid, username, realname, email, address, phone, sid, type, paid, lastedit, comments";
+					    $query .= ") values (";
+					    $query .= "?, ?, ?, ?";
+					    // if its a soc then it has no address
+					    if($row[type]!=2){
+						    $query .= ", ?"; //address
+					    }
+					    else{
+						    $query .= ", DEFAULT"; //address
+					    }
+					    $query .= ", ?"; //phone
+					    // only student had a sid
+					    if($row[type]==1){
+						    $query .= ", ?"; //sid
+					    }
+					    else{
+						    $query .= ", DEFAULT";
+					    }
+					    $query .= ", ?, ?, ?";
+					    // socienty add a default comment
+					    if($row[type]==2){
+						    $query .= ", ?";// comment
+					    }
+					    else{
+						    $query .= ", DEFAULT";
+					    }
+					    $query .= ");";
+					    unset($atribs);
+					    $atribs[]=$uid;
+					    $atribs[]=$fields['username'];
+					    $atribs[]=$fields['realname'];
+					    $atribs[]=$fields['email'];
+					    if($row[type]!=2){
+						    $atribs[]=$fields['address'];
+					    }
+					    $atribs[]=$fields['phone'];
+					    if($row[type]==1){
+						    $atribs[]=$fields['studentid'];
+					    }
+					    $atribs[]=$row[type];
+					    include_once("../lib/date.php");
+					    $atribs[]=paidUntil(time());
+					    $atribs[]=$uid;
+					    if($row[type]==2){
+						    $atribs[]="Contact name: ".$fields['contact'];
+					    }
+					    $responce = $sucsDB->Execute($query,$atribs);
+					    // if somthing broke then email
+					    if(!$responce){
+						mail(
+						    $error_email,
+						    "Signup Error",
+						    "Database problems for signup id: ".$signupid."\nError message:\n".$sucsDB->ErrorMsg(),
+						    "From: \"SUCS Admin\" <admin at sucs.org>"
+					    	);
+						$failed=true;
+					    }
+					    else{
+						    // if door card is connected to the signup slip move it to its proper home
+						    if($row[card] != ''){
+							    $query="INSERT INTO doorcards (uid,cardnumber) VALUES (?, ?);";
+							    unset($atribs);
+							    $atribs[0]=$uid;
+							    $atribs[1]=$row[card];
+							    $responce=$sucsDB->Execute($query,$atribs);
+							    if(!$responce){
+								    mail(
+									    $error_email,
+									    "Signup Error",
+									    "Failed to migrate card details for signup id: ".$signupid."\nError message:\n".$sucsDB->ErrorMsg(),
+									    "From: \"SUCS Admin\" <admin at sucs.org>"
+								    );
+							    }
+						    }
+
+						    $logsmessage  = "New user '".$fields['username']."' has been created on SUCS\n";
+						    $logsmessage .= "at: ".date("H:i ",time())." on ".date("l F jS Y", time())."\n";
+						    $logsmessage .= "From: ".$_SERVER['REMOTE_ADDR']."\n";
+						    $logsmessage .= "Using signup id: ".$signupid."\n";
+						    if($override){
+							    $logsmessage .= "User ".$session->username." overrode validation.\n";
+						    }
+						    $logsmessage .= "Love The Signup System";
+						    // DEV: CHANGE THIS EMAIL ADDRESS
+						    mail(
+							    "logs at sucs.org",
+							    "User '".$fields['username']."' Created on SUCS",
+							    $logsmessage,
+							    "From: \"SUCS Admin\" <admin at sucs.org>"
+						    );
+                                                    mail(
+                                                            "treasurer at sucs.org",
+                                                            "User '".$fields['username']."' Created on SUCS",
+                                                            $logsmessage,
+                                                            "From: \"SUCS Admin\" <admin at sucs.org>"
+                                                    );
+
+						    $usermessage  = "Welcome to the Swansea University Computer Society!\n\n";
+						    $usermessage .= "Your account details are:\n\n";
+						    $usermessage .= "Username: ".$fields['username']."\n";
+						    $usermessage .= "Password: ".$password."\n\n";
+						    $usermessage .= "Wondering what to do next? Check out our Getting Started page: http://sucs.org/Getting%20Started or go right ahead and post on our forum at http://sucs.org/Community/Forum or join in the discussion on our chat system, Milliways: http://sucs.org/Community/Milliways\n\n";
+						    $usermessage .= "Our weekly social is held in the coffee end JC's at 1:00 PM every Wednesday\n\n";
+						    $usermessage .= "Before you use the SUCS computers or the computer room, please make sure you are familiar with the conditions of use and room rules at http://sucs.org/About/Regulations\n\n";
+						    $usermessage .= "If you require help using the system, introductory guides are available at http://sucs.org/Knowledge\n\n";
+						    $usermessage .= "If you have any trouble using the system, reply to this e-mail describing the nature of the problem and we'll look into it.\n\n";
+						    $usermessage .= "We hope you enjoy your SUCS membership.\n\n";
+						    $usermessage .= "Regards,\n\n";
+						    $usermessage .= "Swansea University Computer Society";
+						    if($fields['email']!=''){
+							    $user_email=$fields['email'];
+						    }
+						    elseif($fields['studentid']!=''){
+							    $user_email=$fields['studentid']."@swan.ac.uk";
+						    }
+						    else{
+							    $user_email=FALSE;
+						    }
+						    if($user_email){
+							mail(
+							    $user_email,
+							    "Your SUCS Account has been created!",
+							    $usermessage,
+							    "From: \"SUCS Admin\" <admin at sucs.org>"
+							);
+						    }
+					    }
+				    }
+			    }
+
+				//Wrong logic, only students have student email addresses ~imranh
+                            if ($row['type']==1){
+			            $addtolist ="".$fields['email']."\n".$fields['studentid']."@swan.ac.uk";
+                            }else{
+				    $addtolist="".$fields['email']."\n"; //Societies don't have student email addresses
+		            }
+			    file_put_contents('/tmp/listadd.'.$fields['username'],$addtolist);
+			    unset($execoutputarr);
+			    exec(
+				    $script_path.'listadd.apache '.
+				    escapeshellarg($fields['username']).' '.
+				    escapeshellarg($row[type]).
+				    ' 2>&1',
+				    $execoutputarr,
+				    $ececreturn
+			    );
+			    if($execreturn!=0){
+                                $execoutputstr=implode("\n",$execoutputarr);
+
+                                mail(
+                                    $error_email,
+                                    "Error adding user to mailing lists from signup id: ".$signupid,
+                                    $execoutputstr,
+                                    "From: \"SUCS Admin\" <admin at sucs.org>"
+                                );
+                                $failed=true;
+                            }
+
+		    }
+		    $smarty->assign("failed",$failed);
+		    if($failed){
+			    $errorreparray=$_POST;
+			    unset($errorroparray[signuppw]);
+			    $errorreparray[uid]=$uid;
+			    $errorreport = "User input details:\n\n";
+			    foreach ($errorreparray as $key => $value){
+				    $errorreport .= $key.": ".$value."\n";
+			    }
+			    $errorreport .= "\nLove from the Signup System";
+			    mail(
+				    $error_email,
+				    "Signup system error report",
+				    $errorreport,
+				    "From: \"SUCS Admin\" <admin at sucs.org>"
+			    );
+		    }
+		    else{
+			    $smarty->assign("username", $fields['username']);
+			    $smarty->assign("password", $password);
+			    $smarty->assign("email", $user_email);
+		    }
+
+		}
+		else{
+		    //re-show form
+		    $script = "<script language='javascript' type='text/javascript' src='".$baseurl."/js/jquery.js'></script>\n";
+		    $script .= "<script language='javascript' type='text/javascript' src='$baseurl/js/signup.js'></script>\n";
+		    $smarty->assign("fields",$fields);
+		    $smarty->assign("errors",$errors);
+        	    $smarty->append('extra_scripts', $script);
+                    $mode='re-form';
+		}
+	    }
+	    else{
+		// display the form
+                $script = "<script language='javascript' type='text/javascript' src='".$baseurl."/js/jquery.js'></script>\n";
+		$script .= "<script language='javascript' type='text/javascript' src='$baseurl/js/signup.js'></script>\n";
+		$smarty->append('extra_scripts', $script);
+		$mode='form';
+	    }
+	}
+	else trigger_error("Signup ID already used",E_USER_WARNING);
+    }
+    else trigger_error("Invalid ID or Password", E_USER_WARNING);
+
+}
+//Set smarty Variables
+$smarty->assign("mode", $mode);
+$output =  $smarty->fetch("signup.tpl");
+
 $smarty->assign("title", "Sign Up");
 $smarty->assign("body", $output);
 

Copied: trunk/components/signupajax.php (from rev 656, branches/sucs-site/components/signupajax.php)
===================================================================
--- trunk/components/signupajax.php	                        (rev 0)
+++ trunk/components/signupajax.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,80 @@
+<?
+require_once("../lib/validation.php");
+// don't output the site template
+$no_template = TRUE;
+header("Content-type: text/plain");
+if (isset($_GET['key'])){
+	switch($_GET['key']){
+	case "sid":
+		$sid=$_GET['value'];
+		if(validSID($sid,false)){
+			echo "OK:".lookupSID($_GET['value']);
+		}
+		else{
+			echo "ERROR:".$error;
+		}
+		break;
+	case "postcode":
+		$postcode=implode("", explode(" ", $_GET['value']));
+		echo json_encode(lookup_postcode($postcode));
+		break;
+	case "username":
+		$username = $_GET['value'];
+		if(validUsername($username)){
+			echo "OK";
+		}
+		else{
+			echo $error;
+		}
+		break;
+	case "realname":
+		$realname = $_GET['value'];
+		if(validRealName($realname,false)){
+			echo "OK";
+		}
+		else{
+			echo $error;
+		}
+		break;
+	case "socname":
+		$socname = $_GET['value'];
+		if(validSocName($socname,false)){
+			echo "OK";
+		}
+		else{
+			echo $error;
+		}
+		break;
+
+
+        case "address":
+                $address = $_GET['value'];
+                if(validAddress($address)){
+                        echo "OK";
+                }
+                else{   
+                        echo $error;
+                }
+                break;
+
+	case "email":
+		$email = $_GET['value'];
+		if(validSignupEmail($email)){
+			echo "OK";
+		}
+		else{
+			echo $error;
+		}
+		break;
+	case "phone":
+		$phone = $_GET['value'];
+		if(validPhone($phone)){
+			echo "OK";
+		}
+		else{
+			echo $error;
+		}
+		break;
+	}
+}
+?>

Modified: trunk/components/societies.php
===================================================================
--- trunk/components/societies.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/societies.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -5,7 +5,8 @@
 
 // Connect and bind to ldap server
 $conn = ldap_connect(_LDAP_SERVER);
-$bind = ldap_bind($conn);
+# ldap_set_option($conn, LDAP_OPT_PROTOCOL_VERSION, 3);
+# $bind = ldap_bind($conn);
 
 $search = ldap_search($conn, _BASE_DN, 'uid=*', array('uid', 'cn', 'homedirectory'));
 
@@ -19,9 +20,12 @@
                 $fullname = ldap_get_values($conn, $entryHandler, 'cn');
 		$homedir  = ldap_get_values($conn, $entryHandler, 'homedirectory');
 
-		$homedir  = explode('/', $homedir[0]);
+		$homedir = $homedir[0];
+		$homedirArray  = explode('/', $homedir);
 
-                if ($homedir[2]=="society") $usernames[] = array( "username" => $username[0], "fullname" => $fullname[0]);
+			if (($homedirArray[2]=="society") && file_exists( "$homedir/public_html")) { 
+				$usernames[] = array( "username" => $username[0], "fullname" => $fullname[0]);
+			}
                 $entryHandler = ldap_next_entry($conn, $entryHandler);
         }
 

Modified: trunk/components/static.php
===================================================================
--- trunk/components/static.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/static.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -50,7 +50,7 @@
 	case "Save":
 		// ...save the file
 		$savesuccess = @file_put_contents($myfile, $_REQUEST['body'], LOCK_EX);
-		if (!$savesuccess) $smarty->assign("fileerror", "Write failed");
+		if (!$savesuccess) trigger_error("Write failed", E_USER_ERROR);
 		$id = $DB->GetOne("select id from static where path=?", array($path));
 		$record = array();
 		$record['summary'] = $_REQUEST['summary'];
@@ -82,8 +82,13 @@
 	$smarty->assign("secondary", $secondary);
 }
 
-$smarty->assign("title", $title);
+// include a widget for leaving feedback on this page if the user is logged in
+if ($session->loggedin) {
+//	include("../lib/page-feedback.php");
+}
 
+$smarty->assign("title", str_replace("_", " ", $title));
+
 // Editing static pages - does the user have permission?
 if (isset($session->groups[$permission])) {
 // display Edit link on page

Copied: trunk/components/susignup-admin.php (from rev 656, branches/sucs-site/components/susignup-admin.php)
===================================================================
--- trunk/components/susignup-admin.php	                        (rev 0)
+++ trunk/components/susignup-admin.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,366 @@
+<?PHP
+/***
+ * SU Signup admin
+ * Allows us to search the SU api for a given student number and checks if they're a SUCS member.
+ * If they are - allows account renewal
+ * If not - allows signup to be bootstrapped as per susignup component
+ ***/
+
+include("../lib/member_functions.php");
+include("../lib/date.php");
+include("../suapi.inc.php");
+
+//Restrict access to staff.
+$permission="sucsstaff";
+$apibaseurl="https://$suapi_user:$suapi_pass@su-api.sucs.org/memberships/Membership.asmx";
+
+if (isset($session->groups[$permission])) {
+	//Setup smarty magic, step 1
+	$smarty->assign("staff", TRUE);
+
+	if(!isset($_REQUEST['mode'])) {
+		$mode = 'menu';
+	} else {
+		$mode = urldecode($_REQUEST['mode']);
+	}
+
+	if ($mode == 'search') {
+		if (empty($_REQUEST['sid']) || empty($_REQUEST['snsubmit'])) {
+			$mode = 'error';
+			$smarty->assign("error_text", "Invalid search request");	
+		}else{
+			$pres=preg_match("/^[0-9]{6}$/",$_REQUEST['sid'],$sid);
+			if ($pres!=1) {
+				$mode = 'error';
+				$smarty->assign("error_text", "Search term doesn't look like a valid student ID");
+			} else {
+				$url = "$apibaseurl/IsPersonMember?strCriteria=".$sid[0]."&GroupingId=6613";
+				$apiReq = curl_init();
+				curl_setopt($apiReq, CURLOPT_URL, $url);
+				curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
+
+				$apiResult = curl_exec($apiReq);
+				if ($apiResult === FALSE) {
+					$mode = 'error';
+					$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
+				}else {
+					// Ostensibly we now have a valid search result from the SU - go to work
+					libxml_use_internal_errors(true);
+					$xml=simplexml_load_string($apiResult);
+					if (!$xml||isset($xml->head->title)) {
+						$mode='error';
+						$smarty->assign("error_text", "An error occurred communicating with the SUSU API");
+					} else {
+						$ismember = $xml[0];
+						if ($ismember=="true") {
+							//Yay, we have a student who has paid and needs to be signed up.
+							//Check they don't have a signup slip already
+							$query = "SELECT transactionid, signupid FROM transactions WHERE cardNumber = ?;";
+							$qres = $sucsDB->Execute($query, $sid);
+							
+							if ($qres->RecordCount()==0) {
+								// No transaction, but might have unused signup slip. If so, retrieve values.
+								$query = "SELECT id, username, password FROM signup WHERE sid=?;";
+								$qres = $sucsDB->Execute($query, array($sid[0]));
+								if ($qres && $qres->RecordCount() > 0) {
+									if ($qres->RecordCount() > 1) {
+										$mode='error';
+										$smarty->assign("error_text", "Student has multiple signup slips in the DB. Bork! Bork! Bork!");
+									} else if (!empty($qres->fields['username'])) {
+										$mode='error';
+										$smarty->assign("error_text", "Student hasn't tried to use the SU signup component (No transaction in DB), but has a previously used Signup Slip with username ".$qres->fields['username'].".<br />Is this a renewal? If not, ask an admin to generate a new signup slip for this student");
+										//TODO: Add option to generate new signup slip?
+									} else {
+										$id = $qres->fields['id'];
+										$pass = $qres->fields['password'];
+									}
+								} else {
+									$pass = make_password();
+									$query = "INSERT INTO signup (password,sid,issuedby) VALUES ( ?, ?, ?) RETURNING id";
+									$attribs[]=$pass;
+									$attribs[]=$sid[0];
+									$attribs[]='99999'; //SUCS Magic internal use UID
+
+									$id = $sucsDB->Execute($query,$attribs);
+									$id = $id->fields['id'];
+									if (!$id) {
+										$mode="error";
+										$smarty->assign("error_text", "An error occurred generating a signup ID. Report the following message to the admins:<br /><pre>".$sucsDB->ErrorMsg()."</pre>");
+									} else {
+										$smarty->assign('slipid', $id);
+										$smarty->assign('slippass', $pass);
+										$smarty->assign('sid', $sid[0]);
+									}
+								}
+							} else {
+								//Retrieve existing slip
+								$id = $qres->fields['signupid'];
+								$tid = $qres->fields['transactionid'];
+								if (empty($id)) {
+									$pass = make_password();
+									$query = "INSERT INTO signup (password,sid,issuedby) VALUES ( ?, ?, ?) RETURNING id";
+									$attribs[]=$pass;
+									$attribs[]=$sid[0];
+									$attribs[]='99999'; //SUCS Magic internal use UID
+
+									$qres = $sucsDB->Execute($query,$attribs);
+									if (!$qres) {
+										$mode="error";
+										$smarty->assign("error_text", "An error occurred generating a signup ID. Report the following message to the admins:<br /><pre>".$sucsDB->ErrorMsg()."</pre>");
+									} else {
+										$id = $qres->fields['id'];
+										$query = "UPDATE transactions SET signupid=? WHERE transactionid=?;";
+										$qres = $sucsDB->Execute($query, array($id, $tid));
+										$smarty->assign('slipid', $id);
+										$smarty->assign('slippass', $pass);
+										$smarty->assign('sid', $sid[0]);
+									}
+
+								}else {
+									$query = "SELECT username, password FROM signup WHERE id=?;";
+									$qres = $sucsDB->Execute($query, array($id));
+									if (!$qres) {
+										$mode="error";
+										$smarty->assign("error_text", "The user appears to have generated a signup ID using the SU Signup system (Slip ID: ".$id."), but the password for that slip can't be retrieved.<br />Request assistance.");
+									} else if ($qres->fields['username'] !== NULL) {
+										$mode="error";
+										$smarty->assign("error_text", "This user appears to have completed signup, with username <strong>".$qres->fields['username']."</strong><br />Check that this user exists, and offer to reset their password if necessary.");
+									}
+									$pass = $qres->fields['password'];
+									$smarty->assign('slipid', $id);
+									$smarty->assign('slippass', $pass);
+									$smarty->assign('sid', $sid[0]);
+								}
+							}
+
+							if(!$mode=='error') {
+								//Right, this should be the point where we hand off to signup
+								$smarty->assign('slipid', $id);
+								$smarty->assign('slippass', $pass);
+								$smarty->assign('sid', $sid[0]);
+							}
+
+						}else{
+							$mode='error';
+							$smarty->assign("error_text", "Student does not appear to have paid. Extract fees");
+						}
+					}
+				}
+			}
+		}
+	} else if ($mode=="renew") {
+		if (empty($_REQUEST['member'])){
+			$mode='error';
+			$smarty->assign('error_text',"Can't renew a member without knowing their username!");
+		} else if (!isset($_REQUEST['renewconf'])) {
+			//Should be trying to renew $_REQUEST['member']
+			$username=urldecode($_REQUEST['member']);
+			$q = "SELECT username, typename, sid, paid, email FROM members, member_type WHERE username=?";
+			$res = $sucsDB->Execute($q,array($username));
+			if (!$res) {
+				$mode='error';
+				$smarty->assign('error_text', "A database error occurred while trying to retrieve member details");
+			} else if ($res->fields['paid'] == paidUntil(time())) {
+					$mode='error';
+					$smarty->assign('error_text', 'User appears to have been renewed already?');
+			} else {
+				$smarty->assign('renew_user', $username);
+				$smarty->assign('renew_paid', $res->fields['paid']);
+				$smarty->assign('renew_type', $res->fields['typename']);
+				$url = "$apibaseurl/IsPersonMember?strCriteria=".$res->fields['sid']."&GroupingId=6613";
+                                $apiReq = curl_init();
+                                curl_setopt($apiReq, CURLOPT_URL, $url);
+                                curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
+
+                                $apiResult = curl_exec($apiReq);
+				libxml_use_internal_errors(true);
+				$xml=simplexml_load_string($apiResult);
+				if (!$xml || isset($xml->head->title)) {
+					$mode='error';
+					$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
+				} else {
+					$ismember = $xml[0];
+
+					$user = posix_getpwnam($session->username);
+
+					if ($ismember!="true") {
+						$mode='error';
+						$smarty->assign('error_text', 'Member does not appear to have paid via the SU system. Use the old renewals system if they have paid using some other method');;
+					} else {
+						if (renew_member($username, $user['uid'], $user['name'])) {
+							message_flash("Successfully renewed");
+							$mode='menu';
+						} else {
+							$mode='error';
+							$smarty->assign('error_text', 'An error occurred renewing account '.$username);
+						}
+
+					}
+
+				}
+			}
+		}
+			
+	} else if ($mode == 'renewals') {
+		//Get list of members according to the SU
+		$url = "$apibaseurl/GetMemberListData?GroupingId=6613";
+		$apiReq = curl_init();
+		curl_setopt($apiReq, CURLOPT_URL, $url);
+		curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
+
+		$apiResult = curl_exec($apiReq);
+		$sumembers = su_response_decode($apiResult);
+		if (!$sumembers) {
+			$mode ='error';
+			$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
+		} else {
+			$matches = array();
+			$others=0;
+			$paidup=0;
+			foreach ($sumembers as $sumem) {
+				$sucsmem = get_sucs_record($sumem['uni_card_number']);
+				if ($sucsmem && $sucsmem['paid'] != paidUntil(time()) && $sucsmem['type']==1) {
+					$matches[]=array($sumem['firstName']." ".$sumem['lastName'], $sucsmem['realname'], $sumem['uni_card_number'], $sucsmem['username'], $sucsmem['paid']);
+				} else if ($sucsmem && $sucsmem['paid'] == paidUntil(time())) {
+					$others++;
+					$paidup++;
+				} else {
+					$others++;
+				}
+			}
+			$smarty->assign("matches", $matches);
+			$smarty->assign("others", $others);
+			$smarty->assign("paidup", $paidup);
+			$smarty->assign("pending", $others - $paidup);
+		}
+	} else if ($mode == 'renewals2') {
+		$failures = array();
+		$successes = array();
+
+		if (empty($_REQUEST['renew'])) {
+			$mode='error';
+			$smarty->assign("error_text", "Can't renew an empty list!");
+		} else {
+			foreach($_REQUEST['renew'] as $user) {
+				$admin_user=posix_getpwnam($session->username);
+				if (renew_member($user, $admin_user['uid'], $admin_user['name'])) {
+					$successes[]=$user;
+				} else {
+					$failures[]=$user;
+				}
+			}
+			$smarty->assign("attempt", count($_REQUEST['renew']));
+			$smarty->assign("failures", count($failures));
+			$smarty->assign("failusers", $failures);
+			$smarty->assign("successes", count($successes));
+		}
+	} else if ($mode == 'list') {
+		//Get list of members according to the SU
+		$url="$apibaseurl/GetMemberListData?GroupingId=6613";
+		$apiReq = curl_init();
+		curl_setopt($apiReq, CURLOPT_URL, $url);
+		curl_setopt($apiReq, CURLOPT_RETURNTRANSFER, TRUE);
+
+		$apiResult = curl_exec($apiReq);
+		$sumembers = su_response_decode($apiResult);
+		if (!$sumembers) {
+			$mode='error';
+			$smarty->assign("error_text", "An error occurred communicating with the SUSU API.");
+		} else {
+			$matches = array();
+			foreach ($sumembers as $sumem) {
+				$sucsmem = get_sucs_record($sumem['uni_card_number']);
+				if ($sucsmem) {
+					$matches[]=array($sumem['firstName']." ".$sumem['lastName'], $sucsmem['realname'], $sumem['uni_card_number'], $sucsmem['username'], $sucsmem['paid']);
+				} else {
+					$matches[]=array($sumem['firstName']." ".$sumem['lastName'], "N/A", $sumem['uni_card_number'], "N/A", "Not signed up");
+				}
+			}
+			function sortbypaid($a, $b) {
+				//Lets us array sort by final column ('Paid')
+				return ($a[4] < $b[4]) ? -1  : 1;
+			}
+			usort($matches, 'sortbypaid');
+			$smarty->assign("matches", $matches);
+		}
+	}
+$smarty->assign('renewables', get_renewable_members());
+}
+
+
+$smarty->assign('title', 'SU Signup Admin');
+$smarty->assign('mode', $mode);
+$body = $smarty->fetch("susignup-admin.tpl");
+$smarty->assign('body', $body);
+$smarty->assign("extra_styles", array("$baseurl/css/susignup-admin.css"));
+
+function su_response_decode($text) {
+	global $smarty;
+	libxml_use_internal_errors(true);
+	$xml=simplexml_load_string($text);
+	if (!$xml || isset($xml->head->title)) {
+		return false;
+	} else {
+		return json_decode($xml[0],TRUE);
+	}
+} 
+
+function get_sucs_record($sid) {
+	global $sucsDB;
+
+	$query = "SELECT * FROM members WHERE sid=?;";
+	$res  = $sucsDB->Execute($query, array($sid));
+	if (!$res || $res->RecordCount()<>1) {
+		return FALSE;
+	}
+        return $res->FetchRow();	
+}
+
+function get_renewable_members() {
+	global $sucsDB;
+	$q = "SELECT username, username||' ('||realname||')' AS display FROM members, member_type WHERE paid != ? AND type=1 AND type=member_type.id ORDER BY paid;";
+	$r = $sucsDB->Execute($q, array(paidUntil(time())));
+	if(!$r) {
+		return FALSE;
+	}
+	$retvals = array();
+	while ($rec=$r->FetchRow()) {
+		$retvals[$rec['username']]=$rec['display'];
+	}
+	return $retvals;
+}
+
+function renew_member($renew_name, $admin_uid, $admin_name) {
+	global $sucsDB;
+
+	$q="UPDATE members SET paid=?, lastupdate=DEFAULT, lastedit=? WHERE username=?;";
+	$r=$sucsDB->Execute($q, array(paidUntil(time()), $admin_uid, $renew_name));
+	if (!$r) {
+		print $sucsDB->ErrorMsg();
+		return FALSE;
+	} else {	
+		$q="SELECT email, typename FROM members, member_type WHERE username=?  AND type=member_type.id;";
+		$r=$sucsDB->Execute($q, array($renew_name));
+
+		$message  = "Account Renewal notification\n\n";
+		$message .= "Account   : ".$renew_name."\n";
+		$message .= "User Type : ".$r->fields['typename']."\n";
+		$message .= "Renewed by: ".$admin_name."\n\n";
+		$message .= "**** Payment was made via the SU payments system ****\n";
+		$message .= "Regards\n  The SU Renewals script";
+		mail("treasurer at sucs.org","Account Renewal",$message);
+		
+		$message = "Your Swansea University Computer Society (SUCS) membership has been renewed\n\n";
+		$message .= "Username: ".$renew_name."\n";
+		$message .= "If you do not know or have forgotten your password, please email admin at sucs.org to arrange for it to be changed.\n\n";
+		$message .= "Regards\n  The SUCS admin";
+		$header = "From: admin at sucs.org\r\n";
+		$header .= "Reply-To: admin at sucs.org";
+		// Personal account
+		mail($r->fields['email'],"SUCS account renewal",$message,$header);
+		// sucs account
+		mail($renew_name."@sucs.org","SUCS account renewal",$message,$header);
+		return TRUE;
+	}
+
+}

Copied: trunk/components/susignup.php (from rev 656, branches/sucs-site/components/susignup.php)
===================================================================
--- trunk/components/susignup.php	                        (rev 0)
+++ trunk/components/susignup.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,259 @@
+<?php
+
+//unique society identifier
+$GroupingID = "6613";
+
+include "../lib/member_functions.php";
+include "../lib/date.php";
+include "../suapi.inc.php";
+
+$error_email = "admin at sucs.org";
+$mode = 'login';
+//login
+if(!empty($_REQUEST['sid'])&&!empty($_REQUEST['transactionID'])){
+//set signup details
+
+	$sid = $_REQUEST['sid'];
+        $transactionID = $_REQUEST['transactionID'];
+
+	//set POST variables
+	$url = "https://$suapi_user:$suapi_pass@su-api.sucs.org/memberships/Membership.asmx/GetMemberByTransactionID";
+	$fields = array(
+	       'transactionID'=>urlencode($transactionID),
+	       'GroupingID'=>urlencode($GroupingID),
+	       );
+	//url-ify the data for the POST
+	$field_string = "";
+	foreach($fields as $key=>$value) { $fields_string .= $key.'='.$value.'&'; }
+	rtrim($fields_string,'&');
+	//open connection
+	$ch = curl_init();
+
+	//set the url, number of POST vars, POST data
+	curl_setopt($ch,CURLOPT_URL,$url);
+	curl_setopt($ch,CURLOPT_POST,count($fields));
+	curl_setopt($ch,CURLOPT_POSTFIELDS,$fields_string);
+	curl_setopt($ch,CURLOPT_RETURNTRANSFER,TRUE);
+	//execute post
+	$result = curl_exec($ch);
+
+	//close connection
+	curl_close($ch);
+	if(!$result){
+		$mode = "error";
+		$smarty->assign("error_text", "Invalid query returned");
+	} else {
+		libxml_use_internal_errors(true);
+		$xml=simplexml_load_string($result);
+		if (!$xml||isset($xml->head->title)) {
+			$mode='error';
+			$smarty->assign("error_text", "An error occurred communicating with the SUSU API");		
+		} else{
+			$re1='.*?';
+			$re2='(\\{.*?\\})';
+			if ($c=preg_match_all ("/".$re1.$re2."/is", $result, $matches))
+			{
+			  	$json_string=$matches[1][0];
+			} else{
+			  $mode = "error";
+			}
+			$array = json_decode($json_string,TRUE);
+			if($array['cardNumber'] == $sid && $sid != ""){
+				$mode = 'form';
+
+				// SET THIS FOR DEBUG MODE
+				// $sucsDB->debug = true;
+
+				$fullName = $array['firstName']." ".$array['lastName'];
+				$query = "INSERT INTO transactions (transactionID,fullName,emailAddress,cardNumber,personID) values(?, ?, ?, ?, ?)";
+				$attribs[] = $transactionID;
+				$attribs[] = $fullName;
+				$attribs[] = $array['emailAddress'];
+				$attribs[] = $array['cardNumber'];
+				$attribs[] = $array['personID'];
+
+				$valid = true;
+				if(!$sucsDB->Execute($query,$attribs)) {
+					// We did this because Adodb ErrorNo command is broken
+					$query = "SELECT * FROM transactions WHERE transactionID = ?";
+					unset($attribs);
+					$attribs[]=$transactionID;
+					if($sucsDB->Execute($query,$attribs)) {
+
+						$query = "SELECT * FROM transactions WHERE transactionID = ?";
+						$attribs= array();
+						$attribs[]=$transactionID;
+						$data = $sucsDB->GetAll($query,$attribs);
+						if(is_array($data)&&sizeof($data)==1&&$data[0]['signupid']==NULL){
+							// As it stands this shouldn't happen but if it does, no reason not to let them carry on
+							$valid = true;
+						} elseif(is_array($data)&&sizeof($data)==1&&$data[0]['signupid']!=NULL) {
+							$query = "SELECT * FROM signup WHERE sid = ?";
+							unset($attribs);
+							$attribs[]=$sid;
+							$data = $sucsDB->Execute($query, $attribs);
+							if(!$data) {
+								mail(
+									$error_email,
+									"SUSignup Error",
+									"An error occured in the susignup system at stage 0\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
+									"From: \"SUCS Admin\" <admin at sucs.org>"
+							);
+								$valid=false;
+							} else if($data->fields['username']!=NULL){
+								$smarty->assign("username", $data->fields['username']);
+								$mode='numpty2';		
+								// This happens if they already ahve a SUCS account and are trying to create a new signupid
+								$valid = false;
+							} else {
+								$smarty->assign("id", $data->fields['id']);
+								$smarty->assign("pass", $data->fields['password']);
+								$mode='numpty';
+								// If this happens they tried to get a new signupid/pass after already getting one, and should get weekly reminders about it  
+								$valid = false;
+							}
+						} else {
+							$mode="error";
+							mail(
+								$error_email,
+								"SUSignup Error",
+								"An error occured in the susignup system at stage 1\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
+								"From: \"SUCS Admin\" <admin at sucs.org>"
+							);
+
+							$valid = false;
+						}
+
+					} else {
+						$mode="error";
+						mail(
+							$error_email,
+							"SUSignup Error",
+							"An error occured in the susignup system at stage 2\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
+							"From: \"SUCS Admin\" <admin at sucs.org>"
+						);
+
+						$valid = false;
+					}
+				}
+
+				if($valid)
+				{
+					unset($attribs);
+					unset($query);
+					$query = "SELECT * FROM members WHERE sid = ?";
+					$attribs[] = $sid;
+					unset($data);
+					$data = $sucsDB->Execute($query, $attribs);
+					if (!$data) {
+						$mode = "error";
+						$smarty->assign("error_text", "Error in internal database check");
+					} elseif ($data->RecordCount()==1) {
+						$mode = "renew";
+						$q="UPDATE members SET paid=?, lastupdate=DEFAULT, lastedit=? WHERE username=?;";
+        					$r=$sucsDB->Execute($q, array(paidUntil(time()), '99999', $data->fields['username']));
+						if (!$r) {
+							mail(
+								$error_email,
+								"SUSignup Error",
+								"An error occured in the susignup system at stage 2.5\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
+								"From: \"SUCS Admin\" <admin at sucs.org>"
+							);
+
+					        } else {
+							$q="SELECT email, typename FROM members, member_type WHERE username=?  AND type=member_type.id;";
+							$r=$sucsDB->Execute($q, array($data->fields['username']));
+
+							$message  = "Account Renewal notification\n\n";
+							$message .= "Account   : ".$data->fields['username']."\n";
+							$message .= "User Type : ".$r->fields['typename']."\n";
+							$message .= "Renewed by: ".$data->fields['username'].".\n\n";
+							$message .= "**** Payment was made via the SU payments system ****\n";
+							$message .= "Regards\n  The SU Renewals script";
+							mail("treasurer at sucs.org","Account Renewal",$message);
+
+							$message = "Your Swansea University Computer Society (SUCS) membership has been renewed\n\n";
+							$message .= "Username: ".$renew_name."\n";
+							$message .= "If you do not know or have forgotten your password, please email admin at sucs.org to arrange for it to be changed.\n\n";
+							$message .= "Regards\n  The SUCS admin";
+							$header = "From: admin at sucs.org\r\n";
+							$header .= "Reply-To: admin at sucs.org";
+							// Personal account
+							mail($r->fields['email'],"SUCS account renewal",$message,$header);
+							// sucs account
+							mail($data->fields['username']."@sucs.org","SUCS account renewal",$message,$header);
+							unset($query);
+							unset($attribs);
+							$query = "UPDATE transactions set signupid=? WHERE transactionID=?";
+							$attribs[]="000";
+							$attribs[]=$transactionID;
+							$data = $sucsDB->Execute($query,$attribs);
+							if (!$data) { 
+								$mode="error";
+								mail(
+									$error_email,
+									"SUSignup Error",
+									"An error occured in the susignup system at stage 2.6\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
+									"From: \"SUCS Admin\" <admin at sucs.org>"
+								);
+							}
+				        	}
+					} else {
+						$pass = make_password();
+						unset($query);
+						$query = "insert into signup (password,sid,issuedby) values( ?, ?, ?) returning id";
+						unset($attribs);
+						$attribs[]=$pass;
+						$attribs[]=$array['cardNumber'];
+						$attribs[]='99999';
+
+						$iddata = $sucsDB->Execute($query,$attribs);
+						$id = $iddata->fields['id'];
+						if (!$iddata) {
+							$mode="error";
+							mail(
+								$error_email,
+								"SUSignup Error",
+								"An error occured in the susignup system at stage 3\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
+								"From: \"SUCS Admin\" <admin at sucs.org>"
+							);
+						} else {
+							$query = "update transactions set signupid=? WHERE transactionID=?";
+							unset($attribs);
+							$attribs[]=$id;
+							$attribs[]=$transactionID;
+							if(!$sucsDB->Execute($query,$attribs)) {
+								$mode="error";
+								mail(
+									$error_email,
+									"SUSignup Error",
+									"An error occured in the susignup system at stage 4\n Love the signup system.\n\nP.S. The Error is:\n ".$sucsDB->ErrorMsg(),
+									"From: \"SUCS Admin\" <admin at sucs.org>"
+								);
+								print($sucsDB->ErrorMsg());
+							} else {
+								$smarty->assign("id", $id);
+								$smarty->assign("pass", $pass);
+								mail(
+									$array['emailAddress'].','.$sid.'@swansea.ac.uk',
+									"SUCS Signup Information",
+									"Thankyou for joining Swansea University Computer Society, your signup details are below;\nSignupID: $id\nSignup Password: $pass\nIf you have successfully completed signup immediately then you can disregard this message.\n\nSUCS Admin Team.",
+									"From: \"SUCS Admin\" <admin at sucs.org>"
+								);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+$smarty->assign("mode", $mode);
+$output = $smarty->fetch("susignup.tpl");
+
+$smarty->assign("title", "Join");
+$smarty->assign("body", $output);
+
+
+?>

Modified: trunk/components/uri.php
===================================================================
--- trunk/components/uri.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/components/uri.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -39,7 +39,7 @@
 				$headers=get_headers($_REQUEST['uri'], 1);
 				if ($headers) {
 					if (preg_match("/ 4/", $headers[0])) {
-						$smarty->assign("errormsg", "HTTP 4xx error detected - not creating ShortURI");
+						trigger_error("HTTP 4xx error detected - not creating ShortURI", E_USER_WARNING);
 					} else {				
 						$record['url'] = @$_REQUEST['uri'];
 						$record['creator'] = $session->username;
@@ -48,7 +48,7 @@
 						$shorturi=$DB->GetOne("select id from $uritable where url=?", array(@$_REQUEST['uri']));
 					}
 				} else {
-					$smarty->assign("errormsg", "URI supplied is not valid");
+					trigger_error("URI supplied is not valid", E_USER_WARNING);
 				}
 			}
 
@@ -56,7 +56,7 @@
 		}
 
 	} else {
-		$smarty->assign("errormsg", "You are not logged in");
+		trigger_error("You are not logged in", E_USER_WARNING);
 	}
 }
 

Deleted: trunk/db_changes/sucssite-0.3.sql
===================================================================
--- branches/sucs-site/db_changes/sucssite-0.3.sql	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/db_changes/sucssite-0.3.sql	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,5 +0,0 @@
-DELETE FROM session;
-ALTER TABLE session DROP COLUMN time;
-ALTER TABLE session ADD COLUMN logintime timestamp(0) without time zone;
-ALTER TABLE session ADD COLUMN lastseen timestamp(0) without time zone;
-DELETE FROM menu WHERE title='Bananas';

Copied: trunk/db_changes/sucssite-0.3.sql (from rev 656, branches/sucs-site/db_changes/sucssite-0.3.sql)
===================================================================
--- trunk/db_changes/sucssite-0.3.sql	                        (rev 0)
+++ trunk/db_changes/sucssite-0.3.sql	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,5 @@
+DELETE FROM session;
+ALTER TABLE session DROP COLUMN time;
+ALTER TABLE session ADD COLUMN logintime timestamp(0) without time zone;
+ALTER TABLE session ADD COLUMN lastseen timestamp(0) without time zone;
+DELETE FROM menu WHERE title='Bananas';


Property changes on: trunk/htdocs
___________________________________________________________________
Added: svn:ignore
   + video
google*.html
norton*.html
cam
settings.php
adminwiki
star.ca.pem
sucs.crt

Added: svn:externals
   + mw https://projects.sucs.org/svn/mw/trunk/webclient


Modified: trunk/htdocs/css/blog.css
===================================================================
--- trunk/htdocs/css/blog.css	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/css/blog.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -21,4 +21,11 @@
 
 .errorinfo {
 	color: red;
-}
\ No newline at end of file
+}
+
+#spinner {
+	visibility: hidden;
+	margin-left: 4px;
+	margin-right: 4px;
+}
+

Modified: trunk/htdocs/css/common.css
===================================================================
--- trunk/htdocs/css/common.css	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/css/common.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -24,7 +24,7 @@
 	margin-bottom: 0;
 }
 
-h2+p, h2+ul, h2+ol, h3+p, h3+ul, h3+ol {
+h2+p, h2+ul, h2+ol, h3+p, h3+ul, h3+ol, h4+p, h4+ul, h4+ol {
 	margin-top: 0;
 }
 
@@ -36,6 +36,12 @@
 	margin-bottom: 0.5em;
 }
 
+acronym, abbr {
+	text-transform: lowercase;
+	font-variant: small-caps;
+}
+
+
 /* --------------------------------------------------
     Branding
    -------------------------------------------------- */
@@ -146,8 +152,11 @@
 	margin-right: 1em;
 }
 
-dd#plan {
+dd#plan, dd#project {
 	margin-left: 0;
+	word-wrap: break-word;
+	white-space: pre-wrap;
+	font-family: monospace;
 }
 
 /* --------------------------------------------------

Modified: trunk/htdocs/css/ie.css
===================================================================
--- trunk/htdocs/css/ie.css	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/css/ie.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,20 +1,167 @@
-form {
-	margin: 0;
-	padding: 0;
+/* --------------------------------------------------
+    Page corners
+   -------------------------------------------------- */
+
+.cornerTopLeft {
+	height: 100%;
+	background: url('/images/left-top-corner.png') top left no-repeat;
 }
 
-#navigationC ul li {
-	line-height: 0;
+.cornerTopRight {
+	height: 100%;
+	background: url('/images/right-top-corner.png') top right no-repeat;
 }
 
-#loginForm input.button {
-	font-size: 80%;	
+.cornerBottomLeft {
+	height: 100%;
+	background: url('/images/left-bottom-corner.png') bottom left no-repeat;
 }
 
+.cornerBottomRight {
+	height: 100%;
+	background: url('/images/right-bottom-corner.png') bottom right no-repeat;
+}
+
 /* --------------------------------------------------
+    Menu
+   -------------------------------------------------- */
+#navigationC ul li a {
+	background: #e76808 url('/images/menu-top-right.png') no-repeat top right;
+}
+#navigationC ul ul li a span {
+	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+}
+
+#navigationC ul li a span {
+	display: block;
+	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+}
+/* --------------------------------------------------
+    Error box
+   -------------------------------------------------- */
+
+.error {
+	margin-right: 0.5em;
+	margin-bottom: 0.5em;
+}
+
+.error div.errorcontent {
+	background: #ffffff;
+	border: 2px solid #ff0000;
+}
+
+.error .errorhead h3 {
+	color: #ffffff;
+}
+
+.error .errorhead {
+	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+}
+
+.errorbar, .navbar, .infobar {
+	margin: 0.5em 0 0 0;
+	font-size: 80%;
+}
+
+.errorbar {
+	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+	color: #ffffff;
+	margin-right: 0.5em;
+}
+
+.infobar {
+	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+	color: #ffffff;
+	margin-right: 0.5em; 
+}
+
+.infobar a {
+	color: #ffc62b;
+}
+
+.infobar a:active {
+	color: #ffffff;
+}
+
+.navbar {
+	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+}
+
+.navbar a {
+	color: #ffc62b;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.errorbar div, .navbar div, .infobar div {
+	background:  url('/images/menu-top-right.png') no-repeat top right;
+}
+
+.errorbar div div, .navbar div div, .infobar div div {
+	background:  url('/images/menu-bottom-left.png') no-repeat bottom left;
+}
+
+.errorbar div div div, .navbar div div div, .infobar div div div {
+	background:  url('/images/menu-bottom-right.png') no-repeat bottom right;
+	padding: 0.2em 0.5em;
+}
+/* --------------------------------------------------
     Content box (e.g. for news items)
    -------------------------------------------------- */
+.box .boxhead {
+	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+}
 
-ol.roman {
-	list-style-type: i;
+.box .hollowhead {
+	background: #ffffff url('/images/border-bottom.png') repeat-x top;
+	height: 5px;
+	margin: 0;
+	padding: 0;
+	border: none;
 }
+
+.box .hollowhead div {
+	background: url('/images/border-top-left.png') no-repeat top left;
+	height: 100%;
+}
+
+.box .hollowhead div div {
+	background: url('/images/border-top-right.png') no-repeat top right;
+	height: 100%;
+}
+
+
+.box .boxhead h2, .box .boxhead h3, .error .errorhead h3 {
+	background: url('/images/menu-top-right.png') no-repeat top right;
+}
+
+.box .boxfoot {
+	background: #e76808 url('/images/menu-bottom-left.png') no-repeat bottom left;
+}
+
+.box .boxfoot p {
+	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+}
+
+.box .hollowfoot {
+	background: #ffffff url('/images/border-bottom.png') repeat-x bottom;
+	height: 5px;
+	margin: 0;
+	padding: 0;
+}
+
+.box .hollowfoot div {
+	background: url('/images/border-bottom-left.png') no-repeat bottom left;
+	height: 100%;
+}
+
+.box .hollowfoot div div {
+	background: url('/images/border-bottom-right.png') no-repeat bottom right;
+	height: 100%;
+}
+/* --------------------------------------------------
+    Error box
+   -------------------------------------------------- */
+.error .errorhead {
+	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+}

Copied: trunk/htdocs/css/ie8.css (from rev 656, branches/sucs-site/htdocs/css/ie8.css)
===================================================================
--- trunk/htdocs/css/ie8.css	                        (rev 0)
+++ trunk/htdocs/css/ie8.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,7 @@
+div#searchbox {
+	height: 5em;
+}
+
+.buttons {
+	padding-top: 5px;
+}
\ No newline at end of file

Copied: trunk/htdocs/css/ielt8.css (from rev 656, branches/sucs-site/htdocs/css/ielt8.css)
===================================================================
--- trunk/htdocs/css/ielt8.css	                        (rev 0)
+++ trunk/htdocs/css/ielt8.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,26 @@
+form {
+	margin: 0;
+	padding: 0;
+}
+
+#navigationC ul li {
+	line-height: 0;
+}
+
+#loginForm input.button {
+	font-size: 80%;	
+}
+
+/* --------------------------------------------------
+    Content box (e.g. for news items)
+   -------------------------------------------------- */
+
+ol.roman {
+	list-style-type: i;
+}
+/* --------------------------------------------------
+    Secondary content
+   -------------------------------------------------- */
+#secondary ul {
+	margin-left: 2em;
+}
\ No newline at end of file

Copied: trunk/htdocs/css/milliways.css (from rev 656, branches/sucs-site/htdocs/css/milliways.css)
===================================================================
--- trunk/htdocs/css/milliways.css	                        (rev 0)
+++ trunk/htdocs/css/milliways.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,4 @@
+.date {background-color: #e0e0ff; }
+.time {background-color: #e0ffe0; }
+.user {background-color: #ffe0e0; }
+.taglist {background-color: #ffffe0; }

Modified: trunk/htdocs/css/sucs.css
===================================================================
--- trunk/htdocs/css/sucs.css	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/css/sucs.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -35,27 +35,19 @@
 /* --------------------------------------------------
     Page corners
    -------------------------------------------------- */
-
-.cornerTopLeft {
-	height: 100%;
-	background: url('/images/left-top-corner.png') top left no-repeat;
+#branding, #brandingC {
+	border-top-left-radius: 15px;
+	border-top-right-radius: 15px;
+	-moz-border-radius-topleft: 15px;
+	-moz-border-radius-topright: 15px;
 }
-
-.cornerTopRight {
-	height: 100%;
-	background: url('/images/right-top-corner.png') top right no-repeat;
+#footer {
+	border-bottom-left-radius: 15px;
+	border-bottom-right-radius: 15px;
+	-moz-border-radius-bottomleft: 15px;
+	-moz-border-radius-bottomright: 15px;
 }
 
-.cornerBottomLeft {
-	height: 100%;
-	background: url('/images/left-bottom-corner.png') bottom left no-repeat;
-}
-
-.cornerBottomRight {
-	height: 100%;
-	background: url('/images/right-bottom-corner.png') bottom right no-repeat;
-}
-
 /* --------------------------------------------------
     Branding
    -------------------------------------------------- */
@@ -168,7 +160,11 @@
 	line-height: 1.5em;
 	font-size: 95%;
 	color: #ffc62b;
-	background: #e76808 url('/images/menu-top-right.png') no-repeat top right;
+	background: #e76808;
+	border-top-right-radius: 7px;
+	border-bottom-right-radius: 7px;
+	-moz-border-radius-topright: 7px;
+	-moz-border-radius-bottomright: 7px;
 	padding-left: 1em;
 	margin-bottom: 2px;
 }
@@ -179,6 +175,8 @@
 
 #navigationC ul li a.select {
 	color: #fff0cd;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-bottomright: 0;
 }
 
 /* --- Submenu item */
@@ -187,6 +185,10 @@
 	font-weight: normal;
 	padding-left: 2em;
 	background: #ffa405;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-topright: 0;
+	-moz-border-radius-bottomright: 0;
 	color: #d45e08;
 }
 
@@ -199,16 +201,31 @@
 }
 
 
-#navigationC ul ul li a span {
-	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+#navigationC ul ul li.lastsub a {
+	border-bottom-right-radius: 7px;
+	-moz-border-radius-bottomright: 7px;
 }
 
-#navigationC ul li a span {
+#navigationC ul li.lastsub a {
 	display: block;
-	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
+	border-bottom-right-radius: 7px;
+	-moz-border-radius-bottomright: 7px;
 }
 
 /* --------------------------------------------------
+    Boxes
+   -------------------------------------------------- */
+div.cbb {
+	border-radius: 12px;
+	-moz-border-radius: 12px;
+	-webkit-border-radius: 12px;
+	padding: 1em;
+	box-shadow: 3px 3px 5px #777;
+	-moz-box-shadow: 3px 3px 5px #777;
+	-webkit-box-shadow: 3px 3px 5px #777;
+}
+
+/* --------------------------------------------------
     Search box
    -------------------------------------------------- */
 
@@ -265,6 +282,8 @@
 
 .box {
 	background: #ffffff;
+	border-radius: 7px;
+	-moz-border-radius: 7px;
 }
 
 .box div.boxcontent {
@@ -278,56 +297,49 @@
 }
 
 .box .boxhead {
-	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+	background: #e76808;
+	border-top-left-radius: 7px;
+	border-top-right-radius: 7px;
+	-moz-border-radius-topleft: 7px;
+	-moz-border-radius-topright: 7px;
 }
 
 .box .hollowhead {
-	background: #ffffff url('/images/border-bottom.png') repeat-x top;
+	background: #ffffff;
+	border-top: 2px solid #e76808;
+	border-left: 2px solid #e76808;
+	border-right: 2px solid #e76808;
+	border-top-left-radius: 7px;
+	border-top-right-radius: 7px;
+	-moz-border-radius-topleft: 7px;
+	-moz-border-radius-topright: 7px;
 	height: 5px;
 	margin: 0;
 	padding: 0;
 }
 
-.box .hollowhead div {
-	background: url('/images/border-top-left.png') no-repeat top left;
-	height: 100%;
-}
-
-.box .hollowhead div div {
-	background: url('/images/border-top-right.png') no-repeat top right;
-	height: 100%;
-}
-
-
-.box .boxhead h2, .box .boxhead h3, .error .errorhead h3 {
-	background: url('/images/menu-top-right.png') no-repeat top right;
-}
-
 .box .boxfoot {
-	background: #e76808 url('/images/menu-bottom-left.png') no-repeat bottom left;
+	background: #e76808;
+	border-bottom-left-radius: 7px;
+	border-bottom-right-radius: 7px;
+	-moz-border-radius-bottomleft: 7px;
+	-moz-border-radius-bottomright: 7px;
 }
 
-.box .boxfoot p {
-	background: url('/images/menu-bottom-right.png') no-repeat bottom right;
-}
-
 .box .hollowfoot {
-	background: #ffffff url('/images/border-bottom.png') repeat-x bottom;
+	background: #ffffff;
 	height: 5px;
 	margin: 0;
 	padding: 0;
+	border-bottom: 2px solid #e76808;
+	border-left: 2px solid #e76808;
+	border-right: 2px solid #e76808;
+	border-bottom-left-radius: 7px;
+	border-bottom-right-radius: 7px;
+	-moz-border-radius-bottomleft: 7px;
+	-moz-border-radius-bottomright: 7px;
 }
 
-.box .hollowfoot div {
-	background: url('/images/border-bottom-left.png') no-repeat bottom left;
-	height: 100%;
-}
-
-.box .hollowfoot div div {
-	background: url('/images/border-bottom-right.png') no-repeat bottom right;
-	height: 100%;
-}
-
 /* --------------------------------------------------
     Error box
    -------------------------------------------------- */
@@ -340,6 +352,11 @@
 .error div.errorcontent {
 	background: #ffffff;
 	border: 2px solid #ff0000;
+	border-bottom-left-radius: 7px;
+	border-bottom-right-radius: 7px;
+	-moz-border-radius-bottomleft: 7px;
+	-moz-border-radius-bottomright: 7px;
+	padding-bottom: 0.5em;
 }
 
 .error .errorhead h3 {
@@ -347,41 +364,49 @@
 }
 
 .error .errorhead {
-	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+	background: #ff0000;
+	border-top-left-radius: 7px;
+	border-top-right-radius: 7px;
+	-moz-border-radius-topleft: 7px;
+	-moz-border-radius-topright: 7px;
 }
 
-.errorbar, .navbar {
+.errorbar, .navbar, .infobar {
 	margin: 0.5em 0 0 0;
 	font-size: 80%;
+	border-radius: 7px;
+	-moz-border-radius: 7px;
+	padding: 0.2em 0.5em;
 }
 
 .errorbar {
-	background: #ff0000 url('/images/menu-top-left.png') no-repeat top left;
+	background: #ff0000;
 	color: #ffffff;
 	margin-right: 0.5em;
 }
 
-.navbar {
-	background: #e76808 url('/images/menu-top-left.png') no-repeat top left;
+.infobar {
+	background: #e76808;
+	color: #ffffff;
+	margin-right: 0.5em; 
 }
 
-.navbar a {
+.infobar a {
 	color: #ffc62b;
-	font-weight: bold;
-	text-decoration: none;
 }
 
-.errorbar div, .navbar div {
-	background:  url('/images/menu-top-right.png') no-repeat top right;
+.infobar a:active {
+	color: #ffffff;
 }
 
-.errorbar div div, .navbar div div {
-	background:  url('/images/menu-bottom-left.png') no-repeat bottom left;
+.navbar {
+	background: #e76808;
 }
 
-.errorbar div div div, .navbar div div div {
-	background:  url('/images/menu-bottom-right.png') no-repeat bottom right;
-	padding: 0.2em 0.5em;
+.navbar a {
+	color: #ffc62b;
+	font-weight: bold;
+	text-decoration: none;
 }
 
 /* --------------------------------------------------

Copied: trunk/htdocs/css/susignup-admin.css (from rev 656, branches/sucs-site/htdocs/css/susignup-admin.css)
===================================================================
--- trunk/htdocs/css/susignup-admin.css	                        (rev 0)
+++ trunk/htdocs/css/susignup-admin.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,48 @@
+div.susignup-admin-menu {
+	float: left;
+	width: 22%;
+	margin-left: 10px;
+	background: #E76808;
+	border-radius: 15px;
+	border-radius: 15px;
+	-moz-border-radius: 15px;
+	-moz-border-radius: 15px;
+}
+
+div.susignup-admin-menu select {
+	position: relative;
+	width: 65%;
+}
+
+div.susignup-admin-menu label {
+	position: relative;
+	width: 9em;
+}
+
+div.susignup-admin-menu input#rnsubmit {
+	position: relative;
+	width: 70px;
+}
+
+#susignup-renewals {
+	width: 90%;
+	border: 1px solid black;
+	border-collapse: collapse;
+}
+
+#susignup-renewals td {
+	border: 1px solid black;
+	padding-left: 4px;
+	padding-right: 2px;
+}
+
+#susignup-renewals th {
+	border: 1px solid black;
+	text-align: center;
+	padding-left: 2px;
+	padding-right: 2px;
+}
+
+.centre{
+	text-align: center;
+}

Modified: trunk/htdocs/desktop/1024x768.html
===================================================================
--- trunk/htdocs/desktop/1024x768.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/desktop/1024x768.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -9,7 +9,7 @@
 </style>
 </head>
 <body>
-<applet code="VncViewer.class" archive="VncViewer.jar" width="1024" height="768">
+<applet code="VncViewer.class" archive="VncViewer.jar" width="1024" height="798">
 <param name="PORT" value="5902">
 <param name="PASSWORD" value="">
 </applet>

Modified: trunk/htdocs/desktop/640x480.html
===================================================================
--- trunk/htdocs/desktop/640x480.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/desktop/640x480.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -9,7 +9,7 @@
 </style>
 </head>
 <body>
-<applet code="VncViewer.class" archive="VncViewer.jar" width="640" height="480">
+<applet code="VncViewer.class" archive="VncViewer.jar" width="640" height="510">
 <param name="PORT" value="5900">
 <param name="PASSWORD" value="">
 </applet>

Modified: trunk/htdocs/desktop/800x600.html
===================================================================
--- trunk/htdocs/desktop/800x600.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/desktop/800x600.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -9,7 +9,7 @@
 </style>
 </head>
 <body>
-<applet code="VncViewer.class" archive="VncViewer.jar" width="800" height="600">
+<applet code="VncViewer.class" archive="VncViewer.jar" width="800" height="630">
 <param name="PORT" value="5901">
 <param name="PASSWORD" value="">
 </applet>

Modified: trunk/htdocs/desktop/VncViewer.jar
===================================================================
(Binary files differ)


Property changes on: trunk/htdocs/files
___________________________________________________________________
Added: svn:ignore
   + *.exe


Modified: trunk/htdocs/files/Help/mw-script.tar.gz
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-bunch.png
===================================================================
(Binary files differ)

Copied: trunk/htdocs/images/bananas/banana-container.png (from rev 656, branches/sucs-site/htdocs/images/bananas/banana-container.png)
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-crate.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-g-1.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-g-2.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-g-3.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-g-bunch.png
===================================================================
(Binary files differ)

Copied: trunk/htdocs/images/bananas/banana-g-container.png (from rev 656, branches/sucs-site/htdocs/images/bananas/banana-g-container.png)
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-g-crate.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-g-one.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-one.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana-zero.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana1.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana2.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/bananas/banana3.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/border-bottom-left.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/border-bottom-right.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/border-bottom.png
===================================================================
(Binary files differ)

Copied: trunk/htdocs/images/border-top-left.gif (from rev 656, branches/sucs-site/htdocs/images/border-top-left.gif)
===================================================================
(Binary files differ)

Copied: trunk/htdocs/images/border-top-left.png (from rev 656, branches/sucs-site/htdocs/images/border-top-left.png)
===================================================================
(Binary files differ)

Copied: trunk/htdocs/images/border-top-right.gif (from rev 656, branches/sucs-site/htdocs/images/border-top-right.gif)
===================================================================
(Binary files differ)

Copied: trunk/htdocs/images/border-top-right.png (from rev 656, branches/sucs-site/htdocs/images/border-top-right.png)
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/borders.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/box.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/google.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/hostedby.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/left-bottom-corner.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/left-top-corner.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/menu-bottom-left.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/menu-bottom-right.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/menu-top-left.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/menu-top-right.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/orangefade-left.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/right-bottom-corner.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/right-top-corner.png
===================================================================
(Binary files differ)

Copied: trunk/htdocs/images/shame.php (from rev 656, branches/sucs-site/htdocs/images/shame.php)
===================================================================
--- trunk/htdocs/images/shame.php	                        (rev 0)
+++ trunk/htdocs/images/shame.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1 @@
+link ../../components/disk.graph/index.php
\ No newline at end of file

Copied: trunk/htdocs/images/spinner.gif (from rev 656, branches/sucs-site/htdocs/images/spinner.gif)
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/sucslogo-halo.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/sucslogo-main.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/sucslogo-opaque.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/images/sucslogo.png
===================================================================
(Binary files differ)

Modified: trunk/htdocs/index.php
===================================================================
--- trunk/htdocs/index.php	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/index.php	2015-04-05 16:42:47 UTC (rev 657)
@@ -14,8 +14,8 @@
     Settings
    -------------------------------------------------------- */
 
-require_once("settings.php");
-if (!defined('SUCS_BASEDIR')) {
+include("settings.php");
+if (!(isset($base) && isset($preferred_hostname) && isset($dbname))) {
 	echo "Website unconfigured";
 	exit();
 }
@@ -24,42 +24,49 @@
     Libraries
    -------------------------------------------------------- */
 // Include our custom error handling business
-require_once("../lib/error.php");
+require("../lib/error.php");
 
 
 // Include the Smarty templating engine
-require_once(SMARTY_DIR."Smarty.class.php");
-$smarty = new Smarty;
-$smarty->template_dir = SUCS_BASEDIR."templates";
-$smarty->compile_dir = SUCS_BASEDIR."templates_c";
-$smarty->plugins_dir[] = SUCS_BASEDIR."plugins";
+define('SMARTY_DIR', '/usr/share/php/smarty3/');
+require("/usr/share/php/smarty3/SmartyBC.class.php");
+$smarty = new SmartyBC();
+$smarty->setTemplateDir($base."templates");
+$smarty->setCompileDir($base."templates_c");
+$smarty->addPluginsDir($base."plugins");
 
-// Initialise the database
-require_once(ADODB_DIR."adodb.inc.php");
-$DB = NewADOConnection(SUCS_DBTYPE);
-$DB->Connect('dbname='.SUCS_DBNAME);
+$smarty->assign("baseurl", $baseurl);
+
+// Initialise the sucssite database conn
+require("/usr/share/php/adodb/adodb.inc.php");
+$DB = NewADOConnection('postgres9');
+$DB->Connect('dbname='.$dbname.' user='.$dbuser);
+$DB->SetCharSet('utf8');
 $DB->SetFetchMode(ADODB_FETCH_ASSOC);
 
+// Initialise the sucs database conn
+$sucsDB = NewADOConnection('postgres9');
+$sucsDB->Connect('dbname='.$sucsdbname.' user='.$dbuser);
+$sucsDB->SetCharSet('utf8');
+$sucsDB->SetFetchMode(ADODB_FETCH_ASSOC);
+
 // Include the session library
-require(SUCS_BASEDIR."lib/session.php");
+require($base."lib/session.php");
+$session = new Session;
+$smarty->assign_by_ref("session", $session);
 
-switch (SUCS_AUTH_METHOD) {
-	case "LDAP":
-		$session = new SessionLDAP;
-		break;
-	case "DB":
-	default:
-		$session = new Session;
+
+// include feedback form stuff
+if ($session->loggedin) {
+	include("../lib/page-feedback.php");
 }
 
-$smarty->assign_by_ref("session", $session);
-
 /* --------------------------------------------------------
     Debugging
    -------------------------------------------------------- */
 
 // Turn on adodb debugging by uncommenting:
-//$DB->debug = TRUE;
+//$DB->debug = true;
 
 // Turn on Smarty debugging by uncommenting:
 //$smarty->assign("debug",TRUE);
@@ -67,7 +74,6 @@
 // Should we display unexpected output from components?
 $compdebug = TRUE;
 
-
 /* --------------------------------------------------------
     Read Browser's settings
    -------------------------------------------------------- */
@@ -94,27 +100,32 @@
 
 
 // SSL?
-	$ssl_path = @$_SERVER['REQUEST_URI'];
-	if (($n=strpos($ssl_path,"?"))!==FALSE) $ssl_path=substr($ssl_path,0,$n);
-if (SUCS_USE_HTTPS) {
-	$ssl_url = "https://".SUCS_PREFERRED_HOSTNAME.$ssl_path;
+$ssl_path = @$_SERVER['REQUEST_URI'];
+if (($n=strpos($ssl_path,"?"))!==FALSE) $ssl_path=substr($ssl_path,0,$n);
+$ssl_url = "https://".$preferred_hostname.$ssl_path;
+$smarty->assign("ssl_url", $ssl_url);
+
+// Need to use ORIG_PATH_INFO in user homedirs
+if (isset($_SERVER['PATH_INFO'])) {
+	$pathinfo = $_SERVER['PATH_INFO'];
 } else {
-	$ssl_url = "http://".SUCS_PREFERRED_HOSTNAME.$ssl_path;
+	$pathinfo = @$_SERVER['ORIG_PATH_INFO'];
 }
-$smarty->assign("ssl_url", $ssl_url);
 
-
 // Determine which component to run
-$pathlist = explode('/', parse_url(rawurldecode(str_replace("_", " ", @$_SERVER['PATH_INFO'])),PHP_URL_PATH));
+$pathlist = explode('/', parse_url($pathinfo,PHP_URL_PATH));
 while (end($pathlist) === "") array_pop($pathlist);
 $smarty->assign_by_ref("pathlist", $pathlist);
 $path = '';
 $query = "select * from pagemap where path='/' ";
+$params = array();
 foreach($pathlist as $item) {
 	if ($item && $item != '/') {
-	$query .= "or path = '".addslashes($path)."/*' ";
-	$path .= "/$item";
-	$query .= "or path = '".addslashes($path)."' ";
+		$query .= "or path=? ";
+		$params[] = $path."/*";
+		$path .= "/$item";
+		$query .= "or path=? ";
+		$params[] = $path;
 	}
 }
 
@@ -122,7 +133,7 @@
 $smarty->assign_by_ref("path", $path);
 
 $query .= "order by depth desc";
-$pagemap = $DB->GetAll($query);
+$pagemap = $DB->GetAll($query, $params);
 //echo $query;
 if (!$pagemap) $smarty->assign("error", $DB->ErrorMsg());
 if (!$pagemap || count($pagemap)<1) {
@@ -131,7 +142,6 @@
 } else {
 	$smarty->assign("component", $pagemap[0]['component']);
 	$component = $pagemap[0];
-	
 }
 
 if ($path == "") $path="/";
@@ -140,10 +150,11 @@
 $smarty->assign("title", "Set Me");
 $smarty->assign("body", "Empty Body");
 
-include(SUCS_BASEDIR."components/menu.php");
+include($base."components/menu.php");
+//include($base."components/search.php");
 
 // Load the component
-$comppath = SUCS_BASEDIR."components/".$component['component'].".php";
+$comppath = $base."components/".$component['component'].".php";
 $compoutput = "";
 if (file_exists($comppath)) {
 	ob_start();
@@ -151,6 +162,7 @@
 	$compoutput = ob_get_contents();
 	ob_end_clean();
 } else {
+	header("HTTP/1.1 404 Not Found");
 	$smarty->assign("body", "Component ".$component['component']." not found");
 }
 
@@ -160,13 +172,9 @@
 // Render the results
 if (!(isset($no_template)) || (!$no_template)) {
 // Send appropriate Content-Type
-        if (ereg('application/xhtml\+xml', @$_SERVER['HTTP_ACCEPT'])) {
-                header('Content-Type: application/xhtml+xml');
-                echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
-        } else {
-                header('Content-Type: text/html');
-        }
+	header('Content-Type:text/html; charset=UTF-8');
 
+
 	$smarty->display("head.tpl");
 	$smarty->display("index.tpl");
 	if ($compdebug) {
@@ -184,7 +192,7 @@
 	$smarty->assign("totaltime", $totaltime);
 }
 
-$smarty->display("foot".$language['file'].".tpl");
+	$smarty->display("foot".$language['file'].".tpl");
 } else {
 	echo $compoutput;
 }
@@ -192,4 +200,5 @@
 // Save any changes made to the session data
 $session->save();
 
-?>
+
+?>
\ No newline at end of file

Copied: trunk/htdocs/js/jquery.js (from rev 656, branches/sucs-site/htdocs/js/jquery.js)
===================================================================
--- trunk/htdocs/js/jquery.js	                        (rev 0)
+++ trunk/htdocs/js/jquery.js	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,19 @@
+/*
+ * jQuery JavaScript Library v1.3.2
+ * http://jquery.com/
+ *
+ * Copyright (c) 2009 John Resig
+ * Dual licensed under the MIT and GPL licenses.
+ * http://docs.jquery.com/License
+ *
+ * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009)
+ * Revision: 6246
+ */
+(function(){var l=this,g,y=l.jQuery,p=l.$,o=l.jQuery=l.$=function(E,F){return new o.fn.init(E,F)},D=/^[^<]*(<(.|\s)+>)[^>]*$|^#([\w-]+)$/,f=/^.[^:#\[\.,]*$/;o.fn=o.prototype={init:function(E,H){E=E||document;if(E.nodeType){this[0]=E;this.length=1;this.context=E;return this}if(typeof E==="string"){var G=D.exec(E);if(G&&(G[1]||!H)){if(G[1]){E=o.clean([G[1]],H)}else{var I=document.getElementById(G[3]);if(I&&I.id!=G[3]){return o().find(E)}var F=o(I||[]);F.context=document;F.selector=E;return F}}else{return o(H).find(E)}}else{if(o.isFunction(E)){return o(document).ready(E)}}if(E.selector&&E.context){this.selector=E.selector;this.context=E.context}return this.setArray(o.isArray(E)?E:o.makeArray(E))},selector:"",jquery:"1.3.2",size:function(){return this.length},get:function(E){return E===g?Array.prototype.slice.call(this):this[E]},pushStack:function(F,H,E){var G=o(F);G.prevObject=this;G.context=this.context;if(H==="find"){G.selector=this.selector+(this.selector?" ":"")+E}else{if(H){G.selector=this.selector+"."+H+"("+E+")"}}return G},setArray:function(E){this.length=0;Array.prototype.push.apply(this,E);return this},each:function(F,E){return o.each(this,F,E)},index:function(E){return o.inArray(E&&E.jquery?E[0]:E,this)},attr:function(F,H,G){var E=F;if(typeof F==="string"){if(H===g){return this[0]&&o[G||"attr"](this[0],F)}else{E={};E[F]=H}}return this.each(function(I){for(F in E){o.attr(G?this.style:this,F,o.prop(this,E[F],G,I,F))}})},css:function(E,F){if((E=="width"||E=="height")&&parseFloat(F)<0){F=g}return this.attr(E,F,"curCSS")},text:function(F){if(typeof F!=="object"&&F!=null){return this.empty().append((this[0]&&this[0].ownerDocument||document).createTextNode(F))}var E="";o.each(F||this,function(){o.each(this.childNodes,function(){if(this.nodeType!=8){E+=this.nodeType!=1?this.nodeValue:o.fn.text([this])}})});return E},wrapAll:function(E){if(this[0]){var F=o(E,this[0].ownerDocument).clone();if(this[0].parentNode){F.insertBefore(this[0])}F.map(function(){var G=this;while(G.firstChild){G=G.firstChild}return G}).append(this)}return this},wrapInner:function(E){return this.each(function(){o(this).contents().wrapAll(E)})},wrap:function(E){return this.each(function(){o(this).wrapAll(E)})},append:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.appendChild(E)}})},prepend:function(){return this.domManip(arguments,true,function(E){if(this.nodeType==1){this.insertBefore(E,this.firstChild)}})},before:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this)})},after:function(){return this.domManip(arguments,false,function(E){this.parentNode.insertBefore(E,this.nextSibling)})},end:function(){return this.prevObject||o([])},push:[].push,sort:[].sort,splice:[].splice,find:function(E){if(this.length===1){var F=this.pushStack([],"find",E);F.length=0;o.find(E,this[0],F);return F}else{return this.pushStack(o.unique(o.map(this,function(G){return o.find(E,G)})),"find",E)}},clone:function(G){var E=this.map(function(){if(!o.support.noCloneEvent&&!o.isXMLDoc(this)){var I=this.outerHTML;if(!I){var J=this.ownerDocument.createElement("div");J.appendChild(this.cloneNode(true));I=J.innerHTML}return o.clean([I.replace(/ jQuery\d+="(?:\d+|null)"/g,"").replace(/^\s*/,"")])[0]}else{return this.cloneNode(true)}});if(G===true){var H=this.find("*").andSelf(),F=0;E.find("*").andSelf().each(function(){if(this.nodeName!==H[F].nodeName){return}var I=o.data(H[F],"events");for(var K in I){for(var J in I[K]){o.event.add(this,K,I[K][J],I[K][J].data)}}F++})}return E},filter:function(E){return this.pushStack(o.isFunction(E)&&o.grep(this,function(G,F){return E.call(G,F)})||o.multiFilter(E,o.grep(this,function(F){return F.nodeType===1})),"filter",E)},closest:function(E){var G=o.expr.match.POS.test(E)?o(E):null,F=0;return this.map(function(){var H=this;while(H&&H.ownerDocument){if(G?G.index(H)>-1:o(H).is(E)){o.data(H,"closest",F);return H}H=H.parentNode;F++}})},not:function(E){if(typeof E==="string"){if(f.test(E)){return this.pushStack(o.multiFilter(E,this,true),"not",E)}else{E=o.multiFilter(E,this)}}var F=E.length&&E[E.length-1]!==g&&!E.nodeType;return this.filter(function(){return F?o.inArray(this,E)<0:this!=E})},add:function(E){return this.pushStack(o.unique(o.merge(this.get(),typeof E==="string"?o(E):o.makeArray(E))))},is:function(E){return !!E&&o.multiFilter(E,this).length>0},hasClass:function(E){return !!E&&this.is("."+E)},val:function(K){if(K===g){var E=this[0];if(E){if(o.nodeName(E,"option")){return(E.attributes.value||{}).specified?E.value:E.text}if(o.nodeName(E,"select")){var I=E.selectedIndex,L=[],M=E.options,H=E.type=="select-one";if(I<0){return null}for(var F=H?I:0,J=H?I+1:M.length;F<J;F++){var G=M[F];if(G.selected){K=o(G).val();if(H){return K}L.push(K)}}return L}return(E.value||"").replace(/\r/g,"")}return g}if(typeof K==="number"){K+=""}return this.each(function(){if(this.nodeType!=1){return}if(o.isArray(K)&&/radio|checkbox/.test(this.type)){this.checked=(o.inArray(this.value,K)>=0||o.inArray(this.name,K)>=0)}else{if(o.nodeName(this,"select")){var N=o.makeArray(K);o("option",this).each(function(){this.selected=(o.inArray(this.value,N)>=0||o.inArray(this.text,N)>=0)});if(!N.length){this.selectedIndex=-1}}else{this.value=K}}})},html:function(E){return E===g?(this[0]?this[0].innerHTML.replace(/ jQuery\d+="(?:\d+|null)"/g,""):null):this.empty().append(E)},replaceWith:function(E){return this.after(E).remove()},eq:function(E){return this.slice(E,+E+1)},slice:function(){return this.pushStack(Array.prototype.slice.apply(this,arguments),"slice",Array.prototype.slice.call(arguments).join(","))},map:function(E){return this.pushStack(o.map(this,function(G,F){return E.call(G,F,G)}))},andSelf:function(){return this.add(this.prevObject)},domManip:function(J,M,L){if(this[0]){var I=(this[0].ownerDocument||this[0]).createDocumentFragment(),F=o.clean(J,(this[0].ownerDocument||this[0]),I),H=I.firstChild;if(H){for(var G=0,E=this.length;G<E;G++){L.call(K(this[G],H),this.length>1||G>0?I.cloneNode(true):I)}}if(F){o.each(F,z)}}return this;function K(N,O){return M&&o.nodeName(N,"table")&&o.nodeName(O,"tr")?(N.getElementsByTagName("tbody")[0]||N.appendChild(N.ownerDocument.createElement("tbody"))):N}}};o.fn.init.prototype=o.fn;function z(E,F){if(F.src){o.ajax({url:F.src,async:false,dataType:"script"})}else{o.globalEval(F.text||F.textContent||F.innerHTML||"")}if(F.parentNode){F.parentNode.removeChild(F)}}function e(){return +new Date}o.extend=o.fn.extend=function(){var J=arguments[0]||{},H=1,I=arguments.length,E=false,G;if(typeof J==="boolean"){E=J;J=arguments[1]||{};H=2}if(typeof J!=="object"&&!o.isFunction(J)){J={}}if(I==H){J=this;--H}for(;H<I;H++){if((G=arguments[H])!=null){for(var F in G){var K=J[F],L=G[F];if(J===L){continue}if(E&&L&&typeof L==="object"&&!L.nodeType){J[F]=o.extend(E,K||(L.length!=null?[]:{}),L)}else{if(L!==g){J[F]=L}}}}}return J};var b=/z-?index|font-?weight|opacity|zoom|line-?height/i,q=document.defaultView||{},s=Object.prototype.toString;o.extend({noConflict:function(E){l.$=p;if(E){l.jQuery=y}return o},isFunction:function(E){return s.call(E)==="[object Function]"},isArray:function(E){return s.call(E)==="[object Array]"},isXMLDoc:function(E){return E.nodeType===9&&E.documentElement.nodeName!=="HTML"||!!E.ownerDocument&&o.isXMLDoc(E.ownerDocument)},globalEval:function(G){if(G&&/\S/.test(G)){var F=document.getElementsByTagName("head")[0]||document.documentElement,E=document.createElement("script");E.type="text/javascript";if(o.support.scriptEval){E.appendChild(document.createTextNode(G))}else{E.text=G}F.insertBefore(E,F.firstChild);F.removeChild(E)}},nodeName:function(F,E){return F.nodeName&&F.nodeName.toUpperCase()==E.toUpperCase()},each:function(G,K,F){var E,H=0,I=G.length;if(F){if(I===g){for(E in G){if(K.apply(G[E],F)===false){break}}}else{for(;H<I;){if(K.apply(G[H++],F)===false){break}}}}else{if(I===g){for(E in G){if(K.call(G[E],E,G[E])===false){break}}}else{for(var J=G[0];H<I&&K.call(J,H,J)!==false;J=G[++H]){}}}return G},prop:function(H,I,G,F,E){if(o.isFunction(I)){I=I.call(H,F)}return typeof I==="number"&&G=="curCSS"&&!b.test(E)?I+"px":I},className:{add:function(E,F){o.each((F||"").split(/\s+/),function(G,H){if(E.nodeType==1&&!o.className.has(E.className,H)){E.className+=(E.className?" ":"")+H}})},remove:function(E,F){if(E.nodeType==1){E.className=F!==g?o.grep(E.className.split(/\s+/),function(G){return !o.className.has(F,G)}).join(" "):""}},has:function(F,E){return F&&o.inArray(E,(F.className||F).toString().split(/\s+/))>-1}},swap:function(H,G,I){var E={};for(var F in G){E[F]=H.style[F];H.style[F]=G[F]}I.call(H);for(var F in G){H.style[F]=E[F]}},css:function(H,F,J,E){if(F=="width"||F=="height"){var L,G={position:"absolute",visibility:"hidden",display:"block"},K=F=="width"?["Left","Right"]:["Top","Bottom"];function I(){L=F=="width"?H.offsetWidth:H.offsetHeight;if(E==="border"){return}o.each(K,function(){if(!E){L-=parseFloat(o.curCSS(H,"padding"+this,true))||0}if(E==="margin"){L+=parseFloat(o.curCSS(H,"margin"+this,true))||0}else{L-=parseFloat(o.curCSS(H,"border"+this+"Width",true))||0}})}if(H.offsetWidth!==0){I()}else{o.swap(H,G,I)}return Math.max(0,Math.round(L))}return o.curCSS(H,F,J)},curCSS:function(I,F,G){var L,E=I.style;if(F=="opacity"&&!o.support.opacity){L=o.attr(E,"opacity");return L==""?"1":L}if(F.match(/float/i)){F=w}if(!G&&E&&E[F]){L=E[F]}else{if(q.getComputedStyle){if(F.match(/float/i)){F="float"}F=F.replace(/([A-Z])/g,"-$1").toLowerCase();var M=q.getComputedStyle(I,null);if(M){L=M.getPropertyValue(F)}if(F=="opacity"&&L==""){L="1"}}else{if(I.currentStyle){var J=F.replace(/\-(\w)/g,function(N,O){return O.toUpperCase()});L=I.currentStyle[F]||I.currentStyle[J];if(!/^\d+(px)?$/i.test(L)&&/^\d/.test(L)){var H=E.left,K=I.runtimeStyle.left;I.runtimeStyle.left=I.currentStyle.left;E.left=L||0;L=E.pixelLeft+"px";E.left=H;I.runtimeStyle.left=K}}}}return L},clean:function(F,K,I){K=K||document;if(typeof K.createElement==="undefined"){K=K.ownerDocument||K[0]&&K[0].ownerDocument||document}if(!I&&F.length===1&&typeof F[0]==="string"){var H=/^<(\w+)\s*\/?>$/.exec(F[0]);if(H){return[K.createElement(H[1])]}}var G=[],E=[],L=K.createElement("div");o.each(F,function(P,S){if(typeof S==="number"){S+=""}if(!S){return}if(typeof S==="string"){S=S.replace(/(<(\w+)[^>]*?)\/>/g,function(U,V,T){return T.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i)?U:V+"></"+T+">"});var O=S.replace(/^\s+/,"").substring(0,10).toLowerCase();var Q=!O.indexOf("<opt")&&[1,"<select multiple='multiple'>","</select>"]||!O.indexOf("<leg")&&[1,"<fieldset>","</fieldset>"]||O.match(/^<(thead|tbody|tfoot|colg|cap)/)&&[1,"<table>","</table>"]||!O.indexOf("<tr")&&[2,"<table><tbody>","</tbody></table>"]||(!O.indexOf("<td")||!O.indexOf("<th"))&&[3,"<table><tbody><tr>","</tr></tbody></table>"]||!O.indexOf("<col")&&[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"]||!o.support.htmlSerialize&&[1,"div<div>","</div>"]||[0,"",""];L.innerHTML=Q[1]+S+Q[2];while(Q[0]--){L=L.lastChild}if(!o.support.tbody){var R=/<tbody/i.test(S),N=!O.indexOf("<table")&&!R?L.firstChild&&L.firstChild.childNodes:Q[1]=="<table>"&&!R?L.childNodes:[];for(var M=N.length-1;M>=0;--M){if(o.nodeName(N[M],"tbody")&&!N[M].childNodes.length){N[M].parentNode.removeChild(N[M])}}}if(!o.support.leadingWhitespace&&/^\s/.test(S)){L.insertBefore(K.createTextNode(S.match(/^\s*/)[0]),L.firstChild)}S=o.makeArray(L.childNodes)}if(S.nodeType){G.push(S)}else{G=o.merge(G,S)}});if(I){for(var J=0;G[J];J++){if(o.nodeName(G[J],"script")&&(!G[J].type||G[J].type.toLowerCase()==="text/javascript")){E.push(G[J].parentNode?G[J].parentNode.removeChild(G[J]):G[J])}else{if(G[J].nodeType===1){G.splice.apply(G,[J+1,0].concat(o.makeArray(G[J].getElementsByTagName("script"))))}I.appendChild(G[J])}}return E}return G},attr:function(J,G,K){if(!J||J.nodeType==3||J.nodeType==8){return g}var H=!o.isXMLDoc(J),L=K!==g;G=H&&o.props[G]||G;if(J.tagName){var F=/href|src|style/.test(G);if(G=="selected"&&J.parentNode){J.parentNode.selectedIndex}if(G in J&&H&&!F){if(L){if(G=="type"&&o.nodeName(J,"input")&&J.parentNode){throw"type property can't be changed"}J[G]=K}if(o.nodeName(J,"form")&&J.getAttributeNode(G)){return J.getAttributeNode(G).nodeValue}if(G=="tabIndex"){var I=J.getAttributeNode("tabIndex");return I&&I.specified?I.value:J.nodeName.match(/(button|input|object|select|textarea)/i)?0:J.nodeName.match(/^(a|area)$/i)&&J.href?0:g}return J[G]}if(!o.support.style&&H&&G=="style"){return o.attr(J.style,"cssText",K)}if(L){J.setAttribute(G,""+K)}var E=!o.support.hrefNormalized&&H&&F?J.getAttribute(G,2):J.getAttribute(G);return E===null?g:E}if(!o.support.opacity&&G=="opacity"){if(L){J.zoom=1;J.filter=(J.filter||"").replace(/alpha\([^)]*\)/,"")+(parseInt(K)+""=="NaN"?"":"alpha(opacity="+K*100+")")}return J.filter&&J.filter.indexOf("opacity=")>=0?(parseFloat(J.filter.match(/opacity=([^)]*)/)[1])/100)+"":""}G=G.replace(/-([a-z])/ig,function(M,N){return N.toUpperCase()});if(L){J[G]=K}return J[G]},trim:function(E){return(E||"").replace(/^\s+|\s+$/g,"")},makeArray:function(G){var E=[];if(G!=null){var F=G.length;if(F==null||typeof G==="string"||o.isFunction(G)||G.setInterval){E[0]=G}else{while(F){E[--F]=G[F]}}}return E},inArray:function(G,H){for(var E=0,F=H.length;E<F;E++){if(H[E]===G){return E}}return -1},merge:function(H,E){var F=0,G,I=H.length;if(!o.support.getAll){while((G=E[F++])!=null){if(G.nodeType!=8){H[I++]=G}}}else{while((G=E[F++])!=null){H[I++]=G}}return H},unique:function(K){var F=[],E={};try{for(var G=0,H=K.length;G<H;G++){var J=o.data(K[G]);if(!E[J]){E[J]=true;F.push(K[G])}}}catch(I){F=K}return F},grep:function(F,J,E){var G=[];for(var H=0,I=F.length;H<I;H++){if(!E!=!J(F[H],H)){G.push(F[H])}}return G},map:function(E,J){var F=[];for(var G=0,H=E.length;G<H;G++){var I=J(E[G],G);if(I!=null){F[F.length]=I}}return F.concat.apply([],F)}});var C=navigator.userAgent.toLowerCase();o.browser={version:(C.match(/.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/)||[0,"0"])[1],safari:/webkit/.test(C),opera:/opera/.test(C),msie:/msie/.test(C)&&!/opera/.test(C),mozilla:/mozilla/.test(C)&&!/(compatible|webkit)/.test(C)};o.each({parent:function(E){return E.parentNode},parents:function(E){return o.dir(E,"parentNode")},next:function(E){return o.nth(E,2,"nextSibling")},prev:function(E){return o.nth(E,2,"previousSibling")},nextAll:function(E){return o.dir(E,"nextSibling")},prevAll:function(E){return o.dir(E,"previousSibling")},siblings:function(E){return o.sibling(E.parentNode.firstChild,E)},children:function(E){return o.sibling(E.firstChild)},contents:function(E){return o.nodeName(E,"iframe")?E.contentDocument||E.contentWindow.document:o.makeArray(E.childNodes)}},function(E,F){o.fn[E]=function(G){var H=o.map(this,F);if(G&&typeof G=="string"){H=o.multiFilter(G,H)}return this.pushStack(o.unique(H),E,G)}});o.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(E,F){o.fn[E]=function(G){var J=[],L=o(G);for(var K=0,H=L.length;K<H;K++){var I=(K>0?this.clone(true):this).get();o.fn[F].apply(o(L[K]),I);J=J.concat(I)}return this.pushStack(J,E,G)}});o.each({removeAttr:function(E){o.attr(this,E,"");if(this.nodeType==1){this.removeAttribute(E)}},addClass:function(E){o.className.add(this,E)},removeClass:function(E){o.className.remove(this,E)},toggleClass:function(F,E){if(typeof E!=="boolean"){E=!o.className.has(this,F)}o.className[E?"add":"remove"](this,F)},remove:function(E){if(!E||o.filter(E,[this]).length){o("*",this).add([this]).each(function(){o.event.remove(this);o.removeData(this)});if(this.parentNode){this.parentNode.removeChild(this)}}},empty:function(){o(this).children().remove();while(this.firstChild){this.removeChild(this.firstChild)}}},function(E,F){o.fn[E]=function(){return this.each(F,arguments)}});function j(E,F){return E[0]&&parseInt(o.curCSS(E[0],F,true),10)||0}var h="jQuery"+e(),v=0,A={};o.extend({cache:{},data:function(F,E,G){F=F==l?A:F;var H=F[h];if(!H){H=F[h]=++v}if(E&&!o.cache[H]){o.cache[H]={}}if(G!==g){o.cache[H][E]=G}return E?o.cache[H][E]:H},removeData:function(F,E){F=F==l?A:F;var H=F[h];if(E){if(o.cache[H]){delete o.cache[H][E];E="";for(E in o.cache[H]){break}if(!E){o.removeData(F)}}}else{try{delete F[h]}catch(G){if(F.removeAttribute){F.removeAttribute(h)}}delete o.cache[H]}},queue:function(F,E,H){if(F){E=(E||"fx")+"queue";var G=o.data(F,E);if(!G||o.isArray(H)){G=o.data(F,E,o.makeArray(H))}else{if(H){G.push(H)}}}return G},dequeue:function(H,G){var E=o.queue(H,G),F=E.shift();if(!G||G==="fx"){F=E[0]}if(F!==g){F.call(H)}}});o.fn.extend({data:function(E,G){var H=E.split(".");H[1]=H[1]?"."+H[1]:"";if(G===g){var F=this.triggerHandler("getData"+H[1]+"!",[H[0]]);if(F===g&&this.length){F=o.data(this[0],E)}return F===g&&H[1]?this.data(H[0]):F}else{return this.trigger("setData"+H[1]+"!",[H[0],G]).each(function(){o.data(this,E,G)})}},removeData:function(E){return this.each(function(){o.removeData(this,E)})},queue:function(E,F){if(typeof E!=="string"){F=E;E="fx"}if(F===g){return o.queue(this[0],E)}return this.each(function(){var G=o.queue(this,E,F);if(E=="fx"&&G.length==1){G[0].call(this)}})},dequeue:function(E){return this.each(function(){o.dequeue(this,E)})}});
+/*
+ * Sizzle CSS Selector Engine - v0.9.3
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){var R=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?/g,L=0,H=Object.prototype.toString;var F=function(Y,U,ab,ac){ab=ab||[];U=U||document;if(U.nodeType!==1&&U.nodeType!==9){return[]}if(!Y||typeof Y!=="string"){return ab}var Z=[],W,af,ai,T,ad,V,X=true;R.lastIndex=0;while((W=R.exec(Y))!==null){Z.push(W[1]);if(W[2]){V=RegExp.rightContext;break}}if(Z.length>1&&M.exec(Y)){if(Z.length===2&&I.relative[Z[0]]){af=J(Z[0]+Z[1],U)}else{af=I.relative[Z[0]]?[U]:F(Z.shift(),U);while(Z.length){Y=Z.shift();if(I.relative[Y]){Y+=Z.shift()}af=J(Y,af)}}}else{var ae=ac?{expr:Z.pop(),set:E(ac)}:F.find(Z.pop(),Z.length===1&&U.parentNode?U.parentNode:U,Q(U));af=F.filter(ae.expr,ae.set);if(Z.length>0){ai=E(af)}else{X=false}while(Z.length){var ah=Z.pop(),ag=ah;if(!I.relative[ah]){ah=""}else{ag=Z.pop()}if(ag==null){ag=U}I.relative[ah](ai,ag,Q(U))}}if(!ai){ai=af}if(!ai){throw"Syntax error, unrecognized expression: "+(ah||Y)}if(H.call(ai)==="[object Array]"){if(!X){ab.push.apply(ab,ai)}else{if(U.nodeType===1){for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&(ai[aa]===true||ai[aa].nodeType===1&&K(U,ai[aa]))){ab.push(af[aa])}}}else{for(var aa=0;ai[aa]!=null;aa++){if(ai[aa]&&ai[aa].nodeType===1){ab.push(af[aa])}}}}}else{E(ai,ab)}if(V){F(V,U,ab,ac);if(G){hasDuplicate=false;ab.sort(G);if(hasDuplicate){for(var aa=1;aa<ab.length;aa++){if(ab[aa]===ab[aa-1]){ab.splice(aa--,1)}}}}}return ab};F.matches=function(T,U){return F(T,null,null,U)};F.find=function(aa,T,ab){var Z,X;if(!aa){return[]}for(var W=0,V=I.order.length;W<V;W++){var Y=I.order[W],X;if((X=I.match[Y].exec(aa))){var U=RegExp.leftContext;if(U.substr(U.length-1)!=="\\"){X[1]=(X[1]||"").replace(/\\/g,"");Z=I.find[Y](X,T,ab);if(Z!=null){aa=aa.replace(I.match[Y],"");break}}}}if(!Z){Z=T.getElementsByTagName("*")}return{set:Z,expr:aa}};F.filter=function(ad,ac,ag,W){var V=ad,ai=[],aa=ac,Y,T,Z=ac&&ac[0]&&Q(ac[0]);while(ad&&ac.length){for(var ab in I.filter){if((Y=I.match[ab].exec(ad))!=null){var U=I.filter[ab],ah,af;T=false;if(aa==ai){ai=[]}if(I.preFilter[ab]){Y=I.preFilter[ab](Y,aa,ag,ai,W,Z);if(!Y){T=ah=true}else{if(Y===true){continue}}}if(Y){for(var X=0;(af=aa[X])!=null;X++){if(af){ah=U(af,Y,X,aa);var ae=W^!!ah;if(ag&&ah!=null){if(ae){T=true}else{aa[X]=false}}else{if(ae){ai.push(af);T=true}}}}}if(ah!==g){if(!ag){aa=ai}ad=ad.replace(I.match[ab],"");if(!T){return[]}break}}}if(ad==V){if(T==null){throw"Syntax error, unrecognized expression: "+ad}else{break}}V=ad}return aa};var I=F.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF_-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF_-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF_-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*_-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF_-]|\\.)+)(?:\((['"]*)((?:\([^\)]+\)|[^\2\(\)]*)+)\2\))?/},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(T){return T.getAttribute("href")}},relative:{"+":function(aa,T,Z){var X=typeof T==="string",ab=X&&!/\W/.test(T),Y=X&&!ab;if(ab&&!Z){T=T.toUpperCase()}for(var W=0,V=aa.length,U;W<V;W++){if((U=aa[W])){while((U=U.previousSibling)&&U.nodeType!==1){}aa[W]=Y||U&&U.nodeName===T?U||false:U===T}}if(Y){F.filter(T,aa,true)}},">":function(Z,U,aa){var X=typeof U==="string";if(X&&!/\W/.test(U)){U=aa?U:U.toUpperCase();for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){var W=Y.parentNode;Z[V]=W.nodeName===U?W:false}}}else{for(var V=0,T=Z.length;V<T;V++){var Y=Z[V];if(Y){Z[V]=X?Y.parentNode:Y.parentNode===U}}if(X){F.filter(U,Z,true)}}},"":function(W,U,Y){var V=L++,T=S;if(!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("parentNode",U,V,W,X,Y)},"~":function(W,U,Y){var V=L++,T=S;if(typeof U==="string"&&!U.match(/\W/)){var X=U=Y?U:U.toUpperCase();T=P}T("previousSibling",U,V,W,X,Y)}},find:{ID:function(U,V,W){if(typeof V.getElementById!=="undefined"&&!W){var T=V.getElementById(U[1]);return T?[T]:[]}},NAME:function(V,Y,Z){if(typeof Y.getElementsByName!=="undefined"){var U=[],X=Y.getElementsByName(V[1]);for(var W=0,T=X.length;W<T;W++){if(X[W].getAttribute("name")===V[1]){U.push(X[W])}}return U.length===0?null:U}},TAG:function(T,U){return U.getElementsByTagName(T[1])}},preFilter:{CLASS:function(W,U,V,T,Z,aa){W=" "+W[1].replace(/\\/g,"")+" ";if(aa){return W}for(var X=0,Y;(Y=U[X])!=null;X++){if(Y){if(Z^(Y.className&&(" "+Y.className+" ").indexOf(W)>=0)){if(!V){T.push(Y)}}else{if(V){U[X]=false}}}}return false},ID:function(T){return T[1].replace(/\\/g,"")},TAG:function(U,T){for(var V=0;T[V]===false;V++){}return T[V]&&Q(T[V])?U[1]:U[1].toUpperCase()},CHILD:function(T){if(T[1]=="nth"){var U=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(T[2]=="even"&&"2n"||T[2]=="odd"&&"2n+1"||!/\D/.test(T[2])&&"0n+"+T[2]||T[2]);T[2]=(U[1]+(U[2]||1))-0;T[3]=U[3]-0}T[0]=L++;return T},ATTR:function(X,U,V,T,Y,Z){var W=X[1].replace(/\\/g,"");if(!Z&&I.attrMap[W]){X[1]=I.attrMap[W]}if(X[2]==="~="){X[4]=" "+X[4]+" "}return X},PSEUDO:function(X,U,V,T,Y){if(X[1]==="not"){if(X[3].match(R).length>1||/^\w/.test(X[3])){X[3]=F(X[3],null,null,U)}else{var W=F.filter(X[3],U,V,true^Y);if(!V){T.push.apply(T,W)}return false}}else{if(I.match.POS.test(X[0])||I.match.CHILD.test(X[0])){return true}}return X},POS:function(T){T.unshift(true);return T}},filters:{enabled:function(T){return T.disabled===false&&T.type!=="hidden"},disabled:function(T){return T.disabled===true},checked:function(T){return T.checked===true},selected:function(T){T.parentNode.selectedIndex;return T.selected===true},parent:function(T){return !!T.firstChild},empty:function(T){return !T.firstChild},has:function(V,U,T){return !!F(T[3],V).length},header:function(T){return/h\d/i.test(T.nodeName)},text:function(T){return"text"===T.type},radio:function(T){return"radio"===T.type},checkbox:function(T){return"checkbox"===T.type},file:function(T){return"file"===T.type},password:function(T){return"password"===T.type},submit:function(T){return"submit"===T.type},image:function(T){return"image"===T.type},reset:function(T){return"reset"===T.type},button:function(T){return"button"===T.type||T.nodeName.toUpperCase()==="BUTTON"},input:function(T){return/input|select|textarea|button/i.test(T.nodeName)}},setFilters:{first:function(U,T){return T===0},last:function(V,U,T,W){return U===W.length-1},even:function(U,T){return T%2===0},odd:function(U,T){return T%2===1},lt:function(V,U,T){return U<T[3]-0},gt:function(V,U,T){return U>T[3]-0},nth:function(V,U,T){return T[3]-0==U},eq:function(V,U,T){return T[3]-0==U}},filter:{PSEUDO:function(Z,V,W,aa){var U=V[1],X=I.filters[U];if(X){return X(Z,W,V,aa)}else{if(U==="contains"){return(Z.textContent||Z.innerText||"").indexOf(V[3])>=0}else{if(U==="not"){var Y=V[3];for(var W=0,T=Y.length;W<T;W++){if(Y[W]===Z){return false}}return true}}}},CHILD:function(T,W){var Z=W[1],U=T;switch(Z){case"only":case"first":while(U=U.previousSibling){if(U.nodeType===1){return false}}if(Z=="first"){return true}U=T;case"last":while(U=U.nextSibling){if(U.nodeType===1){return false}}return true;case"nth":var V=W[2],ac=W[3];if(V==1&&ac==0){return true}var Y=W[0],ab=T.parentNode;if(ab&&(ab.sizcache!==Y||!T.nodeIndex)){var X=0;for(U=ab.firstChild;U;U=U.nextSibling){if(U.nodeType===1){U.nodeIndex=++X}}ab.sizcache=Y}var aa=T.nodeIndex-ac;if(V==0){return aa==0}else{return(aa%V==0&&aa/V>=0)}}},ID:function(U,T){return U.nodeType===1&&U.getAttribute("id")===T},TAG:function(U,T){return(T==="*"&&U.nodeType===1)||U.nodeName===T},CLASS:function(U,T){return(" "+(U.className||U.getAttribute("class"))+" ").indexOf(T)>-1},ATTR:function(Y,W){var V=W[1],T=I.attrHandle[V]?I.attrHandle[V](Y):Y[V]!=null?Y[V]:Y.getAttribute(V),Z=T+"",X=W[2],U=W[4];return T==null?X==="!=":X==="="?Z===U:X==="*="?Z.indexOf(U)>=0:X==="~="?(" "+Z+" ").indexOf(U)>=0:!U?Z&&T!==false:X==="!="?Z!=U:X==="^="?Z.indexOf(U)===0:X==="$="?Z.substr(Z.length-U.length)===U:X==="|="?Z===U||Z.substr(0,U.length+1)===U+"-":false},POS:function(X,U,V,Y){var T=U[2],W=I.setFilters[T];if(W){return W(X,V,U,Y)}}}};var M=I.match.POS;for(var O in I.match){I.match[O]=RegExp(I.match[O].source+/(?![^\[]*\])(?![^\(]*\))/.source)}var E=function(U,T){U=Array.prototype.slice.call(U);if(T){T.push.apply(T,U);return T}return U};try{Array.prototype.slice.call(document.documentElement.childNodes)}catch(N){E=function(X,W){var U=W||[];if(H.call(X)==="[object Array]"){Array.prototype.push.apply(U,X)}else{if(typeof X.length==="number"){for(var V=0,T=X.length;V<T;V++){U.push(X[V])}}else{for(var V=0;X[V];V++){U.push(X[V])}}}return U}}var G;if(document.documentElement.compareDocumentPosition){G=function(U,T){var V=U.compareDocumentPosition(T)&4?-1:U===T?0:1;if(V===0){hasDuplicate=true}return V}}else{if("sourceIndex" in document.documentElement){G=function(U,T){var V=U.sourceIndex-T.sourceIndex;if(V===0){hasDuplicate=true}return V}}else{if(document.createRange){G=function(W,U){var V=W.ownerDocument.createRange(),T=U.ownerDocument.createRange();V.selectNode(W);V.collapse(true);T.selectNode(U);T.collapse(true);var X=V.compareBoundaryPoints(Range.START_TO_END,T);if(X===0){hasDuplicate=true}return X}}}}(function(){var U=document.createElement("form"),V="script"+(new Date).getTime();U.innerHTML="<input name='"+V+"'/>";var T=document.documentElement;T.insertBefore(U,T.firstChild);if(!!document.getElementById(V)){I.find.ID=function(X,Y,Z){if(typeof Y.getElementById!=="undefined"&&!Z){var W=Y.getElementById(X[1]);return W?W.id===X[1]||typeof W.getAttributeNode!=="undefined"&&W.getAttributeNode("id").nodeValue===X[1]?[W]:g:[]}};I.filter.ID=function(Y,W){var X=typeof Y.getAttributeNode!=="undefined"&&Y.getAttributeNode("id");return Y.nodeType===1&&X&&X.nodeValue===W}}T.removeChild(U)})();(function(){var T=document.createElement("div");T.appendChild(document.createComment(""));if(T.getElementsByTagName("*").length>0){I.find.TAG=function(U,Y){var X=Y.getElementsByTagName(U[1]);if(U[1]==="*"){var W=[];for(var V=0;X[V];V++){if(X[V].nodeType===1){W.push(X[V])}}X=W}return X}}T.innerHTML="<a href='#'></a>";if(T.firstChild&&typeof T.firstChild.getAttribute!=="undefined"&&T.firstChild.getAttribute("href")!=="#"){I.attrHandle.href=function(U){return U.getAttribute("href",2)}}})();if(document.querySelectorAll){(function(){var T=F,U=document.createElement("div");U.innerHTML="<p class='TEST'></p>";if(U.querySelectorAll&&U.querySelectorAll(".TEST").length===0){return}F=function(Y,X,V,W){X=X||document;if(!W&&X.nodeType===9&&!Q(X)){try{return E(X.querySelectorAll(Y),V)}catch(Z){}}return T(Y,X,V,W)};F.find=T.find;F.filter=T.filter;F.selectors=T.selectors;F.matches=T.matches})()}if(document.getElementsByClassName&&document.documentElement.getElementsByClassName){(function(){var T=document.createElement("div");T.innerHTML="<div class='test e'></div><div class='test'></div>";if(T.getElementsByClassName("e").length===0){return}T.lastChild.className="e";if(T.getElementsByClassName("e").length===1){return}I.order.splice(1,0,"CLASS");I.find.CLASS=function(U,V,W){if(typeof V.getElementsByClassName!=="undefined"&&!W){return V.getElementsByClassName(U[1])}}})()}function P(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1&&!ac){T.sizcache=Y;T.sizset=W}if(T.nodeName===Z){X=T;break}T=T[U]}ad[W]=X}}}function S(U,Z,Y,ad,aa,ac){var ab=U=="previousSibling"&&!ac;for(var W=0,V=ad.length;W<V;W++){var T=ad[W];if(T){if(ab&&T.nodeType===1){T.sizcache=Y;T.sizset=W}T=T[U];var X=false;while(T){if(T.sizcache===Y){X=ad[T.sizset];break}if(T.nodeType===1){if(!ac){T.sizcache=Y;T.sizset=W}if(typeof Z!=="string"){if(T===Z){X=true;break}}else{if(F.filter(Z,[T]).length>0){X=T;break}}}T=T[U]}ad[W]=X}}}var K=document.compareDocumentPosition?function(U,T){return U.compareDocumentPosition(T)&16}:function(U,T){return U!==T&&(U.contains?U.contains(T):true)};var Q=function(T){return T.nodeType===9&&T.documentElement.nodeName!=="HTML"||!!T.ownerDocument&&Q(T.ownerDocument)};var J=function(T,aa){var W=[],X="",Y,V=aa.nodeType?[aa]:aa;while((Y=I.match.PSEUDO.exec(T))){X+=Y[0];T=T.replace(I.match.PSEUDO,"")}T=I.relative[T]?T+"*":T;for(var Z=0,U=V.length;Z<U;Z++){F(T,V[Z],W)}return F.filter(X,W)};o.find=F;o.filter=F.filter;o.expr=F.selectors;o.expr[":"]=o.expr.filters;F.selectors.filters.hidden=function(T){return T.offsetWidth===0||T.offsetHeight===0};F.selectors.filters.visible=function(T){return T.offsetWidth>0||T.offsetHeight>0};F.selectors.filters.animated=function(T){return o.grep(o.timers,function(U){return T===U.elem}).length};o.multiFilter=function(V,T,U){if(U){V=":not("+V+")"}return F.matches(V,T)};o.dir=function(V,U){var T=[],W=V[U];while(W&&W!=document){if(W.nodeType==1){T.push(W)}W=W[U]}return T};o.nth=function(X,T,V,W){T=T||1;var U=0;for(;X;X=X[V]){if(X.nodeType==1&&++U==T){break}}return X};o.sibling=function(V,U){var T=[];for(;V;V=V.nextSibling){if(V.nodeType==1&&V!=U){T.push(V)}}return T};return;l.Sizzle=F})();o.event={add:function(I,F,H,K){if(I.nodeType==3||I.nodeType==8){return}if(I.setInterval&&I!=l){I=l}if(!H.guid){H.guid=this.guid++}if(K!==g){var G=H;H=this.proxy(G);H.data=K}var E=o.data(I,"events")||o.data(I,"events",{}),J=o.data(I,"handle")||o.data(I,"handle",function(){return typeof o!=="undefined"&&!o.event.triggered?o.event.handle.apply(arguments.callee.elem,arguments):g});J.elem=I;o.each(F.split(/\s+/),function(M,N){var O=N.split(".");N=O.shift();H.type=O.slice().sort().join(".");var L=E[N];if(o.event.specialAll[N]){o.event.specialAll[N].setup.call(I,K,O)}if(!L){L=E[N]={};if(!o.event.special[N]||o.event.special[N].setup.call(I,K,O)===false){if(I.addEventListener){I.addEventListener(N,J,false)}else{if(I.attachEvent){I.attachEvent("on"+N,J)}}}}L[H.guid]=H;o.event.global[N]=true});I=null},guid:1,global:{},remove:function(K,H,J){if(K.nodeType==3||K.nodeType==8){return}var G=o.data(K,"events"),F,E;if(G){if(H===g||(typeof H==="string"&&H.charAt(0)==".")){for(var I in G){this.remove(K,I+(H||""))}}else{if(H.type){J=H.handler;H=H.type}o.each(H.split(/\s+/),function(M,O){var Q=O.split(".");O=Q.shift();var N=RegExp("(^|\\.)"+Q.slice().sort().join(".*\\.")+"(\\.|$)");if(G[O]){if(J){delete G[O][J.guid]}else{for(var P in G[O]){if(N.test(G[O][P].type)){delete G[O][P]}}}if(o.event.specialAll[O]){o.event.specialAll[O].teardown.call(K,Q)}for(F in G[O]){break}if(!F){if(!o.event.special[O]||o.event.special[O].teardown.call(K,Q)===false){if(K.removeEventListener){K.removeEventListener(O,o.data(K,"handle"),false)}else{if(K.detachEvent){K.detachEvent("on"+O,o.data(K,"handle"))}}}F=null;delete G[O]}}})}for(F in G){break}if(!F){var L=o.data(K,"handle");if(L){L.elem=null}o.removeData(K,"events");o.removeData(K,"handle")}}},trigger:function(I,K,H,E){var G=I.type||I;if(!E){I=typeof I==="object"?I[h]?I:o.extend(o.Event(G),I):o.Event(G);if(G.indexOf("!")>=0){I.type=G=G.slice(0,-1);I.exclusive=true}if(!H){I.stopPropagation();if(this.global[G]){o.each(o.cache,function(){if(this.events&&this.events[G]){o.event.trigger(I,K,this.handle.elem)}})}}if(!H||H.nodeType==3||H.nodeType==8){return g}I.result=g;I.target=H;K=o.makeArray(K);K.unshift(I)}I.currentTarget=H;var J=o.data(H,"handle");if(J){J.apply(H,K)}if((!H[G]||(o.nodeName(H,"a")&&G=="click"))&&H["on"+G]&&H["on"+G].apply(H,K)===false){I.result=false}if(!E&&H[G]&&!I.isDefaultPrevented()&&!(o.nodeName(H,"a")&&G=="click")){this.triggered=true;try{H[G]()}catch(L){}}this.triggered=false;if(!I.isPropagationStopped()){var F=H.parentNode||H.ownerDocument;if(F){o.event.trigger(I,K,F,true)}}},handle:function(K){var J,E;K=arguments[0]=o.event.fix(K||l.event);K.currentTarget=this;var L=K.type.split(".");K.type=L.shift();J=!L.length&&!K.exclusive;var I=RegExp("(^|\\.)"+L.slice().sort().join(".*\\.")+"(\\.|$)");E=(o.data(this,"events")||{})[K.type];for(var G in E){var H=E[G];if(J||I.test(H.type)){K.handler=H;K.data=H.data;var F=H.apply(this,arguments);if(F!==g){K.result=F;if(F===false){K.preventDefault();K.stopPropagation()}}if(K.isImmediatePropagationStopped()){break}}}},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode metaKey newValue originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(H){if(H[h]){return H}var F=H;H=o.Event(F);for(var G=this.props.length,J;G;){J=this.props[--G];H[J]=F[J]}if(!H.target){H.target=H.srcElement||document}if(H.target.nodeType==3){H.target=H.target.parentNode}if(!H.relatedTarget&&H.fromElement){H.relatedTarget=H.fromElement==H.target?H.toElement:H.fromElement}if(H.pageX==null&&H.clientX!=null){var I=document.documentElement,E=document.body;H.pageX=H.clientX+(I&&I.scrollLeft||E&&E.scrollLeft||0)-(I.clientLeft||0);H.pageY=H.clientY+(I&&I.scrollTop||E&&E.scrollTop||0)-(I.clientTop||0)}if(!H.which&&((H.charCode||H.charCode===0)?H.charCode:H.keyCode)){H.which=H.charCode||H.keyCode}if(!H.metaKey&&H.ctrlKey){H.metaKey=H.ctrlKey}if(!H.which&&H.button){H.which=(H.button&1?1:(H.button&2?3:(H.button&4?2:0)))}return H},proxy:function(F,E){E=E||function(){return F.apply(this,arguments)};E.guid=F.guid=F.guid||E.guid||this.guid++;return E},special:{ready:{setup:B,teardown:function(){}}},specialAll:{live:{setup:function(E,F){o.event.add(this,F[0],c)},teardown:function(G){if(G.length){var E=0,F=RegExp("(^|\\.)"+G[0]+"(\\.|$)");o.each((o.data(this,"events").live||{}),function(){if(F.test(this.type)){E++}});if(E<1){o.event.remove(this,G[0],c)}}}}}};o.Event=function(E){if(!this.preventDefault){return new o.Event(E)}if(E&&E.type){this.originalEvent=E;this.type=E.type}else{this.type=E}this.timeStamp=e();this[h]=true};function k(){return false}function u(){return true}o.Event.prototype={preventDefault:function(){this.isDefaultPrevented=u;var E=this.originalEvent;if(!E){return}if(E.preventDefault){E.preventDefault()}E.returnValue=false},stopPropagation:function(){this.isPropagationStopped=u;var E=this.originalEvent;if(!E){return}if(E.stopPropagation){E.stopPropagation()}E.cancelBubble=true},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=u;this.stopPropagation()},isDefaultPrevented:k,isPropagationStopped:k,isImmediatePropagationStopped:k};var a=function(F){var E=F.relatedTarget;while(E&&E!=this){try{E=E.parentNode}catch(G){E=this}}if(E!=this){F.type=F.data;o.event.handle.apply(this,arguments)}};o.each({mouseover:"mouseenter",mouseout:"mouseleave"},function(F,E){o.event.special[E]={setup:function(){o.event.add(this,F,a,E)},teardown:function(){o.event.remove(this,F,a)}}});o.fn.extend({bind:function(F,G,E){return F=="unload"?this.one(F,G,E):this.each(function(){o.event.add(this,F,E||G,E&&G)})},one:function(G,H,F){var E=o.event.proxy(F||H,function(I){o(this).unbind(I,E);return(F||H).apply(this,arguments)});return this.each(function(){o.event.add(this,G,E,F&&H)})},unbind:function(F,E){return this.each(function(){o.event.remove(this,F,E)})},trigger:function(E,F){return this.each(function(){o.event.trigger(E,F,this)})},triggerHandler:function(E,G){if(this[0]){var F=o.Event(E);F.preventDefault();F.stopPropagation();o.event.trigger(F,G,this[0]);return F.result}},toggle:function(G){var E=arguments,F=1;while(F<E.length){o.event.proxy(G,E[F++])}return this.click(o.event.proxy(G,function(H){this.lastToggle=(this.lastToggle||0)%F;H.preventDefault();return E[this.lastToggle++].apply(this,arguments)||false}))},hover:function(E,F){return this.mouseenter(E).mouseleave(F)},ready:function(E){B();if(o.isReady){E.call(document,o)}else{o.readyList.push(E)}return this},live:function(G,F){var E=o.event.proxy(F);E.guid+=this.selector+G;o(document).bind(i(G,this.selector),this.selector,E);return this},die:function(F,E){o(document).unbind(i(F,this.selector),E?{guid:E.guid+this.selector+F}:null);return this}});function c(H){var E=RegExp("(^|\\.)"+H.type+"(\\.|$)"),G=true,F=[];o.each(o.data(this,"events").live||[],function(I,J){if(E.test(J.type)){var K=o(H.target).closest(J.data)[0];if(K){F.push({elem:K,fn:J})}}});F.sort(function(J,I){return o.data(J.elem,"closest")-o.data(I.elem,"closest")});o.each(F,function(){if(this.fn.call(this.elem,H,this.fn.data)===false){return(G=false)}});return G}function i(F,E){return["live",F,E.replace(/\./g,"`").replace(/ /g,"|")].join(".")}o.extend({isReady:false,readyList:[],ready:function(){if(!o.isReady){o.isReady=true;if(o.readyList){o.each(o.readyList,function(){this.call(document,o)});o.readyList=null}o(document).triggerHandler("ready")}}});var x=false;function B(){if(x){return}x=true;if(document.addEventListener){document.addEventListener("DOMContentLoaded",function(){document.removeEventListener("DOMContentLoaded",arguments.callee,false);o.ready()},false)}else{if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);o.ready()}});if(document.documentElement.doScroll&&l==l.top){(function(){if(o.isReady){return}try{document.documentElement.doScroll("left")}catch(E){setTimeout(arguments.callee,0);return}o.ready()})()}}}o.event.add(l,"load",o.ready)}o.each(("blur,focus,load,resize,scroll,unload,click,dblclick,mousedown,mouseup,mousemove,mouseover,mouseout,mouseenter,mouseleave,change,select,submit,keydown,keypress,keyup,error").split(","),function(F,E){o.fn[E]=function(G){return G?this.bind(E,G):this.trigger(E)}});o(l).bind("unload",function(){for(var E in o.cache){if(E!=1&&o.cache[E].handle){o.event.remove(o.cache[E].handle.elem)}}});(function(){o.support={};var F=document.documentElement,G=document.createElement("script"),K=document.createElement("div"),J="script"+(new Date).getTime();K.style.display="none";K.innerHTML='   <link/><table></table><a href="/a" style="color:red;float:left;opacity:.5;">a</a><select><option>text</option></select><object><param/></object>';var H=K.getElementsByTagName("*"),E=K.getElementsByTagName("a")[0];if(!H||!H.length||!E){return}o.support={leadingWhitespace:K.firstChild.nodeType==3,tbody:!K.getElementsByTagName("tbody").length,objectAll:!!K.getElementsByTagName("object")[0].getElementsByTagName("*").length,htmlSerialize:!!K.getElementsByTagName("link").length,style:/red/.test(E.getAttribute("style")),hrefNormalized:E.getAttribute("href")==="/a",opacity:E.style.opacity==="0.5",cssFloat:!!E.style.cssFloat,scriptEval:false,noCloneEvent:true,boxModel:null};G.type="text/javascript";try{G.appendChild(document.createTextNode("window."+J+"=1;"))}catch(I){}F.insertBefore(G,F.firstChild);if(l[J]){o.support.scriptEval=true;delete l[J]}F.removeChild(G);if(K.attachEvent&&K.fireEvent){K.attachEvent("onclick",function(){o.support.noCloneEvent=false;K.detachEvent("onclick",arguments.callee)});K.cloneNode(true).fireEvent("onclick")}o(function(){var L=document.createElement("div");L.style.width=L.style.paddingLeft="1px";document.body.appendChild(L);o.boxModel=o.support.boxModel=L.offsetWidth===2;document.body.removeChild(L).style.display="none"})})();var w=o.support.cssFloat?"cssFloat":"styleFloat";o.props={"for":"htmlFor","class":"className","float":w,cssFloat:w,styleFloat:w,readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",tabindex:"tabIndex"};o.fn.extend({_load:o.fn.load,load:function(G,J,K){if(typeof G!=="string"){return this._load(G)}var I=G.indexOf(" ");if(I>=0){var E=G.slice(I,G.length);G=G.slice(0,I)}var H="GET";if(J){if(o.isFunction(J)){K=J;J=null}else{if(typeof J==="object"){J=o.param(J);H="POST"}}}var F=this;o.ajax({url:G,type:H,dataType:"html",data:J,complete:function(M,L){if(L=="success"||L=="notmodified"){F.html(E?o("<div/>").append(M.responseText.replace(/<script(.|\s)*?\/script>/g,"")).find(E):M.responseText)}if(K){F.each(K,[M.responseText,L,M])}}});return this},serialize:function(){return o.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?o.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||/select|textarea/i.test(this.nodeName)||/text|hidden|password|search/i.test(this.type))}).map(function(E,F){var G=o(this).val();return G==null?null:o.isArray(G)?o.map(G,function(I,H){return{name:F.name,value:I}}):{name:F.name,value:G}}).get()}});o.each("ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","),function(E,F){o.fn[F]=function(G){return this.bind(F,G)}});var r=e();o.extend({get:function(E,G,H,F){if(o.isFunction(G)){H=G;G=null}return o.ajax({type:"GET",url:E,data:G,success:H,dataType:F})},getScript:function(E,F){return o.get(E,null,F,"script")},getJSON:function(E,F,G){return o.get(E,F,G,"json")},post:function(E,G,H,F){if(o.isFunction(G)){H=G;G={}}return o.ajax({type:"POST",url:E,data:G,success:H,dataType:F})},ajaxSetup:function(E){o.extend(o.ajaxSettings,E)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return l.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP"):new XMLHttpRequest()},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},ajax:function(M){M=o.extend(true,M,o.extend(true,{},o.ajaxSettings,M));var W,F=/=\?(&|$)/g,R,V,G=M.type.toUpperCase();if(M.data&&M.processData&&typeof M.data!=="string"){M.data=o.param(M.data)}if(M.dataType=="jsonp"){if(G=="GET"){if(!M.url.match(F)){M.url+=(M.url.match(/\?/)?"&":"?")+(M.jsonp||"callback")+"=?"}}else{if(!M.data||!M.data.match(F)){M.data=(M.data?M.data+"&":"")+(M.jsonp||"callback")+"=?"}}M.dataType="json"}if(M.dataType=="json"&&(M.data&&M.data.match(F)||M.url.match(F))){W="jsonp"+r++;if(M.data){M.data=(M.data+"").replace(F,"="+W+"$1")}M.url=M.url.replace(F,"="+W+"$1");M.dataType="script";l[W]=function(X){V=X;I();L();l[W]=g;try{delete l[W]}catch(Y){}if(H){H.removeChild(T)}}}if(M.dataType=="script"&&M.cache==null){M.cache=false}if(M.cache===false&&G=="GET"){var E=e();var U=M.url.replace(/(\?|&)_=.*?(&|$)/,"$1_="+E+"$2");M.url=U+((U==M.url)?(M.url.match(/\?/)?"&":"?")+"_="+E:"")}if(M.data&&G=="GET"){M.url+=(M.url.match(/\?/)?"&":"?")+M.data;M.data=null}if(M.global&&!o.active++){o.event.trigger("ajaxStart")}var Q=/^(\w+:)?\/\/([^\/?#]+)/.exec(M.url);if(M.dataType=="script"&&G=="GET"&&Q&&(Q[1]&&Q[1]!=location.protocol||Q[2]!=location.host)){var H=document.getElementsByTagName("head")[0];var T=document.createElement("script");T.src=M.url;if(M.scriptCharset){T.charset=M.scriptCharset}if(!W){var O=false;T.onload=T.onreadystatechange=function(){if(!O&&(!this.readyState||this.readyState=="loaded"||this.readyState=="complete")){O=true;I();L();T.onload=T.onreadystatechange=null;H.removeChild(T)}}}H.appendChild(T);return g}var K=false;var J=M.xhr();if(M.username){J.open(G,M.url,M.async,M.username,M.password)}else{J.open(G,M.url,M.async)}try{if(M.data){J.setRequestHeader("Content-Type",M.contentType)}if(M.ifModified){J.setRequestHeader("If-Modified-Since",o.lastModified[M.url]||"Thu, 01 Jan 1970 00:00:00 GMT")}J.setRequestHeader("X-Requested-With","XMLHttpRequest");J.setRequestHeader("Accept",M.dataType&&M.accepts[M.dataType]?M.accepts[M.dataType]+", */*":M.accepts._default)}catch(S){}if(M.beforeSend&&M.beforeSend(J,M)===false){if(M.global&&!--o.active){o.event.trigger("ajaxStop")}J.abort();return false}if(M.global){o.event.trigger("ajaxSend",[J,M])}var N=function(X){if(J.readyState==0){if(P){clearInterval(P);P=null;if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}}else{if(!K&&J&&(J.readyState==4||X=="timeout")){K=true;if(P){clearInterval(P);P=null}R=X=="timeout"?"timeout":!o.httpSuccess(J)?"error":M.ifModified&&o.httpNotModified(J,M.url)?"notmodified":"success";if(R=="success"){try{V=o.httpData(J,M.dataType,M)}catch(Z){R="parsererror"}}if(R=="success"){var Y;try{Y=J.getResponseHeader("Last-Modified")}catch(Z){}if(M.ifModified&&Y){o.lastModified[M.url]=Y}if(!W){I()}}else{o.handleError(M,J,R)}L();if(X){J.abort()}if(M.async){J=null}}}};if(M.async){var P=setInterval(N,13);if(M.timeout>0){setTimeout(function(){if(J&&!K){N("timeout")}},M.timeout)}}try{J.send(M.data)}catch(S){o.handleError(M,J,null,S)}if(!M.async){N()}function I(){if(M.success){M.success(V,R)}if(M.global){o.event.trigger("ajaxSuccess",[J,M])}}function L(){if(M.complete){M.complete(J,R)}if(M.global){o.event.trigger("ajaxComplete",[J,M])}if(M.global&&!--o.active){o.event.trigger("ajaxStop")}}return J},handleError:function(F,H,E,G){if(F.error){F.error(H,E,G)}if(F.global){o.event.trigger("ajaxError",[H,F,G])}},active:0,httpSuccess:function(F){try{return !F.status&&location.protocol=="file:"||(F.status>=200&&F.status<300)||F.status==304||F.status==1223}catch(E){}return false},httpNotModified:function(G,E){try{var H=G.getResponseHeader("Last-Modified");return G.status==304||H==o.lastModified[E]}catch(F){}return false},httpData:function(J,H,G){var F=J.getResponseHeader("content-type"),E=H=="xml"||!H&&F&&F.indexOf("xml")>=0,I=E?J.responseXML:J.responseText;if(E&&I.documentElement.tagName=="parsererror"){throw"parsererror"}if(G&&G.dataFilter){I=G.dataFilter(I,H)}if(typeof I==="string"){if(H=="script"){o.globalEval(I)}if(H=="json"){I=l["eval"]("("+I+")")}}return I},param:function(E){var G=[];function H(I,J){G[G.length]=encodeURIComponent(I)+"="+encodeURIComponent(J)}if(o.isArray(E)||E.jquery){o.each(E,function(){H(this.name,this.value)})}else{for(var F in E){if(o.isArray(E[F])){o.each(E[F],function(){H(F,this)})}else{H(F,o.isFunction(E[F])?E[F]():E[F])}}}return G.join("&").replace(/%20/g,"+")}});var m={},n,d=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];function t(F,E){var G={};o.each(d.concat.apply([],d.slice(0,E)),function(){G[this]=F});return G}o.fn.extend({show:function(J,L){if(J){return this.animate(t("show",3),J,L)}else{for(var H=0,F=this.length;H<F;H++){var E=o.data(this[H],"olddisplay");this[H].style.display=E||"";if(o.css(this[H],"display")==="none"){var G=this[H].tagName,K;if(m[G]){K=m[G]}else{var I=o("<"+G+" />").appendTo("body");K=I.css("display");if(K==="none"){K="block"}I.remove();m[G]=K}o.data(this[H],"olddisplay",K)}}for(var H=0,F=this.length;H<F;H++){this[H].style.display=o.data(this[H],"olddisplay")||""}return this}},hide:function(H,I){if(H){return this.animate(t("hide",3),H,I)}else{for(var G=0,F=this.length;G<F;G++){var E=o.data(this[G],"olddisplay");if(!E&&E!=="none"){o.data(this[G],"olddisplay",o.css(this[G],"display"))}}for(var G=0,F=this.length;G<F;G++){this[G].style.display="none"}return this}},_toggle:o.fn.toggle,toggle:function(G,F){var E=typeof G==="boolean";return o.isFunction(G)&&o.isFunction(F)?this._toggle.apply(this,arguments):G==null||E?this.each(function(){var H=E?G:o(this).is(":hidden");o(this)[H?"show":"hide"]()}):this.animate(t("toggle",3),G,F)},fadeTo:function(E,G,F){return this.animate({opacity:G},E,F)},animate:function(I,F,H,G){var E=o.speed(F,H,G);return this[E.queue===false?"each":"queue"](function(){var K=o.extend({},E),M,L=this.nodeType==1&&o(this).is(":hidden"),J=this;for(M in I){if(I[M]=="hide"&&L||I[M]=="show"&&!L){return K.complete.call(this)}if((M=="height"||M=="width")&&this.style){K.display=o.css(this,"display");K.overflow=this.style.overflow}}if(K.overflow!=null){this.style.overflow="hidden"}K.curAnim=o.extend({},I);o.each(I,function(O,S){var R=new o.fx(J,K,O);if(/toggle|show|hide/.test(S)){R[S=="toggle"?L?"show":"hide":S](I)}else{var Q=S.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/),T=R.cur(true)||0;if(Q){var N=parseFloat(Q[2]),P=Q[3]||"px";if(P!="px"){J.style[O]=(N||1)+P;T=((N||1)/R.cur(true))*T;J.style[O]=T+P}if(Q[1]){N=((Q[1]=="-="?-1:1)*N)+T}R.custom(T,N,P)}else{R.custom(T,S,"")}}});return true})},stop:function(F,E){var G=o.timers;if(F){this.queue([])}this.each(function(){for(var H=G.length-1;H>=0;H--){if(G[H].elem==this){if(E){G[H](true)}G.splice(H,1)}}});if(!E){this.dequeue()}return this}});o.each({slideDown:t("show",1),slideUp:t("hide",1),slideToggle:t("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(E,F){o.fn[E]=function(G,H){return this.animate(F,G,H)}});o.extend({speed:function(G,H,F){var E=typeof G==="object"?G:{complete:F||!F&&H||o.isFunction(G)&&G,duration:G,easing:F&&H||H&&!o.isFunction(H)&&H};E.duration=o.fx.off?0:typeof E.duration==="number"?E.duration:o.fx.speeds[E.duration]||o.fx.speeds._default;E.old=E.complete;E.complete=function(){if(E.queue!==false){o(this).dequeue()}if(o.isFunction(E.old)){E.old.call(this)}};return E},easing:{linear:function(G,H,E,F){return E+F*G},swing:function(G,H,E,F){return((-Math.cos(G*Math.PI)/2)+0.5)*F+E}},timers:[],fx:function(F,E,G){this.options=E;this.elem=F;this.prop=G;if(!E.orig){E.orig={}}}});o.fx.prototype={update:function(){if(this.options.step){this.options.step.call(this.elem,this.now,this)}(o.fx.step[this.prop]||o.fx.step._default)(this);if((this.prop=="height"||this.prop=="width")&&this.elem.style){this.elem.style.display="block"}},cur:function(F){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null)){return this.elem[this.prop]}var E=parseFloat(o.css(this.elem,this.prop,F));return E&&E>-10000?E:parseFloat(o.curCSS(this.elem,this.prop))||0},custom:function(I,H,G){this.startTime=e();this.start=I;this.end=H;this.unit=G||this.unit||"px";this.now=this.start;this.pos=this.state=0;var E=this;function F(J){return E.step(J)}F.elem=this.elem;if(F()&&o.timers.push(F)&&!n){n=setInterval(function(){var K=o.timers;for(var J=0;J<K.length;J++){if(!K[J]()){K.splice(J--,1)}}if(!K.length){clearInterval(n);n=g}},13)}},show:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.show=true;this.custom(this.prop=="width"||this.prop=="height"?1:0,this.cur());o(this.elem).show()},hide:function(){this.options.orig[this.prop]=o.attr(this.elem.style,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(H){var G=e();if(H||G>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;var E=true;for(var F in this.options.curAnim){if(this.options.curAnim[F]!==true){E=false}}if(E){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;this.elem.style.display=this.options.display;if(o.css(this.elem,"display")=="none"){this.elem.style.display="block"}}if(this.options.hide){o(this.elem).hide()}if(this.options.hide||this.options.show){for(var I in this.options.curAnim){o.attr(this.elem.style,I,this.options.orig[I])}}this.options.complete.call(this.elem)}return false}else{var J=G-this.startTime;this.state=J/this.options.duration;this.pos=o.easing[this.options.easing||(o.easing.swing?"swing":"linear")](this.state,J,0,1,this.options.duration);this.now=this.start+((this.end-this.start)*this.pos);this.update()}return true}};o.extend(o.fx,{speeds:{slow:600,fast:200,_default:400},step:{opacity:function(E){o.attr(E.elem.style,"opacity",E.now)},_default:function(E){if(E.elem.style&&E.elem.style[E.prop]!=null){E.elem.style[E.prop]=E.now+E.unit}else{E.elem[E.prop]=E.now}}}});if(document.documentElement.getBoundingClientRect){o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}var G=this[0].getBoundingClientRect(),J=this[0].ownerDocument,F=J.body,E=J.documentElement,L=E.clientTop||F.clientTop||0,K=E.clientLeft||F.clientLeft||0,I=G.top+(self.pageYOffset||o.boxModel&&E.scrollTop||F.scrollTop)-L,H=G.left+(self.pageXOffset||o.boxModel&&E.scrollLeft||F.scrollLeft)-K;return{top:I,left:H}}}else{o.fn.offset=function(){if(!this[0]){return{top:0,left:0}}if(this[0]===this[0].ownerDocument.body){return o.offset.bodyOffset(this[0])}o.offset.initialized||o.offset.initialize();var J=this[0],G=J.offsetParent,F=J,O=J.ownerDocument,M,H=O.documentElement,K=O.body,L=O.defaultView,E=L.getComputedStyle(J,null),N=J.offsetTop,I=J.offsetLeft;while((J=J.parentNode)&&J!==K&&J!==H){M=L.getComputedStyle(J,null);N-=J.scrollTop,I-=J.scrollLeft;if(J===G){N+=J.offsetTop,I+=J.offsetLeft;if(o.offset.doesNotAddBorder&&!(o.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(J.tagName))){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}F=G,G=J.offsetParent}if(o.offset.subtractsBorderForOverflowNotVisible&&M.overflow!=="visible"){N+=parseInt(M.borderTopWidth,10)||0,I+=parseInt(M.borderLeftWidth,10)||0}E=M}if(E.position==="relative"||E.position==="static"){N+=K.offsetTop,I+=K.offsetLeft}if(E.position==="fixed"){N+=Math.max(H.scrollTop,K.scrollTop),I+=Math.max(H.scrollLeft,K.scrollLeft)}return{top:N,left:I}}}o.offset={initialize:function(){if(this.initialized){return}var L=document.body,F=document.createElement("div"),H,G,N,I,M,E,J=L.style.marginTop,K='<div style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;"><div></div></div><table style="position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;" cellpadding="0" cellspacing="0"><tr><td></td></tr></table>';M={position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"};for(E in M){F.style[E]=M[E]}F.innerHTML=K;L.insertBefore(F,L.firstChild);H=F.firstChild,G=H.firstChild,I=H.nextSibling.firstChild.firstChild;this.doesNotAddBorder=(G.offsetTop!==5);this.doesAddBorderForTableAndCells=(I.offsetTop===5);H.style.overflow="hidden",H.style.position="relative";this.subtractsBorderForOverflowNotVisible=(G.offsetTop===-5);L.style.marginTop="1px";this.doesNotIncludeMarginInBodyOffset=(L.offsetTop===0);L.style.marginTop=J;L.removeChild(F);this.initialized=true},bodyOffset:function(E){o.offset.initialized||o.offset.initialize();var G=E.offsetTop,F=E.offsetLeft;if(o.offset.doesNotIncludeMarginInBodyOffset){G+=parseInt(o.curCSS(E,"marginTop",true),10)||0,F+=parseInt(o.curCSS(E,"marginLeft",true),10)||0}return{top:G,left:F}}};o.fn.extend({position:function(){var I=0,H=0,F;if(this[0]){var G=this.offsetParent(),J=this.offset(),E=/^body|html$/i.test(G[0].tagName)?{top:0,left:0}:G.offset();J.top-=j(this,"marginTop");J.left-=j(this,"marginLeft");E.top+=j(G,"borderTopWidth");E.left+=j(G,"borderLeftWidth");F={top:J.top-E.top,left:J.left-E.left}}return F},offsetParent:function(){var E=this[0].offsetParent||document.body;while(E&&(!/^body|html$/i.test(E.tagName)&&o.css(E,"position")=="static")){E=E.offsetParent}return o(E)}});o.each(["Left","Top"],function(F,E){var G="scroll"+E;o.fn[G]=function(H){if(!this[0]){return null}return H!==g?this.each(function(){this==l||this==document?l.scrollTo(!F?H:o(l).scrollLeft(),F?H:o(l).scrollTop()):this[G]=H}):this[0]==l||this[0]==document?self[F?"pageYOffset":"pageXOffset"]||o.boxModel&&document.documentElement[G]||document.body[G]:this[0][G]}});o.each(["Height","Width"],function(I,G){var E=I?"Left":"Top",H=I?"Right":"Bottom",F=G.toLowerCase();o.fn["inner"+G]=function(){return this[0]?o.css(this[0],F,false,"padding"):null};o.fn["outer"+G]=function(K){return this[0]?o.css(this[0],F,false,K?"margin":"border"):null};var J=G.toLowerCase();o.fn[J]=function(K){return this[0]==l?document.compatMode=="CSS1Compat"&&document.documentElement["client"+G]||document.body["client"+G]:this[0]==document?Math.max(document.documentElement["client"+G],document.body["scroll"+G],document.documentElement["scroll"+G],document.body["offset"+G],document.documentElement["offset"+G]):K===g?(this.length?o.css(this[0],J):null):this.css(J,typeof K==="string"?K:K+"px")}})})();
\ No newline at end of file

Copied: trunk/htdocs/js/signup.js (from rev 656, branches/sucs-site/htdocs/js/signup.js)
===================================================================
--- trunk/htdocs/js/signup.js	                        (rev 0)
+++ trunk/htdocs/js/signup.js	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,253 @@
+var validation = {"studentid":false, "username":false, "realname":false, "address":false, "contact":false, "email":false, "phone":false};
+var submitted = false;
+function validate(){
+	var valid = true;
+	for (field in req){
+		if (!validation[req[field]]){
+			valid=false;
+			break;
+		}
+	}
+	if((valid || ($('input#override:checked').size()==1)) && !submitted && ($('input#tnc:checked').size()==1)){
+		$('input#submit').removeAttr("disabled");
+		return true;
+	}
+	else{
+		$('input#submit').attr("disabled","disabled");
+		return false;
+	}
+	
+
+}
+function processPostcode(){
+		// lookup postcode
+                $.getJSON("/signup/ajax",{key: "postcode",value: $('input#postcode').val().replace(/ /g,'')}, function(j){
+			//populate dropdown	
+                        var options = '';
+                        if (j.length > 1) {
+				// make dropdown visible
+                                $('div#addseldiv').removeAttr("style");
+                                for (var i = 0; i < j.length; i++) {
+                                        options += '<option>' + j[i] + '</option>';
+                                }
+                                $("select#addsel").html(options);
+                                $('select#addsel option:first').attr('selected', 'selected');
+                        }
+                        if (j.length == 1) {
+                                $('div#addseldiv').attr("style","display:none");
+                                $("textarea#address").val(j[0].replace(/, /g,'\n'))
+				$('div#addressmessage').attr("style","color:green; float:right; clear:right;");
+				$('div#addressmessage').html("OK");
+				validation["address"]=true;
+				validate();
+                        }
+                })
+}
+
+function lookupSID(setname){
+        $.get("/signup/ajax",{key:"sid" ,value: $('input#studentid').val()},function(j){
+                arr=j.split(":");
+                key=arr.shift();
+                val=arr.join(":");
+                if(key=="OK"){
+			if(setname=true)
+				$("input#realname").val(val);
+                        $('div#studentidmessage').attr("style","color:green; float:right; clear:right;");
+			$('div#studentidmessage').html(key);
+			validation['studentid']=true;
+			processName("realname","realname");
+
+                }
+                else{
+                        $('div#studentidmessage').attr("style","color:red; float:right; clear:right;");
+			$('div#studentidmessage').html(val);
+			validation['email']=false;
+			validate();
+                }
+        },'text')
+}
+function processSID(){
+	lookupSID(true);
+}
+
+function processUsername(){
+        $.get("/signup/ajax",{key: "username", value: $('input#username').val()},function(j){
+                if (j!="OK") {
+                        $('div#usernamemessage').attr("style","color:red; float:right; clear:right;");
+			validation['username']=false;
+                }
+                else{   
+                        $('div#usernamemessage').attr("style","color:green; float:right; clear:right;");
+			validation['username']=true;
+                }
+		$('div#usernamemessage').html(j);
+		validate();
+        },'text')
+}
+
+function processName(type, input){
+        $.get("/signup/ajax",{key: type, value: $('input#'+input).val()},function(j){
+                if (j!="OK") {
+                        $('div#'+input+'message').attr("style","color:red; float:right; clear:right;");
+			validation[input]=false;
+                }
+                else{   
+                        $('div#'+input+'message').attr("style","color:green; float:right; clear:right;");
+			validation[input]=true;
+                }
+		$('div#'+input+'message').html(j);
+		validate();
+        },'text')
+}
+function processContact(){
+	processName('realname','contact');
+}
+
+function processAddress(){
+        $.get("/signup/ajax",{key: "address", value: $('textarea#address').val()},function(j){
+                if (j!="OK") {
+                        $('div#addressmessage').attr("style","color:red; float:right; clear:right;");
+                        validation['address']=false;
+                }   
+                else{   
+                        $('div#addressmessage').attr("style","color:green; float:right; clear:right;");
+                        validation['address']=true;
+                }
+		$('div#addressmessage').html(j);
+		validate();
+        },'text')
+}
+
+function processEmail(){
+        $.get("/signup/ajax",{key: "email", value: $('input#email').val()},function(j){
+                if (j!="OK") {
+                        $('div#emailmessage').attr("style","color:red; float:right; clear:right;");
+			validation['email']=false;
+                }
+                else{   
+                        $('div#emailmessage').attr("style","color:green; float:right; clear:right;");
+			validation['email']=true;
+                }
+		$('div#emailmessage').html(j);
+		validate();
+        },'text')
+}
+
+function processPhone(){
+        $.get("/signup/ajax",{key: "phone", value: $('input#phone').val()},function(j){
+                if (j!="OK") {
+                        $('div#phonemessage').attr("style","color:red; float:right; clear:right;");
+			validation['phone']=false;
+                }
+                else{   
+                        $('div#phonemessage').attr("style","color:green; float:right; clear:right;");
+			validation['phone']=true;
+                }
+		$('div#phonemessage').html(j);
+		validate();
+        },'text')
+}
+
+$(function(){
+	if($('input#studentid').size()==1){
+		usertype=1;
+	}
+	else if($('input#contact').size()==1){
+		usertype=2;
+	}
+	else{
+		usertype=5;
+	}
+        req=new Array("username","realname","email","phone");
+        switch(usertype){
+                case "1":
+                        req.push("studentid","address");
+                        break;
+                case "2":
+                        req.push("contact");
+                        break;
+                case "5":
+                        req.push("address");
+        }
+	//usertype=$('input#usertype').val();
+	$("document").ready(function(){
+		// makes script sutff appear
+		$('div#postcodediv').removeAttr("style");
+		$('input#submit').attr("disabled","disabled");
+		// if the fields are not empty validate them
+		if($('input#username').val()!="") processUsername();
+		if($('input#email').val()!="") processEmail();
+		if($('input#phone').val()!="") processPhone();
+		if(usertype!=2){
+			if($('input#postcode').val()!="") processPostcode();
+			if($('textarea#address').val()!="") processAddress();
+			if($('input#realname').val()!="") processName("realname","realname");
+		}
+		else{
+			if($('input#contact').val()!="") processContact();
+			if($('input#realname').val()!="") processName("socname","realname");
+		}
+		if((usertype==1) && ($('input#studentid').val()!="")){
+			if($('input#realname').val()=="") lookupSID(true);
+			else lookupSID(false);
+		}
+
+		validate();
+	})
+	// dont do address stuff for societies
+	if(usertype!=2){
+	// process postcode when the box changes
+	$("input#postcode").change(processPostcode);
+	
+	//populate the address box when an address is selected
+	$("select#addsel").change(function(){
+		$("textarea#address").val($('select#addsel').val().replace(/, /g,'\n'));
+		$('div#addressmessage').attr("style","color:green; float:right; clear:right;");
+		$('div#addressmessage').html("OK");
+		validation['address']=true;
+	})
+	}
+	//else deal with the contact field
+	else{
+        $("input#contact").change(processContact)
+
+	}
+	//if is a student
+	if(usertype==1){
+	//lookup the real name from the studentid
+	$("input#studentid").change(processSID)
+	}
+	//validate username
+	$("input#username").change(processUsername)
+	//validate personal and society names differntly
+	if(usertype!=2){
+		persoc='realname';
+	}
+	else{
+		persoc='socname';
+	}
+	//validate real name
+	$("input#realname").change(function(){
+		processName(persoc, 'realname');
+	})
+	
+        //validate email address
+        $("input#email").change(processEmail);
+        //validate phone number
+        $("input#phone").change(processPhone);
+	$("textarea#address").change(processAddress);
+	$("input#override").change(validate);
+	$("input#tnc").change(validate);
+	// Disable the submit button once clicked
+	$("form#mainform").submit(function() {
+		var valid = validate();
+		if(valid){
+			// mark form as submitted
+			submitted = true;
+			// disable the submit button
+			$('input#submit').attr("disabled","disabled");
+		}
+		return valid;
+	});
+})
+

Modified: trunk/htdocs/js/tiny_mce.js
===================================================================
--- trunk/htdocs/js/tiny_mce.js	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tiny_mce.js	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,14 +1,14 @@
 tinyMCE.init({
 	mode: "textareas",
-	plugins: "fullscreen",
+	height: "100%",
+	plugins: "safari,fullscreen,inlinepopups",
 	theme: "advanced",
-	theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,sup,sub,separator,bullist,numlist,outdent,indent,separator,undo,redo,link,unlink,anchor,separator,formatselect,separator,charmap,code,fullscreen",
+	theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,styleselect,sup,sub,separator,bullist,numlist,outdent,indent,separator,undo,redo,link,unlink,anchor,image,separator,formatselect,separator,charmap,code,fullscreen",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location: "top",
 	theme_advanced_toolbar_align: "left",
 	content_css: "/css/editor.css",
-	browsers: "msie,gecko,opera",
 	remove_linebreaks : false,
 	convert_urls : false,
 valid_elements : ""
@@ -267,3 +267,4 @@
   +"|onkeyup|onmousedown|onmousemove|onmouseout|onmouseover|onmouseup|style"
   +"|title]"
 })
+

Copied: trunk/htdocs/js/tinymce/changelog (from rev 656, branches/sucs-site/htdocs/js/tinymce/changelog)
===================================================================
--- trunk/htdocs/js/tinymce/changelog	                        (rev 0)
+++ trunk/htdocs/js/tinymce/changelog	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,1045 @@
+Version 2.0.6.1 (2005-05-04)
+	Fixed issue where the layer and style plugins couldn't be added in incorrect order.
+	Fixed issue with Firefox nl not beeing defined in triggerSave correctly.
+Version 2.0.6 (2005-05-03)
+	Added new theme_advanced_source_editor_wrap option, this gives the possibility to force word wrapping.
+	Added new support for using div,blockquote,dt,dd,code,samp as a items in the theme_advanced_blockformats option.
+	Added new strict_loading_mode option, this switches the loading method from document.write to DOM.
+	Added new hidden_tab_class, display_tab_class options for resolving the MSIE image dimension bug.
+	Added new absolute layer support, this was added to a new plugin called layer.
+	Added new CSS style properties support, this was as a plugin called style.
+	Fixed bug where TinyMCE was reporting a warning when inserting a image while running on HTTPS.
+	Fixed bug where pressing the browser back button after submit removed empty paragraphs in MSIE.
+	Fixed bug where links the the same page as the editor page was converted into a /.
+	Fixed bug where the getSelectedHTML method was returning undefined when selecting controls in MSIE.
+	Fixed bug with unterminated string literal errors where reported in some browsers.
+	Fixed bug where src and href where converted into xsrc and xhref in text.
+	Fixed bug where two characters where removed by backspace sometimes in Gecko.
+	Fixed bug where class drop list wasn't visible in some of the table dialogs.
+	Fixed bug where br elements where incorrectly removed within paragraphs on backspace.
+	Fixed bug where drag/drop operations failed in MSIE when editor height was set to a % value.
+	Fixed bug where width/height was lost on images if they where placed in hidden tabs in MSIE.
+	Fixed bugs with CSS auto import parsing, contributed by Scott Eade.
+	Fixed compatiblity issues with MSIE 5.0. Some RegExps needed to be rewritten.
+	Fixed issue that made it impossible to remove the entity code/name for '.
+	Fixed issue with odd <br></br> elements not beeing handled properly.
+	Fixed issue where TinyMCE couldn't be loaded in a XML document.
+	Fixed issue with contextmenu beeing placed outside of visible area on Gecko browsers.
+	Fixed issue whith area tag not being closed.
+Version 2.0.5.1 (2005-03-22)
+	Fixed bug where emtpy paragraphs sometimes got removed in MSIE.
+	Fixed bug where autosave plugin was running even in fullscreen mode.
+	Fixed bug where browse and color image button urls in form_utils.js where hardcoded.
+Version 2.0.5 (2005-03-21)
+	Added API docs for the TinyMCE_Popup class that is used by all dialogs in TinyMCE.
+	Added new TinyMCE_Layer class to the core of TinyMCE plugins will be using this later on.
+	Added new loadPlugin function, use this to load external plugins.
+	Added instructions on how to contribute language packs.
+	Added new support for multiple content_css files, based on contribution by Man-Chicken.
+	Added new table_cell_limit, table_row_limit, table_col_limit options, based on contribution by Man-Chicken.
+	Added new fix_list_elements option, if this is set to true UL/OL lists will be forced XHTML valid on cleanup.
+	Added new fix_table_elements, if this is set to true tables will be moved outside paragraphs.
+	Fixed so input and button as closed elements in the cleanup logic.
+	Fixed so the mceButtonSelected is more visible with darker background in the editor_ui.css.
+	Fixed issue where charmap.js was calling switchClass that's reserved for buttons.
+	Fixed issue where the directionality option wasn't used in the preview plugin.
+	Fixed issues with nestled bullet lists pasted from Word 2003.
+	Fixed bug where button wasn't selected correctly in MSIE due to a CSS issue.
+	Fixed bug where ask mode wasn't working on DIV elements in Firefox and Opera.
+	Fixed bug where the mceAddFrameControl command wasn't working correctly.
+	Fixed bug where language packs wasn't imported correctly in plugins loaded externaly.
+	Fixed bug where focusing external input elements was visible in element path under MSIE.
+	Fixed bug where fullscreen plugin wasn't opening the window fullscreen in Firefox.
+	Fixed bug where style select dropdown wasn't working in Firefox when used in fullscreen mode.
+	Fixed bug where the fix_content_duplication wasn't working anymore.
+	Fixed bug where MSIE sometimes generated empty paragraphs.
+	Fixed bug where MSIE sometimes generated tags like <//tag>.
+	Fixed bug where the directionality option produced a error for the color picker dialog.
+	Fixed bug where configured callback options wasn't executed correctly in fullscreen mode.
+	Fixed bug where tags got generated as <*> some times in Gecko.
+	Fixed bug where the cursor was placed within a the anchor when inserting a new one in Gecko.
+	Fixed bug where convert_fonts_to_span option wasn't working correctly with new cleanup engine.
+	Fixed various language pack issues such as invalid characters.
+	Fixed naming conflict with zoom plugin and the format select box.
+	Fixed so that the initialization of the editor is slightly faster.
+	Removed all language packs except the english one from the core package. [BREAKS COMPATIBLITY]
+Version 2.0.4 (2006-02-24)
+	Fixed bug where fullscreen plugin was using the tinymce_dev.js script.
+	Fixed bug where events where having a return true; statement infront of them.
+	Fixed bug where theme_advanced_toolbar_location option wasn't working.
+	Fixed bug where select lists wasn't working if you touched them with the tab key.
+	Fixed bug where auto reset design mode wasn't working correctly.
+	Fixed bug where null was inserted in paste button action in MSIE.
+	Fixed bug where _template plugin had a , instead of . character on e.type.
+	Fixed bug where src, href where replaced to xsrc and xhref in comments.
+	Fixed bug where paste_cleanup_on_paste option wasn't working correctly with the paste plugin.
+	Fixed bug where MSIE was reporting an error when TinyMCE was placed in a frame and not focused.
+	Fixed bug where clipboard_msg wasn't entity decoded corectly before displaying it in confirm box.
+	Fixed bug where mceRemoveControl wasn't working correctly on DIV elements.
+	Fixed bug where mceInsertContent/mceReplaceContent produced error when a empty string was inserted.
+	Fixed so the default valid_elements option is more XHTML valid.
+	Fixed issue where style formatting wasn't handled when pasting content from Word.
+	Fixed issue where ' characters wasn't entity encoded, they are now encoded into ' and not '.
+	Fixed issue with empty paragraphs, these are now filled with &nsbp; if they are empty.
+	Added documentation on how the # prefix can be used in the valid_elements option.
+	Added new options paste_remove_styles and paste_remove_spans to paste plugin.
+	Added possibility to have empty default attributes values.
+Version 2.0.3 (2006-02-13)
+	Added missing buttons to button reference page in documentation.
+	Added dt,dl,dd elements to default_valid elements config value.
+	Added new support for self registrering plugins.
+	Added new callback for themes and plugins handleEvent and the handle_event_callback option.
+	Added new execcommand_callback option, this enables you to add custom execcommand logic on page level.
+	Added new custom_shortcuts option, this enables you to disable plugin/theme specific keyboard shortcuts.
+	Added new addShortcut to TinyMCE_Control, this enables plugin to register custom keyboard shortcuts.
+	Added new getButtonHTML function to TinyMCE core, this function makes it easier for plugins/themes to make buttons.
+	Added more documentation on how to write plugins and updated the _template plugin.
+	Added more documentation on how to write custom themes.
+	Fixed so the default window size of the source editor is larger in the advanced theme.
+	Fixed so all internal plugins use the new auto registration and separation logic.
+	Fixed so all internal themes use the new auto registration and separation logic.
+	Fixed so the Safari warning is switched off by default.
+	Fixed so cursor position isn't moved when performing a cleanup.
+	Fixed so cursor position is correct when performing undo/redo actions.
+	Fixed so all themes/plugins now use a:hover to produce the mouse over button effect.
+	Fixed so it uses the DOMContentLoaded and onreadystatechange instead of onload.
+	Fixed so the simple theme also supports the button_tile_map option.
+	Fixed so the selection/cursor is moved to the beginning of area on search/replace.
+	Fixed callback handling to reduce logic, improve performance and flexibility.
+	Fixed documentarion error for the paste plugin, contributed by Jochen Metzger.
+	Fixed bug that made the cleanup process to hang MSIE on specific content.
+	Fixed bug with absolute to relative URL convertion logic if the absolute URL didn't have a path.
+	Fixed bug where about.htm in advanced theme refered to a non existing css file.
+	Fixed bug with defParam and the event_elements option.
+	Fixed bug where fullscreen plugin wasn't correctly setup with editor contents.
+	Fixed bug where paste/drop converted relative URLs incorrectly in MSIE.
+	Fixed bug with inlinepopups not restoring selection on close window in MSIE.
+	Fixed bug where selection was lost when a new column/row was inserted in a table running in Gecko.
+	Fixed bug where save plugin wasn't working in fullscreen mode.
+	Fixed bug where fullscreen plugin wasn't working in Opera.
+	Fixed bug where editor resizing in advanced theme wasn't working in Opera.
+	Fixed bug where cursor position was placed at the end of instance on word paste.
+	Fixed bug where a tinyMCE is undefined error was reported in Firefox.
+	Fixed compatiblity issues with new cleanup plugin and the prototype.js library.
+	Renamed the mceItemEditable/mceItemNonEditable to mceEditable/mceNonEditable.
+	Renamed the TinyMCEControl class to TinyMCE_Control, TinyMCE_ is the valid class prefix.
+	Removed the getInsertLinkTemplate and getInsertImageTemplate functions from themes and from API.
+	Removed insertImage and insertLink from TinyMCE core, they are moved to the advanced theme.
+	Removed opacity workaround made for Opera Preview 1, download Opera Preview 2 instead.
+	Removed search backward function from replace dialog since it could result in a infinite loop.
+	Marked insertlink_callback, insertimage_callback options as deprecated these can be replaced with execcommand_callback.
+	Moved selection specific methods to a new class. For example inst.selectNode is now inst.selection.selectNode.
+	Updated German language pack, contributed by Ace Man.
+Version 2.0.2 (2006-01-24)
+	Added updated Danish language pack contributed by Jan Moelgaard, John Dalsgaard and Bo Frederiksen.
+	Added updated Czech language pack contributed by michi aka mishal.
+	Added new Slovenian language pack contributed by Domen Kosir.
+	Added new Turkish language pack contributed by Engin Dumlu.
+	Added new save_onsavecallback option to the save plugin, this function is called on save.
+	Added new save_enablewhendirty option to the save plugin, this will disable the button until changes are made.
+	Added new onpageload callback event, this event is called when the page is loaded but before instances are made.
+	Added new accessibility_focus option, this enables you to control if buttons should be tab focusable or not.
+	Added new greek alpha character to charmap dialog.
+	Added new Scaron,scaron,Alpha entities to the default value of the entities option thanks to Kevin Rodgers.
+	Added new contextmenu items link.unlink,advhr contributed by Speednet.
+	Added new paste_insert_word_content_callback option for the paste plugin.
+	Added new cleanup plugin, this will replace the one inside the core ones it's considered stable.
+	Added cancel button to color picker contributed by Speednet.
+	Fixed various documentation errors and typos, modified the FAQ.
+	Fixed issue where the first handleNodeChange call was done to early in initialization.
+	Fixed issue with Dutch language pack for advlink plugin.
+	Fixed issue where dialogs was to short when dialog_type option was set to modal in MSIE.
+	Fixed bug where insert image under Gecko resulted in a broken image if it was inserted a the beginning of a element.
+	Fixed bug where mceVisualAid class wasn't removed from TH elements on save.
+	Fixed bug where the href attribute area elements gets converted to xhref.
+	Fixed bug with document relative anchors being forced absolute even when the convert_urls was set to false.
+	Fixed bug where some plugins produced &gr; intead of > entities on string encoding.
+	Fixed bug where some characters in charmap dialog was double encoded in Firefox/Gecko.
+	Fixed bug with XML core entities wasn't encoded when using raw or numeric value in entity_encoding option.
+	Fixed bug where classes was removed from table,td,th elements when the verify_css_classes option was enabled.
+	Fixed bug where elements was getting a visual aid class if a default or force class attribute value rule was used.
+	Fixed bug where strong/em rules didn't handle the -/+ prefixes correctly under Firefox/Mozilla.
+	Fixed bug where non textarea elements didn't work when submiting content.
+	Fixed bug where a access denied error was produced when using contextmenu together with modal dialogs under MSIE.
+	Fixed bug where fullscreen plugin didn't call custom cleanup functions when passing content back and forth.
+	Fixed issue where default rule for font tags didn't have a + prefix in valid_elements.
+	Fixed issue with CSS where "arrow" was used instead of "default" for cursor replacement.
+	Fixed issue where the replace button replaced the current selection first time it was used.
+	Fixed issue with missing title for the advhr dialog.
+	Fixed issue with div not beeing usable in the theme_advanced_blockformats option.
+	Fixed issue in with translation in the German language pack.
+	Fixed so the word wrap toggle for source view functions in Firefox/Mozilla.
+	Fixed so title attribute of emotion images gets inserted aswell as alt.
+	Fixed so the insert return on popups is checked by default in advlink.
+	Fixed so url gets filled when empty if a user selects a popup url.
+	Fixed so some init settings gets trimmed from whitespace.
+	Fixed so charmap closes when a char is selected since most of the time users only need one char.
+	Fixed so the link and image dialogs of advanced theme are styled with the new 2.x layout.
+	Fixed accessibility issuew with the link, image and advhr dialogs.
+	Fixed so the advhr dialog uses the new 2.x layout.
+	Fixed XHTML compliance for Preview plugin contributed by Bo Frederiksen.
+	Fixed entity decoding problem with insert button of the advhr plugin contributed by Bo Frederiksen.
+Version 2.0.1 (2005-12-02)
+	Fixed critical bug in some MSIE versions when submiting content.
+Version 2.0 (2005-12-01)
+	Added new paste_replace_list option to the paste plugin, this replaces some MS specific characters into normal characters.
+	Added new convert_urls option, this was required to address some issues with Firefox 1.5.
+	Added new paste_create_linebreaks option to paste plugin contributed by Kevin Rodgers.
+	Added new advimage_update_dimensions_onchange option to advimage plugin, this is enabled by default.
+	Added new table_inline_editing option, this enables you to toggle the inline table editing controls in FF 1.5.
+	Added new object_resizing option, this enables you to toggle the resizing controls of table and images in FF 1.5.
+	Added updated simplified Chinese language pack contributed by Wang Yang (tom_cat).
+	Added updated Dutch language pack contributed by Mark van der Sanden.
+	Added updated French language pack contributed by Normand Lamoureux.
+	Added updated Polish language pack contributed by Wooya.
+	Added updated Brazilian Portuguese language pack contributed by Marcio Barbosa.
+	Added new Traditional Chinese language pack contributed by Twapweb.
+	Added new Slovak language pack contributed by Vladimir VASIL.
+	Added new Norwegian Nynorsk pack contributed by Knut B. Jacobsen.
+	Fixed bug where getting init settings in handleNodeChange callback wasn't working correctly when multiple configs where used.
+	Fixed bug with urls being converted into incorrect values in Firefox 1.5.
+	Fixed bug where editor and cursor was flickering when TinyMCE was placed in a hidden div in Firefox 1.5.
+	Fixed bug with missing parenthesis in a MSIE setInnerHTML call.
+	Fixed bug where MSIE was producing a "Invalid source HTML for this operation" javascript error when placed in P tags.
+	Fixed bug where some styles with RGB values was parsed/serialized incorrectly in Firefox/Mozilla.
+	Fixed bug where reset form action didn't reset all editor instances to their original values.
+	Fixed bug where a javascript exception whas thrown when the editor was resized to a negative value in MSIE.
+	Fixed bug where inserting custom characters or date/time within a font element removed formatting in Firefox/Mozilla.
+	Fixed bug where image urls was inserted incorrectly if relative_urls was set to false due to issues with inserthtml command.
+	Fixed bug where encoding option wasn't working correctly becurse the entities list wasn't initialized.
+	Fixed bug where MSIE removed the first comment from the HTML of a mceInsertContent call.
+	Fixed bug where update all cells in table/row wasn't working on some tables with lots of whitespace.
+	Fixed bug with td background attribute when inline_styles option was set to true in MSIE.
+	Fixed bug where forms submitted with accesskey or return produced a JS error in Firefox 1.5.
+	Fixed bug with URL convertion logic not converting paths correctly to relative/absolute URLs.
+	Fixed bug where inline_styles option and flash moviews produced strange results.
+	Fixed bug where tabs and links where opened in a new window in MSIE when dialog_type option was set to modal.
+	Fixed bug where dialogs didn't open in Opera if the dialog_type option was set to modal.
+	Fixed bug where the table plugin wasn't working with the inlinepopups plugin while running in MSIE.
+	Fixed bug where embed elements whasn't parsed correctly by the flash plugin if no object tag was surrounding it.
+	Fixed bug where contents wasn't stored/restored when using the browser back button in Firefox 1.5.
+	Fixed issue where the ghost resize handles in Firefox/Mozilla was appearing when resizing images/tables.
+	Fixed issue with constrain proportions feature in advimage plugin, when trying to reset the values to blank.
+	Fixed issue where inlinepopups option couldn't be enabled/disabled on individual instances.
+	Fixed issue where TDs was created instead of TH elements when inserting a column on a row with TH elements.
+	Fixed issue with editor_selector/editor_deselector options couldn't be used when mode was specific_textareas.
+	Fixed issue where font selection produced null face attributes in MSIE.
+	Fixed issue where document local anchors where prefixed with the document name.
+	Fixed issue where link/image dialogs of the advanced theme didn't open using inlinepopups when enabled.
+	Fixed so the CSS select list gets hidden in the link dialog in advanced theme if there isn't any CSS classes.
+	Fixed so that the onsubmit handler of a form was processed correctly when posting using the save plugin.
+	Fixed so TinyMCE makes some very simple cleanups even if cleanup option is set to false.
+	Fixed so alignment button gifs have the justify prefix, such as justifyleft, for compatiblity with Drupal.
+	Fixed compatiblity issues with the .NET version of TinyMCE Compressor.
+	Fixed performance issue with fullscreen plugin, it switches back to normal view a lot faster now.
+	Fixed issues with mceSelectList class in advanced theme and compressed it some.
+	Renamed the Norwegian language pack from no to nb since it's "Norwegian Bokmål".
+Version 2.0RC4 (2005-10-30)
+	Fixed bug with font face/size/color wasn't working correctly in Firefox 1.5b1.
+	Fixed bug where all actions where dispatching the onbeforeunload event.
+	Fixed bug where buttons in fullscreen mode wasn't working in MSIE.
+	Fixed bug where style removal with drop list wasn't working correctly.
+	Fixed bug where element path list or return key some times didn't scroll to the right location.
+	Fixed bug where return key in Firefox/Mozilla some times produced a error.
+	Fixed bug where MSIE was presenting a alert box about insecure items when running TinyMCE over HTTPS.
+	Fixed bug where TR/TD elements width/height attributes produced a JS error on cleanup.
+	Fixed bug where Polish Ctrl+Alt+Z executed the undo function instead of inserting national character.
+	Fixed bug where editor couldn't be initialized if no rows or height where specified on a textarea.
+	Fixed bug where comments sometimes got removed from HTML code.
+	Fixed bug with advimage not inserting onmouseover attribute correctly.
+	Fixed bug where anchors with child nodes messed up list elements.
+	Fixed bug where apply_source_formatting option wasn't working when used together with remove_linebreaks.
+	Fixed bug where empty paragraphs where invisible in Firefox. These are now padded with a  .
+	Fixed bug where tables without a border attribute didn't get visual aid borders until cleanup.
+	Fixed bug with URL convertion, absolute URLs to the same domain without trailing slash produced incorrect results.
+	Fixed bug with URL convertion of urls like this somedir/?id=3 produced somedir?id=3.
+	Fixed bug with weird cursor movement when pressing return/enter in a list when running on Firefox/Mozilla.
+	Fixed bug where contents where deleted sometimes when user pressed return/enter running on Firefox/Mozilla.
+	Fixed bug where style elements what generated empty in MSIE, but using style tags is not recommended.
+	Fixed bug with not beeing able to have absolute urls in the external_link_list_url and simmilar.
+	Fixed bug with bold, italic, underline, strikethrough buttons not beeing selected correctly.
+	Fixed bug with font size and font face select list not beeing selected correctly.
+	Fixed bug where document anchors was incorrectly converted if document_base_url was defined.
+	Fixed bug where changing border width/color of a table didn't update CSS styles correcty.
+	Fixed bug where emotions plugin didn't insert a new smiley the second time you insert one.
+	Fixed bug with blockquote command produced javascript error when used on lists in MSIE.
+	Fixed bug with cleanup converting flash elements to images.
+	Fixed bug where class wasn't selected in drop list of advlink/advimage dialogs when editing links/images.
+	Fixed bug where cellpadding/cellspacing/scope wasn't correctly handled in MSIE 5.5SP2.
+	Fixed bug where hreflang,charset and type attributes wasn't returned correctly in MSIE 5.5SP2.
+	Fixed bug with broken image URLs when user clicked the cleanup button in Firefox 1.5b2.
+	Fixed some compatiblity issues with call to createStyleSheet and event.target setup.
+	Fixed more compatiblity issues with scripts extending core JS logic such as the Array class.
+	Fixed issue where paragraphs wasn't generated if user pressed returned inside a H1-H6 running on Firefox/Mozilla.
+	Fixed issue with context menu plugin messing up some onclick events.
+	Fixed issue with missing </tbody> HTML in advanced theme.
+	Fixed issue with Finnish language pack, it wasn't working at all.
+	Fixed issue where button control styles needed to be overriden in default editor_ui.css.
+	Fixed issue with a broken link in the documentation to the theme_advanced_resize_horizontal option.
+	Fixed issue with missing var declaration of a buttons variable in the advanced theme.
+	Fixed issue with missing block elements in block element regexp.
+	Fixed issue where advhr plugin didn't produce valid attribute for noshade.
+	Fixed issue with misslabeled option, plaintext_create_paragraphs is renamed to paste_create_paragraphs.
+	Fixed issue where remove_script_host and relative_urls where treated as true if they where specified as strings.
+	Fixed issue with charmap, made it easier to select/click characters.
+	Fixed issue with search/replace dialogs not being refocused in MSIE.
+	Fixed issues with dialogs being to small if large class names where added. Made sure they can grow.
+	Fixed issues with some dialogs being to small in NS 7.2 and not working correctly in NS 7.1.
+	Fixed missing HEAD element in fullscreen.htm file, contributed by monkeybrain.
+	Fixed some HTML issues with the advhr plugin, contributed by monkeybrain.
+	Fixed some small issues with the span element rule of the XHTML rule set in valid_elements documentation.
+	Added new Opera 9 support, most of the functions is working in the prerelease of Opera 9.
+	Added new paste_strip_class_attributes option to paste plugin, contributed by monkeybrain.
+	Added new merge_styles_invalid_parents option, allows users to control what elements gets styles.
+	Added new theme_advanced_resizing_use_cookie option, this enables you to disable the cookie used by resize.
+	Added new function that converts all font elements to span elements when the editor loads.
+	Added new force_hex_style_colors option, enables you to control the color format of CSS styles.
+	Added new convert_fonts_to_spans option, this option converts fonts to span elements.
+	Added new font_size_classes option, this option is used together with convert_fonts_to_spans.
+	Added new doctype option, enables you to control the internal doctype declaration.
+	Added new event_elements option contributed by happy_noodle_boy.
+	Added new path tooltips for font, span and flash elements such as color, font-family, src and so forth.
+	Added trim_span_elements back again, this option removes unneeded span elements.
+	Added documentation of the apply_source_formatting option.
+	Added updated Danish language pack, contributed by Jan Moelgaard.
+	Added updated Hebrew language pack, contributed by Liron Newman.
+	Added updated Russian language pack, contributed by Vladimir Vitkovsky.
+	Added updated Finnish language pack, contributed by Tuomo Aura.
+	Added updated Spanish language pack, contributed by Adolfo Sanz De Diego.
+	Added updated Italian language pack, contributed by grueff.
+	Added updated Icelandic language pack, contributed by Johannes Birgir Jensson.
+	Removed option convert_fonts_to_styles due to various compatiblity issues. Use convert_fonts_to_spans instead.
+Version 2.0RC3 (2005-09-26)
+	Fixed bug where colorpicker in table plugin wasn't working in Mozilla/Firefox.
+	Fixed bug where closed anchors produced strange results. Anchors are now forced open.
+	Fixed bug where the font style/color functions wasn't producing correct results.
+	Fixed bug where buttons not working if a target was defined in head element.
+	Fixed bug where paragraphs wasn't generated when pressing return/enter in a floating div.
+	Fixed bug where anchor contents was getting lost, contents of anchors are now placed behind them.
+	Fixed bug where style info such font size/face/color was removing parent elements such as LI.
+	Fixed bug where %I wasn't inserting correct hour in the insertdatetime plugin.
+	Fixed bug where MSIE sometimes doesn't output attributes correctly, contributed by Luke Bennett.
+	Fixed bug where images was lost if the user pressed return after a image in a TD on FF.
+	Fixed bug where empty non block elements where produced when hitting return in Gecko browsers.
+	Fixed bug where it was impossible to update tables.
+	Fixed various bugs and issues with removeformatting function it will now remove classes and styles.
+	Fixed compatiblity issues with prototype.js and other scripts that modifies the Object.prototype.
+	Fixed issue where a unnecessary dir and style attribute was generated on the blockquote command in MSIE.
+	Fixed issue with access denied error if page contained iframes with external URLs.
+	Fixed issue where the plugin links in about dialog was linking to blank.
+	Fixed issue with useCSS command not working in Deer park beta.
+	Fixed XHTML table compatiblity issues. Placed bordercolor and height in styles instead of attributes.
+	Fixed issue with tables getting empty summary attribute in MSIE.
+	Fixes so the insert custom character dialog is accessible through keyboard.
+	Removed _self as the default target for links inorder to produce more XHTML compliant code.
+	Removed bordercolor field from table row properties dialog since this is not a valid attribute.
+	Added accessibility warnings to image and table plugin. These can be disabled by the accessibility_warnings option.
+	Added updated Danish language pack, contributed by Jan Moelgaard.
+	Added updated Hebrew language pack, contributed by Liron Newman.
+	Added updated Norwegian language pack, contributed by Knut B. Jacobsen.
+	Added updated German language pack, contributed by salzbermat.
+Version 2.0RC2 (2005-09-12)
+	Fixed bug with plugin tab in about dialog not working in MSIE 5.01.
+	Fixed bug issues with paste and noneditable plugin in MSIE 5.01.
+	Fixed bug where dialogs in the search/replace plugin was to small.
+	Fixed bug where about dialog sometimes produced unknown runtime error in MSIE.
+	Fixed bug where é and í characters was converted the wrong entities.
+	Fixed bug where it was possible to click on the disabled link icon when nothing was selected.
+	Fixed bug where autosave plugin wasn't working with JS submit calls or the save plugin.
+	Fixed bug where file/image browser wasn't working with the default link/image dialogs.
+	Fixed bug where style attributes where parsed/serialized incorrectly when using - and #.
+	Fixed bug where inline popups plugin wasn't working when loading the compressed JS files.
+	Fixed bug with contextmenu showing theme image dialog instead of advimage dialog.
+	Fixed bug with flash plugin trying to include a empty external list JS file.
+	Fixed bug with some fields beeing to short if the file browser was disabled.
+	Fixed bug where contextmenu wasn't recognizing flash elements.
+	Fixed bug where border styles on images and tables was removed.
+	Fixed accessibility issue with colorpicker, added titles and keyboard access.
+	Fixed accessibility issue with toolbar buttons, all toolbar buttons are now wrapped in links.
+	Fixed accessibility issue width browse buttons, these are now wrapped in links.
+	Fixed accessibility issue with select lists, all select lists has now keyboard access.
+	Fixed accessibility issues with missing labels in various dialogs.
+	Fixed accessibility issue with the emotions plugin, this one now inserts a alt text for smileys.
+	Fixed accessibility issue with the locationbar, menubar and so fort in advlink plugin.
+	Fixed accessibility issue with TOC in english help pages. This is not wrapped in a acronym element.
+	Fixed issue with the directionality plugin. It will now get disabled on invalid elements.
+	Fixed issue where popups was the wrong size a new resizeToInnerSize function resizes popups to the correct size.
+	Fixed so empty <a> elements gets removed since they serve no purpose.
+	Added support for TinyMCE grabbing text from input elements if specified in exact mode.
+	Added language specific relative popup width/heights to all build in dialogs.
+	Added missing browser for popup url in advlink plugin.
+	Added missing delete table icon to context menu.
+	Added so it's possible to see the target value in the target select dropdown in the advlink plugin.
+	Updated the documentation to include information about the new language packs.
+	Updated the swedish language pack.
+Version 2.0RC1 (2005-09-06)
+	Renamed CSS classes mcePathTop,mcePathBottom,mcePath to mceStatusbarTop,mceStatusbarBottom,mceStatusbar. [BREAKS COMPATIBLITY].
+	Moved all theme CSS files to a css directory within the theme. [BREAKS COMPATIBLITY].
+	Removed the default theme since the advanced theme can be configured to be as the default theme. [BREAKS COMPATIBLITY].
+	Removed closeDialog method from TinyMCE use tinyMCEPopup.close(); instead of tinyMCE.closeDialog();. [BREAKS COMPATIBLITY].
+	Removed the auto_cleanup_word option, since the paste plugin now handles this better than the build in function.
+	Added improved undo/redo and onchange handling. All modifications are now undo/redo:able.
+	Added new mceBeginUndoLevel/mceEndUndoLevel commands. Used to begin/end a undo/redo:able action.
+	Added new link dialog with tab interface and lots of new fields and options.
+	Added new image dialog with tab interface and lots of new fields and options.
+	Added new about dialog with tab interface, this one replaces the old help dialog.
+	Added new table dialogs with tab interface and lots of new fileds and options.
+	Added new utils directory in tiny_mce script dir. This directory contains various utility classes.
+	Added new TinyMCEPopup class to tiny_mce_popup.js, used for common popup logic.
+	Added new inlinepopups plugin, this makes the popup windows to open as DHTML windows (divs).
+	Added new version info constants to TinyMCE (majorVersion, minorVersion, releaseDate).
+	Added new resizing functionality to the advanced theme, the editor instance can now be resized.
+	Added new theme_advanced_resizing option, enables/disables the new resizing functionality.
+	Added new theme_advanced_resize_horizontal option, enables/disables the horizontal resizing.
+	Added new theme_advanced_path option, enables/disables the element path functionality in statusbar.
+	Added new compressed icons about 1/3 of the original size, contributed by Jozef.
+	Added new center support of images, images are now wrapped in a div with alignment.
+	Added new - character to the valid_elements/extended_valid_elements options this feature removes empty elements.
+	Added new setup_content_dom and submit_content types to custom cleanup callbacks.
+	Added new inst parameter to custom cleanup callbacks, this is a reference to the editor instance.
+	Added new mceColorPicker command to the advanced theme, enables the possibility invoke the color picker.
+	Added new safari_warning option, this enables you to disable the alert that gets presented when running on Safari.
+	Added new editor_selector/editor_deselector options that enables you to specify a include/exclude from convertion class.
+	Added new tinyMCE.addToLang function to reduce the overall size of the language files.
+	Added new auto save plugin. This plugin will confirm that the user want's the leave any modifications unsaved.
+	Added new noneditable plugin. This plugin enables you to disable/enable the possibility to edit various elements.
+	Added new word example, to better illustrate how TinyMCE is to be used when pasting content from Office/Word.
+	Added missing entities eactute,iacute,oacute,uacute,Aacute,Eacute,Iacute,Oacute,Uacute,Yacute,Aacute.
+	Added updated Hebrew language pack contributed by Liron Newman.
+	Added visual aid icon for invisible anchors elements.
+	Added new insert table and delete table commands to context menu.
+	Added new convert_fonts_to_styles option, this option controls if font or span will be used when using font size, color etc.
+	Renamed the theme_advanced_path_location to theme_advanced_statusbar_location.
+	Moved all popup javascript logic into external .js files, inorder to separate presentation and logic.
+	Removed the automatic resizing of popups. Better to use relative window sizes for each language when opening a dialog.
+	Fixed issue where the character map dialog lost focus when inserting a char.
+	Fixed issue where the attribute values where not XML encoded correctly. For example: & will be &.
+	Fixed performance issue with the table plugin, it was executing logic even when it was inactive.
+	Fixed so the directionality gets inherited by all popups/dialogs.
+	Fixed so the CSS file content_css loads after the theme content CSS, user specific CSS extends theme CSS.
+	Fixed so more than 3 toolbar rows may be added in when using the default simple layout.
+	Fixed so the insertdatetime plugin polls it's default date formats from the language pack.
+	Fixes so auto_reset_designmode is enabled by default, to avoid the question about the editor not working in tabs.
+	Fixed better inline styles support for images and tables.
+	Fixed duplicate IDs on advanced theme with external toolbar, contributed by Miguel Fortea.
+	Fixed issue with remove formatting under MSIE, if all contents of a element is selected the element is also selected.
+	Fixed issue with visual aids not being removed from content when cleanup is disabled. But it's NOT recommended to disable the cleanup.
+	Fixed bug where return/enter key sometimes produced empty elements in MSIE.
+	Fixed bug where link list was generated twice in the advanced themes link dialog.
+	Fixed bug issue where embed was converted in to ibed due to some invalid regexps.
+	Fixed bug where summary attribute on tables got lost in MSIE.
+	Fixed bug where the editor scrolled to the top of content when the pasting text with the paste plugin.
+	Fixed bug where external toolbar wasn't translated, contributed by Miguel Fortea.
+	Fixed bug where the editor had a incorrect height, contributed by Miguel Fortea.
+	Fixed bug where visual aid class where presented in element path.
+	Fixed bug where HR elements with a id set to "null" produced runtime error in MSIE.
+	Fixed bug where isDirty wasn't working due to the same function name and variable name.
+	Fixed bug where events like onclick wasn't removed/stored correctly in old MSIE.
+Version 1.45 (2005-06-23)
+	Fixed so the newdocument button shows again, was removed by accident in RC2.
+	Fixed so styles drop down in link dialog gets hidden if no classes are defined.
+	Fixed bug where Paste command in context menu wasn't working.
+	Fixed bug issue with not having a base href element in preview plugin.
+	Fixed bug where input elements produced double type/value attributes in MSIE.
+	Fixed so the check for empty contents in cleanup handled uppercase elements.
+	Added a alert box is a popup is blocked by a popup blocker.
+	Added updated dutch language pack, contributed by Fred Stuurman.
+	Added a confirm dialog for the newdocument action.
+	Added mceContentBody class to the iframe document body.
+	Added allowtransparency attribute to iframe.
+	Added fix where some HTML content produced runtime error in MSIE.
+	Added a lot better Safari support, but many things are still very buggy.
+	Added flash_wmode, flash_quality and flash_menu options for the flash plugin.
+	Added new dialog_type option, this enables you to switch back to modal dialogs in MSIE.
+	Updated Canadian French table language pack contributed by Virtuelcom.
+	Fixed some minor issues with Simplified Chinese language pack.
+	Re-added Tahoma font to font drop list, was removed in previous version.
+Version 1.45 RC2 (2005-06-15)
+	Fixed bug where paste_use_dialog option for the paste plugin wasn't working correctly.
+	Fixed bug issue with setContent not calling custom cleanups correctly. Inflicts the Flash plugin.
+	Fixed bug where external_link_list_url/external_image_list_url in fullscreen mode.
+	Fixed so TinyMCE doesn't use modal dialogs on MSIE, these where giving some problems with for example lost sessions.
+	Fixed the auto resize function for popups to use new logic.
+	Fixed so callback functions gets called correctly from fullscreen mode.
+	Fixed misspelled language pack for canadian french in the advimage plugin.
+	Fixed so openWindow can open use absolute URL:s.
+	Fixed bug issue where auto_cleanup_word sometimes didn't work in MSIE.
+	Fixed bug issue where the close button in dialogs wasn't available on Firefox on MacOSX.
+	Added new pastetext icon contributed by speednet.
+	Added new browsers option that enables you to specify what browsers is to be WYSIWYG enabled or not.
+	Added partial Catalan translation contributed by Marc Bria Ramírez.
+	Added portuguese Brazil translation contributed by João Borges.
+	Added updated Simplified Chinese language pack contributed by cube316.
+	Added beforeunload handler for fullscreen plugin so contents gets updated when the window is closed.
+	Added a new fullscreen_settings option for the fullscreen plugin contributed by David Glick.
+	Added new insert table command to context menu when user clicks within a table.
+	Added new advimage_constrain_proportions option to advimage plugin, contributed by Knut B. Jacobsen.
+	Added updated advanced theme with a new external toolbar location option, contributed by Man-Chicken (http://www.zoomshare.com/).
+	Added new tiny_mce_gzip.php file, this PHP script merges and compressed the requested .js files to improve loading times.
+	Added updated czech language pack, contributed by Stanislav Lacko.
+	Added new mceRemoveNode command, this command removes a node and inserts the node contents instead.
+	Added new behavior to format select box, you can now remove a paragraph by selecting -- Format --.
+	Removed ?rnd from external_link_list_url/external_image_list_url since it doesn't work well with serverside scripts.
+Version 1.45 RC1 (2005-05-27)
+	Fixed bug where character map inserted & and </> when using & < >.
+	Fixed so paragraphs containing   is converted to numeric or raw if entity_encoding is set.
+	Fixed bug in searchreplace plugin when user tried to search on a empty string or the editor contents was empty.
+	Fixed repaint/trail graphics issues with images and tables in FF/Mozilla.
+	Fixed some memory leaks in TinyMCE core and context menu plugin, only MSIE was inflicted by this.
+	Fixed stange issue where elements sometimes disappeared in MSIE.
+	Fixed URL convertion problems with onmouseover, onmouseout image urls in advimage plugin.
+	Fixed URL convertion problems with Flash plugin.
+	Fixed the experimental Safari support, some features work some doesn't.
+	Fixed bug where multiple a elements where created when updating links on images in FF/Mozilla.
+	Fixed bug in importCSS function, was having a meaning less if statement.
+	Fixed so the contextmenu plugin uses images from the configurated theme instead of the advanced theme.
+	Fixed so the external_link_list_url/external_image_list_url options can use relative or absolute path.
+	Fixed so the external_link_list_url/external_image_list_url has a random query parameter to prevent it from cache.
+	Added new mceInsertRawHTML command, this inserts raw as it is HTML code in the the selected position.
+	Added paste plain text plugin contributed by Ryan Demmer, converted it into a paste plugin.
+	Added updated paste plugin contributed by speednet, includes paste directly feature for MSIE.
+	Added split/merge table cells support, to table plugin and context menus.
+	Added cut/copy/paste table rows functionality to context menu and table plugin.
+	Added new mceSetContent command, this does the same as the setContent function.
+	Added new clear all/new document icon to advanced theme.
+	Added new remove formatting and select text color icons.
+	Added new directionality plugin to better support languages that write from right to left.
+	Added new fullscreen plugin, enables users to toggle fullscreen editing mode.
+	Added a new template/tutorial plugin to aid people in the development of own plugins.
+	Removed visual_table_style and replaced it with visual_table_class. [BREAKS COMPATIBLITY].
+	Renamed urlconvertor_callback option to urlconverter_callback.
+Version 1.44 (2005-05-03)
+	Fixed bug with contextmenu not showing at the correct location in MSIE.
+	Fixed bug where a error was produced by the Flash plugin if the user reloaded the page in MSIE.
+	Fixed issue where mceAddControl and mceRemoveControl commands produced a error in MSIE.
+	Fixed bug when images and flash movies where mixed in the editor produced strange results.
+	Fixed so trailing / characters isn't removed from URLs.
+	Fixed so the contextmenu uses a diffrent method of loading it's custom CSS file.
+	Fixed getAttributes problem, it should read getAttribute.
+	Fixed so "Edit HTML source" window may be maximized.
+	Added French eacute entitiy to default entities option.
+	Added a height CSS value for the element path in advanced themes editor_ui.css since it keept bobbing up and down.
+	Added updated Polish language pack contributed by Marcin Szymon Sznyra.
+	Added better window auto resize method for most dialogs.
+	Added new feature to set what tags are to be left open in valid_elements. Add a + before the element names to enable.
+	Added nowrap for the editor table cells, sometimes the editors controls wrapped.
+	Updated German language pack contributed by Krokogras.
+Version 1.44 RC2 (2005-04-25)
+	Fixed bug with host prefixes and port numbers when having relative_urls set to false and remove_script_host set to true.
+	Fixed bug when site absolute URLs for example /something was converted incorrectly in Firefox/Mozilla.
+	Fixed bug where the link wasn't auto selected in the drop list in the advanced themes default link dialog.
+	Fixed bug issue with the flash plugin and croping out characters before and after the movie.
+	Fixed bug where the editor jumped to top of editor area on enter/return when doctype was set to XML Transitional.
+	Fixed bug where context menu was appearing in the wrong location if the window was resized.
+	Fixed bug in the context menu where table properties wasn't working.
+	Fixed bug where a selectorText exception was trown if the CSS file contained @import or @charset.
+	Fixed bug where bold/italic/strikethough/underline wasn't selected/unselected in toolbar some times.
+	Fixed issue with hspace and vspace when having the inline_styles option enabled. Contributed by speednet.
+	Fixed bug where access denied error was thrown sometimes in MSIE.
+	Fixed so images without src won't be inserted.
+	Fixed some issues with width/height fields in the advimage plugin.
+	Fixed so the contextmenu plugin doesn't appear in MSIE 5.0, now functions with 5.5+.
+	Added filebrowser icon to mouse over and mouse out fields in the advimage plugin.
+	Added filebrowser icon to popup field in the advlink plugin.
+	Added so the triggerSave function gets auto executed when a user calls submit on a form, this can be disabled with the submit_patch option.
+	Added missing readme.txt file for the context menu plugin.
+	Added new border and background color fields to table dialog, based on contribution by Neirda. Enable them by the table_color_fields option.
+	Removed some old outdated items from FAQ.
+Version 1.44 RC1 (2005-04-20)
+	Fixed bug where width/height attributes of a image wasn't stored some times in Firefox/Mozilla.
+	Fixed bug where P elements where created if a user pressed return/enter within a h1-h6 in Firefox/Mozilla.
+	Fixed bug where the remove format fuction didn't work some times in MSIE.
+	Fixed so backspace/delete gets added in one undo level in MSIE (improves performance).
+	Fixed so the "Could not find element by id or name" alert only shows when the debug option is set to true.
+	Fixed bug where bold/italic didn't work in Mozilla 1.3.
+	Fixed bug where width/height of a hidden TinyMCE instance where incorrect.
+	Fixed so the function layout of classes in tiny_mce_src.js uses prototype keyword instead of TinyMCE_ prefix (reduces size).
+	Fixed bug where triggerNodeChange produced javascript error some times in MSIE.
+	Fixed some issues in the Swedish and Spanish language packs.
+	Fixed bug where first undo level wasn't working correctly.
+	Fixed so flash plugin loads it's needed CSS data from within the plugin.
+	Fixed button images and CSS in the simple theme.
+	Fixed so the simple example shows how to use the simple theme instead of the default theme.
+	Fixed so cleanup default values can be set to empty. For example alt= generated alt="" on img elements.
+	Fixed memory leaks in MSIE (circular closure problem) events are now removed in a better way.
+	Fixed bug where URLs where converted incorrectly if the editor page URL contained / characters.
+	Fixed bug where table guidlines didn't work correctly when using the build in Mozilla table buttons.
+	Fixed bug where the Flash plugin was breaking other elements.
+	Added new contextmenu plugin, this plugin adds a menu if the user right clicks/uses the contextmenu on elements.
+	Added new multiple configuration support, the init method may now be called multiple times.
+	Added new remove_linebreaks option, this option is enabled by default and removes all HTML code linebreaks.
+	Added new behavior to the textarea_trigger option, if mode is textareas and trigger is false those elements will not be converted into editors.
+	Added new entity_encoding option, enabled user to better control the behavior of how character are converted into entities.
+	Added new isDirty command to TinyMCEControl, this method returns true if the user has done any modifications to the content.
+	Added new onchange_callback option, this callback is executed when contents within the editor instance is changed.
+	Added new init function for themes/plugins this gets called when a editor instance has finished it's setup.
+	Added new init_instance_callback option this callback is executed when instances are added to the editor.
+	Added new cleanup option this option enables users to totaly disable the whole cleanup process.
+	Added new importCSS method to TinyMCE. This method allows plugins and themes to load custom CSS files on initialization.
+	Added new getSelectedHTML method to TinyMCEControl class, this method returns the currently selected HTML contents.
+	Added new getSelectedText method to TinyMCEControl class, this method returns the currently selected contents as text.
+	Added new removeclass behavior to the removeformat button. The current class will be removed if no contents is selected.
+	Added new queryInstanceCommandValue and queryInstanceCommandState methods.
+	Added new option button_tile_map, this option contols the usage of button tile maps and is disabled by default.
+Version 1.43 (2005-03-06)
+	Fixed bug with ask option not working at all.
+	Fixed bug where a "instance is not defined bug" error was produced.
+	Fixed bug with empty image src produced a error.
+	Fixed so the simple and default theme used the same CSS style as the advanced theme.
+	Fixed bug with the relative to absolute URL convertion logic if a empty string was passed used.
+	Fixed parse error bug with the source editor some servers can't handle XML PI declarations.
+	Fixed bug issue with HR elements in MSIE, if a specific work pattern where used a runtime error was produced by MSIE.
+	Fixed bug in the URL convertor logic, port numbers was not correctly handled.
+	Fixed issue where the cursor was placed before a insert of custom charater or date/time.
+	Fixed bug where the editor height option didn't work on MSIE.
+	Fixed bug where a linefeed within a table cell broke the table in Firefox/Mozilla.
+	Fixed bug where return/enter key after a image removed all content.
+	Fixed bug where return/enter key sometimes produced nestled P elements.
+	Fixed bug where the editor was stealing focus on load in MSIE.
+	Fixed bug where the visual aid logic forces width/height attributes on tables.
+	Fixed bug where getCSSClasses some times returned null value.
+	Fixed issue where the lang_insert/lang_update language variables wasn't entity decoded.
+	Fixed so the image/link/flash drop list gets auto selected thanks goes to Randy Simons and salzbermat.
+	Fixed so remove formatting button in MSIE removes all classes aswell.
+	Fixed issue where output contained single br element when the editor area was empty.
+	Added new %A/%a/%B/%b format chunks to insertdatetime, these insert localized date names such as January.
+	Added new oninit callback option for TinyMCE this callback is executed when all editor instances been initialized.
+	Added new preview panel to dialog in the advimage plugin, contributed by Virtuelcom.
+	Added element class name to element path in the advanced theme.
+	Updated Canadian French table language pack contributed by Virtuelcom.
+	Updated the swedish language pack, contributed by Mats Löfström, York Consulting AB.
+Version 1.42 (2005-02-14)
+	Fixed bug with the element path beeing resized if width/height of editor was 100%.
+	Fixed bug with reloading/flicker of all button images in MSIE if browser cache is disabled.
+	Fixed backspace/delete bug in Firefox, some times the cursor got stuck.
+	Fixed bug issues with enter/return key in Firefox/Mozilla.
+	Fixed bug where copy/paste and drag drop of images/links failed in Firefox/Mozilla if a document_base_url is provided.
+	Fixed so when relative_urls is set to false it forces absolute URLs for images/links.
+	Fixed so the _src.js suffix versions of the themes and plugins gets loaded with the tiny_mce_src.js script is used.
+	Fixed so verify_css_classes option is disabled by default.
+	Fixed bug where tables where resized when toggling visual aid in Firefox/Mozilla.
+	Fixed bugs with advhr plugin running in a hidden div element.
+	Added new auto_focus option that enabled a specific editor area to be focused on startup.
+	Added a extra argument to the filebrowser callback inorder to get the calling window reference.
+	Added a new persian (farsi) language pack contributed by Morteza Zafari.
+	Added new more nice looking icons contributed by Morteza Zafari and Michael Keck. The old icons are available in a separate icon pack.
+	Added updated Canadian French language pack contributed by Virtuelcom.
+	Added updated French languahe pack contributed by Laurent Dran.
+	Added updated German language pack contributed by Tobias Heer.
+	Added some documentation regarding the layout manager options made by SlyD.
+Version 1.41 (2005-01-31)
+	Added new table plugin, all table code is moved into this plugin [BREAKS COMPATIBLITY].
+	Added new external_link_list_url/external_image_list_url options for better backend integration.
+	Added new file_browser_callback option for better backend integration.
+	Added new layout manager code into the advanced theme, contributed by SlyD.
+	Added new nowrap option, enables so users may change the word wraping behavior.
+	Added new Thai language pack contributed by Innozent.
+	Added obfuscated version of all plugins and themes to reduce over all startup/download time.
+	Added Simplified Chinese language pack contributed by cube316.
+	Added a updated Czech language pack thanks to Josef Klimosz.
+	Fixed issue where anchor elements where closed. This results in browser problems with the outputed HTML.
+	Fixed bug where the first return key press didn't produce a paragraph in Firefox/Mozilla.
+	Fixed bug in the searchreplace plugin where replace content sometimes fails in Firefox/Mozilla.
+	Fixed so all language packs now uses the ISO-639-2 code instead of ISO 3166-1 [BREAKS COMPATIBLITY].
+	Fixed some issues with the force_br_newlines option in MSIE.
+	Fixed bug where the backspace or delete key produced BR elements in Firefox/Mozilla.
+	Fixed bug issue with link and image dialogs of the default theme/simple example.
+	Fixed some bugs when having the editor hidden in a tab/div, contributed by Ernst de Moor.
+	Fixed some character issues with the Danish language packs, contributed by someone unknown.
+Version 1.40 (2005-01-09)
+	Added a new default value for the font size drop down, if no font size where found this gets selected.
+	Added a auto resize window feature, this is enabled by default but can be disabled with a window argument.
+	Added a new print plugin, prints the current editor contents to a printer.
+	Added a new searchreplace plugin, adds a search, searchnext and replace button.
+	Fixed bug issue where buttons didn't display correctly on some Firefox installations.
+	Fixed issue with value and type attributes of input elements getting lost in cleanup on MSIE.
+	Fixed so that the getEditorInstance command is public, returns a TinyMCEControl by id.
+	Fixed issue where "true" and "false" string wasn't treated as booleans in TinyMCE init options.
+	Fixed so cursor/mousepointer allways remains a arrow in all themes when rolling over buttons.
+	Fixed the popup windows so they are mode "modal" in Mozilla/Firefox.
+	Fixed so the ask question is displayed when elements are focused with the tab key.
+	Fixed so the ask option works when mode option is set to exact.
+	Fixed issue with visualaids on tables not working correctly when the user uses the tab key in Firefox/Mozilla.
+	Fixed some bugs with the mceSetCSSClass class command and the element path.
+	Fixed a new version of the mceInsertContent command.
+	Fixed so the auto_cleanup_word option is disabled by default.
+	Removed the langs of the zoom plugin, it now uses + instead of the "zoom" word.
+Version 1.391 (2005-01-04)
+	Fixed major spacebar bug in MSIE, spacebar was disabled.
+Version 1.39 (2005-01-04)
+	Updated the Flash plugin with a new version, contributed by jamesw.
+	Added new setWindowArg function, useful if plugins are to call other plugins.
+	Added new save plugin, this plugin adds a save/submit form button to tinyMCE, contributed by SlyD.
+	Added new hilite color support, sets a background-color style on the selected text.
+	Added new variable replacement popup URLs, check the openWindow function documentation for details.
+	Added new force_p_newlines option, forces P elements on return/enter key in Mozilla/Firefox.
+	Added new theme_advanced_path_location, adds a element path list.
+	Added new theme_advanced_toolbar_align option, defaults to center.
+	Added new Portuguese translation contributed by José Pedro Pereira.
+	Added new mceSelectNode and mceSelectNodeDepth commands.
+	Added new add_unload_trigger option, this adds a unload triggerSave call. Enabled by default.
+	Added am/pm time format to the insertdatetime plugin.
+	Fixed font color and size attribute bug, contributed by Vincent FIACK.
+	Fixed className undefined bug, Firefox/Mozilla produced a console error sometimes.
+	Fixed so mceSetCSSClass command may be applied to all sorts of elements.
+	Fixed so anchor elements can be removed by setting the anchor name to nothing.
+	Fixed typing performance some in Firefox/Mozilla, removed some nodechange triggers.
+	Fixed so the zoom plugin is invisible in MSIE 5.0, since zoom isn't available in that browser.
+	Fixed bug with the emotions plugin in MSIE 5.0, it was opening a new window.
+	Fixed so contents stay within the editor if the user hits the back/forward buttons.
+	Fixed bug where the window.name property was set to the image name.
+	Fixed so anchors links within the same page are made relative when relative_urls are set to false.
+	Updated the advanced theme so most of the images are loaded from a tiled image, improves loading time.
+	Updated the Swedish language pack, contributed by Martin.
+	Updated the readme.txt in the advlink plugin, was some problems with the valid_elements.
+	Updated the default CSS for the advanced theme some, added button backgrounds to look like office2k.
+Version 1.38 (2004-11-28)
+	Added new textarea field for form elements when debug mode is enabled, contributed by Michael Keck.
+	Added new spacer item support for the theme_advanced_buttons<n> options, contributed by Michael Keck.
+	Added new selection borders for images and hr elements, contributed by Michael Keck.
+	Added new advhr plugin, this plugin handles advanced settings on HR elements, contributed by Michael Keck.
+	Added new german language pack for the preview plugin, contributed by Michael Keck.
+	Added new word wrap and source formatting to the source editor, contributed by Michael Keck.
+	Added new updated charmap, contributed by Michael Keck.
+	Added new flash plugin that enabled flash movied to be handled, contributed by Michael Keck.
+	Added the old cut/copy/paste commands to the advanced theme, these are not visible by default.
+	Added new theme_advanced_buttons<N>_add_before option to advanced theme.
+	Added new "update" button title for a popup windows.
+	Added new zoom prefix language variable to the zoom plugin.
+	Added new entities option, that enables you to config entity code to name convertion.
+	Added new custom cleanup possibility to plugins.
+	Added new cleanup_callback option, adds the possibilty to add custom cleanup logic.
+	Added new Norwegian language pack, contributed by Sten Aksel Heien.
+	Added new Korean language pack, contributed by Setzer Gabbiani.
+	Fixed the layout of the color picker, contributed by Michael Keck.
+	Fixed so the preview plugin doesn't include the any toolsbars in preview popup window, contributed by Michael Keck.
+	Fixed bug where anchors elements was treated as links.
+	Fixed so all popup windows are modal dialogs in MSIE.
+	Fixed bug where the word "null" sometimes appares in HTML after cleanup in Firefox/Mozilla.
+	Fixed bug where form elements with missing name attributes produced errors.
+	Fixed some default value bugs and issues with the new advlink plugin.
+	Fixed the link/image dialog sizes in the SE language pack.
+	Fixed the content duplication bug, it seems to be fixed anyway, if not please let me know.
+	Fixed bug where plugin handleNodeChange extentions broke the theme function.
+Version 1.37 (2004-11-12)
+	Added new mceResetDesignMode command that can be used when the editor is placed in tabs.
+	Added new updated Italian language pack thanks goes to "Fabrix Xm" for the contribtion.
+	Added new greek language pack thanks goes to "Jacaranda Bill" for the contribution.
+	Added new french language pack thanks goes to "Pat Boens" for the contribution.
+	Added new russian language pack thanks goes to "Roman Filippov" for the contribution.
+	Added new updated Dutch language pack thanks goes to Arnoud van Delden and Ernst de Moor for the contribution.
+	Added new convert_newlines_to_brs option, that enables newlines to be converted to br elements.
+	Added new custom_undo_redo_keyboard_shortcuts option, enables keyboard shortcuts to be enabled/disabled.
+	Added new auto_reset_designmode option, thats resets the design mode when a editor instance is focused.
+	Added new form reset handler, resets the contents of TinyMCE areas when the onreset event is trigged.
+	Added new skip_cleanup parameter to triggerSave, this parameter is optional and defaults to false.
+	Added new lang_underline_img language variable to all themes.
+	Added new title attribute to all images, enables tooltips in Mozilla and Firefox.
+	Added new insert and cancel CSS id's for all submit and cancel buttons.
+	Added new full featured example that includes all available plugins and buttons.
+	Added new advlink and advimage plugins to TinyMCE, these are more advanced link and image tools. Contributed by Michael Keck.
+	Added new parameters to insertImage and insertLink commands. Contributed by Michael Keck.
+	Added updated compatiblity chart, includes a matrix table thanks goes to Ernst de Moor.
+	Added new insert image icon contributed by Arnoud van Delden and Ernst de Moor.
+	Added window focus on all popup windows, contributed by Arnoud van Delden and Ernst de Moor.
+	Fixed some issues with the char map added some characters and removed duplicate ones, contributed by Arnoud van Delden and Ernst de Moor.
+	Fixed the insert row icon, rotated it 180 degrees, contributed by Arnoud van Delden and Ernst de Moor.
+	Fixed the visual aid icon, made it a bit darker. Contributed by Arnoud van Delden and Ernst de Moor.
+	Fixed some issues with entity encoding in source editor aswell as in core cleanup code.
+	Fixed bug where the auto import CSS feature imported invalid CSS rules with : or spaces.
+	Fixed bug where unnecessary entity encoding of characters was done.
+	Fixed the window sizes some to better function on MSIE with SP2.
+	Fixed some issued with the auto word cleanup feature, fixes some issued with content duplication.
+	Fixed bug that made the editor to throw weird error when HTML code includes <!a or <!/a> content.
+	Fixed bug where the style attribute was returned on images in source output even if it was disabled.
+	Fixed issue where the UI form elements of TinyMCE was submitted with the form submit.
+Version 1.36 (2004-10-19)
+	Added a newly modified version of the German language pack from "krokogras".
+	Added auto resizing to popup windows with the same name.
+	Added example page for the plugin_preview_pageurl option in the preview plugin.
+	Fixed issue with link button auto enable/disable feature when content selection was made with the keyboard.
+	Fixed bug where events wasn't handled correctly in MSIE 5.5 and some 6.0 versions.
+	Fixed so align on images gets set as float style when the inline_styles option is enabled.
+	Fixed so solid border style isn't applied on elements with a border when the inline_styles option is enabled.
+	Fixed some issues with tables and the inline_styles option.
+	Fixed back button issue with MSIE, iframes was placed in browser history.
+Version 1.35 (2004-10-13)
+	Added so that whitespace gets stripped in plugin and theme_advanced_buttons options.
+	Added custom plugin_preview_pageurl option to preview plugin.
+	Added Canadian French language packs for the new plugins, contributed by Virtuelcom.
+	Added new theme_advanced_blockformats option.
+	Added new title support to advanced theme link dialog.
+	Added new Ctrl+B/I/U keyboard shortcuts for Firefox.
+	Added Polish language pack contributed by "revyag".
+	Added Taiwanese language pack contributed by "Jim Kou".
+	Added updated German language pack contributed by "Krokogras".
+	Fixed some issues with ieSpell including better language support.
+	Fixed bug with default value in valid_elements not working in Firefox some times.
+	Fixed bug when focusing links without selecting any characters.
+	Fixed some typos in Swedish language pack.
+	Fixed bug with content selection and link button auto enable/disable feature.
+	Fixed bug issue when "theme_advanced_buttons<N>" options where left empty.
+	Fixed various bugs with absolute URLs.
+Version 1.34 (2004-10-03)
+	Added new insertdatetime plugin, inserts date/time in various formats.
+	Added new preview plugin, previews the HTML page in a new window.
+	Added new zoom plugin, adds the possibility zoom the editor in MSIE.
+	Added new emotions plugin, adds the possibility to add smileys.
+	Fixed so that TinyMCE functions on MSIE 5.0 again.
+	Fixed so that TinyMCE functions better on Mozilla 1.3.
+	Fixed so that the cursor doesn't jump to the top when setting styles.
+	Fixed bug with STRONG and EM elements wasn't handled correctly in Firefox.
+	Optimized the key handling some, gives better typing performance.
+	Removed key down statusbar debug info.
+Version 1.33 (2004-09-29)
+	Removed the need of loading blank.html, iframes are now created dynamicly.
+	Fixed bug when selecting tables, MSIE was casting errors.
+	Fixed bug with pluginurl variable.
+	Fixed bug when tinyMCE.selectedElement error was cast in Mozilla.
+	Added new Arabic language pack contributed by Hani Suleiman.
+	Added "lang_dir" support to language packs like Arabic.
+Version 1.32 (2004-09-25)
+	Added new ieSpell plugin, only works in MSIE.
+	Added new "theme_advanced_buttons<N>_add" option.
+	Added new importPluginLanguagePack function.
+	Added new Danish language pack contributed by Jan Moelgaard.
+	Added updated German language pack contributed by Christopher Müller.
+	Added new any_selection to handleNodeChange callback.
+	Modified so link/unlink is dimmed if nothing is selected.
+	Fixed bug when deleting images in Firefox.
+	Changed the plugin location to a new plugin directory.
+	Renamed the "theme_plugins" option to "plugins".
+Version 1.31 (2004-09-18)
+	Added Canadian French language pack, contributed by Virtuelcom.
+	Added so link/unlink buttons gets selected when user enters a link element.
+	Fixed URL bug when drag dropping/copy pasting images in Mozilla.
+	Fixed so mso style attribs don't get trimmed if auto_cleanup_word option is set to false.
+	Fixed bug with text alignment buttons.
+	Fixed bug with CSS auto import function in MSIE.
+	Fixed initialization bugs and issues.
+Version 1.30 (2004-09-10)
+	Fixed bug issue where the editor was stealing focus from location bar.
+	Fixed bug issue with absolute aligned images lost focus when using tools.
+	Fixed bug #1025483, Url converting broken.
+	Added ability to send command values in advanced theme button list, contributed by someone helpfull.
+	Added new cleanup_on_startup option, to increase startup speed.
+	Added new inline_styles partly based on a contribution by Victor Nilsson.
+	Added new named anchor support.
+	Added custom_undo_redo_levels option.
+Version 1.29 (2004-09-08)
+	Added new getEditorId function, to retrive the editor id of a form element.
+	Readded so cleanup is automaticly executed on editor startup in MSIE.
+	Added some various cleanup fixes for MS Word HTML.
+	Added new auto_cleanup_word option, enabled auto MS Word HTML cleanup on paste events.
+	Fixed parameter issue with insertImage function. Bug #1022863.
+	Fixed bug #1022874, Where the small theme had underline command on strikethrough button.
+	Fixed some bugs with table commands.
+	Fixed bug #1023204, mceRemoveControl brings back the old HTML.
+	Fixed bug issue with tinyMCE.selectedInstance in Mozilla.
+	Fixed bug issue with Mozilla not saving content.
+Version 1.28 (2004-09-04)
+	Added new Finnish language pack thanks to Urho Konttori.
+	Added new rowseparator as a possible value of the theme_advanced_buttons<n> options.
+	Added new theme_advanced_toolbar_location option.
+	Added new uid variable option to valid_elements. (Generates unique IDs)
+	Added new "directionality" option to support languages like Arabic.
+	Added new character map button/window.
+	Added new guidelines/visual aid toggle button.
+	Reduced the source of the advanced theme some, and added some better comments.
+	Separated the default theme in to files aswell.
+	Removed source area size options and made source editor resizable instead.
+	Increased the default width and height of the source editor.
+	Fixed bug where image width/height default to 0x0 if these attributes wasn't defined.
+	Fixed some bug issues with MSIE 5.5.
+Version 1.27 (2004-08-29)
+	Added new cleanup logic, with new options and smarter behavior.
+	Added new "trim_span_elements" option (removed unneeded span elements).
+	Added new "verify_css_classes" option (verifies so class attributes contain a valid class).
+	Added new "verify_html" option (enables/disabled verification of elements and attributes).
+	Added new value verification type to "valid_elements" option.
+	Added new simple wildcard support in "valid_elements" option.
+	Added class as a valid attribute to table elements by default.
+	Added so non existent classes gets removed HTML output.
+	Added fix for   entities, so they get converted correctly.
+	Added new class select box in table dialog.
+	Added hr as a default valid element.
+	Fixed some issues with the language packs.
+	Fixed some weird bugs and issues with hr elements.
+	Fixed bug where Mozilla was casting exceptions on keypress.
+Version 1.26 (2004-08-25)
+	Added a better way to create theme popup windows (External files).
+	Added new getWindowArg function, returns window arguments in theme popups.
+	Modified the advanced theme to adopt the new theme popup idea.
+	Fixed critical Mozilla bug, where the editor didn't work at all some times.
+	Fixed bug with auto CSS class import feature running on Firefox.
+Version 1.25 (2004-08-22)
+	Added new format select box in advanced theme (Can be disabled).
+	Added new "theme_advanced_disable" option to advanced theme.
+	Added some new elements to default list of valid elements (Format select box elements).
+	Added new font face, forecolor and font size support, these are not enabled by default.
+	Added new "mceAddControl" command, enables users to dynamicly add editors.
+	Added new execInstanceCommand function, check the documentation for details.
+	Added new "mceSetAttribute" command.
+	Modified the themes so that the focus alert doesn't popup as often as before.
+	Modified the "mceRemoveControl" command so it can handle element id aswell as editor ids.
+	Fixed some bugs and issues with the new custom undo/redo logic.
+	Fixed weird Mozilla bug #997860.
+Version 1.24 (2004-08-17)
+	Modified so that span with CSS classes that don't exists get removed.
+	Added new "custom_undo_redo" option, this option is enabled by default.
+	Added new "fix_content_duplication" option, that fixes some MSIE content duplication issues.
+	Added new "mceFocus" command, that changes focus to the specified editor instance.
+	Added new "mceReplaceContent" command, that enables users to replace the current selection.
+	Fixed so styles including spaces doesn't get listed in style selection box.
+	Fixed bug with form element names and exact mode in Mozilla.
+	Fixed so tiny_mce_src.js can be used aswell as tiny_mce.js.
+	Converted some of the language packs to better support unicode.
+Version 1.23 (2004-07-31)
+	Modified the mceSetCSSClass command to address bug #997071.
+	Added new Hungarian language pack thanks to 2XP.
+	Added new callback "setupcontent_callback" check the manual for details.
+	Fixed bug #994506, where empty theme_plugins option generated a 404 error.
+	Fixed bug #999332, where image properties wasn't removed if the user deleted the image.
+Version 1.22 (2004-07-19)
+	Fixed bug #989846, Image resize bug.
+	Changed so that style attribute values get converted to lowercase in MSIE.
+	Changed so the alignment called "middle" is "center" in table properties.
+	Fixed so visual aids work correctly after using the source editor.
+	Fixed some issues with anchor links.
+	Fixed so that javascript: links can be used.
+	Added width/height options for the advanced source editor.
+	Fixed bug issue with URL:s containing quotes or single quotes.
+	Fixed so that document_base_url can point to another domain.
+Version 1.21 (2004-07-12)
+	Added new "theme_plugins" option, check the manuals for details.
+	Added new "execCommand" plugin extention possibility.
+	Added new "buttons<n>" config options to the advanced theme.
+	Added new "mceRemoveControl" command.
+	Added Spanish language pack thanks to "Alvaro Velasco".
+	Fixed first click bug.
+	Fixed so CSS url:s can be absolute.
+	Updated the FAQ regarding the Cut/Copy/Paste issue.
+Version 1.20 (2004-07-05)
+	Fixed bug issue #983257, JS runtime error when template contains no controls.
+	Removed cut/copy/paste commands and icons due to security reasons in Mozilla.
+	Added Czech language pack, thanks goes to "Pavel Novák" for the contribution.
+	Fixed minor bug regarding empty attributes.
+	Fixed so the "extended_valid_elements" overrides previous declarations.
+Version 1.19 (2004-06-28)
+	Fixed focus bug that appared on Linux version of Mozilla.
+	Fixed major bug issues with some Firefox/Firebird versions on Linux.
+	Fixed minor visual aid bugs on tables.
+	Fixed minor bugs with table commands.
+	Fixed scroll issue in HTML source windows on Mozilla/Linux.
+	Added a compatiblity chart to the manuals.
+Version 1.18 (2004-06-20)
+	Added new option "remove_script_host".
+	Some minor fixes to the mceInsertContent command.
+	Fixed some issues with visual aids for tables.
+	Fixed strange focus bug in MSIE.
+	Updated some of the documentation.
+Version 1.17 (2004-06-16)
+	Fixed bug, #972666 - Doesn't save edits when id != name.
+	Added more Italian, user manuals. Thanks goes to "Fabrix Xm".
+	Added Dutch language pack thanks to "Meint Post".
+	Modified the MSIE version of mceInsertContent command.
+Version 1.16 (2004-06-14)
+	Added new table dialog and TinyMCE_<theme>_getInsertTableTemplate template function.
+	Added auto class import feature and Italian language pack thanks goes to "Lorenzo Pavani".
+	Added border, alignment, vspace, hspace, width, height fields to the image properties dialog in advanced theme.
+	Updates advanced theme help pages for Swedish and English.
+	Fixed some minor issues with the mceSetCSSClass command.
+	Fixed minor MSIE bug in built in default URL convertor.
+	Fixed some image alignment issues.
+	Fixed support for site root script paths like src="/jscripts/tiny_mce.js".
+	Removed the use of "TinyMCE_advanced_cssClasses" from "advanced" theme.
+	Modified the default value of "valid_elements" to include table align and class as valid attributes.
+	Modified the default value of "valid_elements" to set img border attribute to 0 by default instead of by force.
+	Modified so that popup windows gets centered on screen.
+Version 1.15 (2004-06-09)
+	Added new "advanced" theme, that adds some new functions.
+	Added new public js functions "getContent, setContent, applyTemplate, openWindow".
+	Added new custom command "mceSetCSSClass", that sets css class of the selection.
+	Added new custom command "mceInsertContent", that inserts HTML content.
+	Added class attributes to some of the elements in the default value of "valid_elements".
+	Added ability to have theme specific language packs by the js function "importThemeLanguagePack".
+	Added more documentation to the usage and themes sections.
+	Added table support, with custom commands and in advanced theme.
+	Modified the advanced example to include the new advanced theme.
+	Fixed tooltips for buttons in Mozilla.
+Version 1.14 (2004-06-07)
+	Added new conversion possibility to save callback.
+	Added some more usage documentation.
+	Fixed some issues will updateContent function in Mozilla.
+	Fixed some issues with relative paths.
+	Fixed small Mozilla issue with visual aids.
+	Fixed so that the default theme sets image border to 0.
+	Fixed bug #968079, Removing editor buttons in template can cause errors.
+Version 1.13 (2004-06-04)
+	Fixed critical bug where the editor didn't work at all in MSIE.
+	Fixed bug where table visual aids didn't work in Mozilla.
+Version 1.12 (2004-06-03)
+	Added updateContent function thanks to "Jürgen Baute" contribution.
+	Added documentation of the diffrent public javascript functions of tinyMCE.
+	Fixed bug #965615, Empty editor content returns "<br />" as value after cleanup.
+	Fixed bug where Bold and Italic didn't work correctly in Mozilla.
+Version 1.11 (2004-06-01)
+	Added new option "document_base_url", it's used when converting absolute URLs to relative ones.
+	Added so that align button sets the align attribute of selected images.
+	Fixed bug when / was passed within query string to the editors page.
+	Fixed bug #961041, Image attributes are not removed.
+Version 1.1 (2004-05-26)
+	Fixed bug #960112 JavaScript error when opening image window.
+	Fixed bug #926644 Multiple forms with elements having the same name failed.
+	Added function so that "specific_textareas" mode handles the "ask" option.
+	Added new option "focus_alert", to remove annoying focus alert message.
+Version 1.09 (2004-05-24)
+	Added new option "extended_valid_elements", this option adds extra elements to the "valid_elements" list.
+	Fixed bug #958637, Resized images are displayed in original size
+	Fixed bug #958942, Bug on realitive_urls (Bug with absolute URLs to insertlink_callback, insertimage_callback callbacks)
+	Fixed bug #958498, Unable to change Bold and italic text in Mozilla. 
+Version 1.08 (2004-05-21)
+	Added new attributes "border, hspace, vspace, width, height, align" to the getInsertImageTemplate theme function.
+	Added new relative_urls option, this new feature converts all absolute URLs to relative URLs and it's on by default.
+	Fixed bug #956007, the CSS theme URL:s was allways pointing to the default theme.
+	Fixed bug where enter/return key produced a error in the insert link popup window form. (This was done in the default template)
+	Fixed bug #957681, Could not delete text without first adding character bug in Mozilla.
+Version 1.07 (2004-05-10)
+	Added experimental support for option "force_br_newlines" to address bug #922416 and feature request #936270.
+	Fixed bug with mailto: links.
+Version 1.06 (2004-04-15) 
+	Added new German language pack. Thanks goes to "Simon Rupf" for the contribution.
+	Added new German/Swedish bold/italic language specific icons to both default and simple theme.
+	Added new Swedish documentation. 
+Version 1.05 (2004-04-02) 
+	Added new Italian language pack and documentation. Thanks goes to "Fabrix Xm" for the contribution.
+	Fixed missing "lang_help_desc" definition in UK and SE langpacks.
+	Added better documentation for the "valid_elements" option and it's format.
+	Added new "preformatted" option to address feature request #927948.
+	Added browser checker so that the script don't break on non compatible browsers.
+	Fixed bug #926639, now the editor instance gets resized if a width/height is specified in %.
+	Added new simple theme, this theme has only basic functions. 
+Version 1.04 (2004-03-30) 
+	Fixed bug when insertLink and insertImage function didn't use the url_convertor callback.
+	Fixed MSIE bug when images was 32x32 on initialization on slow connections.
+	Fixed bug that made request on images with wrong path, produced some 404 error in webserver logs.
+	Fixed MSIE bug where users could add images outside of the editor scope. 
+Version 1.03 (2004-03-26) 
+	Added new "add_form_submit_trigger" this option is default and is added on all document forms within the page. To address bug #923362
+	Moved javascript sourcecode file to "jscripts/tiny_mce/tiny_mce_src.js".
+	Added new obfuscated version of tinymce to reduce size of script.
+	Added some performance boosting code to the switchClassSticky function.
+	Removed the "autosave" option, this is no longer needed and is replaced with "add_form_submit_trigger" or triggerSave call.
+	Fixed undo bug in MSIE.
+	Removed some unused eventhandlers results in better performance. 
+Version 1.02 (2004-03-26) 
+	Added new handleNodeChange callback to themes.
+	Fixed some bugs regarding events and themes function checks.
+	Fixed bug issue when user focused nodes with keyboard. 
+Version 1.01 (2004-03-12) 
+	Added some more documentation.
+	Added new "visual" option to editor.
+	Fixed bug on empty P elements.
+	Fixed bug on table width/height. 
+Version 1.0 (2004-03-11) 
+	Added new "debug" option and fixed some path issues.  

Deleted: trunk/htdocs/js/tinymce/docs/about.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/about.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/about.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,41 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>About</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>About</h1>
-</div>
-
-<div class="content">
-	<h2>General information</h2>
-	<div class="section">
-		<p>TinyMCE is a powerful WYSIWYG editor control for web browsers such as MSIE or Mozilla that enables the user to edit HTML contents in a more user friendly way. The editor control is very flexible and it's built for integration purposes for example usage within systems like Intranets, CMS, LMS and so forth.</p>
-		<p>
-		TinyMCE is developed by <a href="http://www.moxiecode.com">Moxiecode Systems AB</a> and is currently released under the "LGPL" license, read the license agreement for details.
-		</p>
-		<h2>Features</h2>
-		<p>
-			<ul>
-				<li>Easy to integrate, takes only a couple lines of code.</li>
-				<li>Theme and template support.</li>
-				<li>Easy to extend with custom code. (Plugins and callbacks)</li>
-				<li>Customizable HTML output. Block elements and force attributes.</li>
-				<li>International language support (Language packs).</li>
-				<li>Multiple browser support, currently Mozilla (PC, Mac and Linux), MSIE (PC) and FireFox (PC, Mac and Linux) and some limited Safari support.</li>
-			</ul>
-		</p>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/about.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/about.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/about.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/about.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,41 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>About</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>About</h1>
+</div>
+
+<div class="content">
+	<h2>General information</h2>
+	<div class="section">
+		<p>TinyMCE is a powerful WYSIWYG editor control for web browsers such as MSIE or Mozilla that enables the user to edit HTML contents in a more user friendly way. The editor control is very flexible and it's built for integration purposes for example usage within systems like Intranets, CMS, LMS and so forth.</p>
+		<p>
+		TinyMCE is developed by <a href="http://www.moxiecode.com">Moxiecode Systems AB</a> and is currently released under the "LGPL" license, read the license agreement for details.
+		</p>
+		<h2>Features</h2>
+		<p>
+			<ul>
+				<li>Easy to integrate, takes only a couple lines of code.</li>
+				<li>Theme and template support.</li>
+				<li>Easy to extend with custom code. (Plugins and callbacks)</li>
+				<li>Customizable HTML output. Block elements and force attributes.</li>
+				<li>International language support (Language packs).</li>
+				<li>Multiple browser support, currently Mozilla (PC, Mac and Linux), MSIE (PC) and FireFox (PC, Mac and Linux) and some limited Safari support.</li>
+			</ul>
+		</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/compatiblity_chart.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/compatiblity_chart.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/compatiblity_chart.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,84 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Compatiblity Chart</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Compatiblity Chart</h1>
-</div>
-
-<div class="content">
-	<h2>Browser support</h2>
-	<div class="section">
-		<p>TinyMCE uses advanced JavaScript and tries to be as smart as possible when it comes to different browsers, the main focus is on Microsoft Internet Explorer and Mozilla/Firefox. The table was reset to only show the browsers we ourselves can test on. It works with many older versions of Mozilla and Firefox. <strong>Just cause a browser is not listed on this page doesn't mean it does not work, try out the examples on our website.</strong></p>
-
-		<p>Since MacOS X 10.4 is more or less Linux we are not testing much on Linux any more, use the Sourceforge bug report system to submit bugs on the very latest browsers only.</p>
-		<p>
-			<table border="1" cellspacing="0" cellpadding="4">
-				<tr>
-					<td> </td>
-					<td>Windows XP</td>
-					<td>MacOS X 10.4</td>
-				</tr>
-				<tr>
-					<td>MSIE 6</td>
-					<td>OK</td>
-					<td> </td>
-				</tr>
-				<tr>
-					<td>MSIE 5.5 SP2</td>
-					<td>OK</td>
-					<td> </td>
-				</tr>
-				<tr>
-					<td>MSIE 5.0</td>
-					<td>OK</td>
-					<td> </td>
-				</tr>
-				<tr>
-					<td>Mozilla 1.7.x</td>
-					<td>OK</td>
-					<td>OK</td>
-				</tr>
-				<tr>
-					<td>Firefox 1.0.x</td>
-					<td>OK</td>
-					<td>OK</td>
-				</tr>
-				<tr>
-					<td>Firefox 1.5b2</td>
-					<td>OK</td>
-					<td>OK</td>
-				</tr>
-				<tr>
-					<td>Safari 2.0 (412)</td>
-					<td> </td>
-					<td>OK(1)</td>
-				</tr>
-				<tr>
-					<td>Opera 9 Preview 1</td>
-					<td>OK(1)</td>
-					<td>OK(1)</td>
-				</tr>
-			</table>
-		</p>
-		<p>
-		<ul>
-			<li>(1) - Partialy working</li>
-			<li>(2) - Buggy browser version</li>
-		</ul>
-		</p>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/compatiblity_chart.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/compatiblity_chart.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/compatiblity_chart.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/compatiblity_chart.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,84 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Compatiblity Chart</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Compatiblity Chart</h1>
+</div>
+
+<div class="content">
+	<h2>Browser support</h2>
+	<div class="section">
+		<p>TinyMCE uses advanced JavaScript and tries to be as smart as possible when it comes to different browsers, the main focus is on Microsoft Internet Explorer and Mozilla/Firefox. The table was reset to only show the browsers we ourselves can test on. It works with many older versions of Mozilla and Firefox. <strong>Just cause a browser is not listed on this page doesn't mean it does not work, try out the examples on our website.</strong></p>
+
+		<p>Since MacOS X 10.4 is more or less Linux we are not testing much on Linux any more, use the Sourceforge bug report system to submit bugs on the very latest browsers only.</p>
+		<p>
+			<table border="1" cellspacing="0" cellpadding="4">
+				<tr>
+					<td> </td>
+					<td>Windows XP</td>
+					<td>MacOS X 10.4</td>
+				</tr>
+				<tr>
+					<td>MSIE 6</td>
+					<td>OK</td>
+					<td> </td>
+				</tr>
+				<tr>
+					<td>MSIE 5.5 SP2</td>
+					<td>OK</td>
+					<td> </td>
+				</tr>
+				<tr>
+					<td>MSIE 5.0</td>
+					<td>OK</td>
+					<td> </td>
+				</tr>
+				<tr>
+					<td>Mozilla 1.7.x</td>
+					<td>OK</td>
+					<td>OK</td>
+				</tr>
+				<tr>
+					<td>Firefox 1.0.x</td>
+					<td>OK</td>
+					<td>OK</td>
+				</tr>
+				<tr>
+					<td>Firefox 1.5b2</td>
+					<td>OK</td>
+					<td>OK</td>
+				</tr>
+				<tr>
+					<td>Safari 2.0 (412)</td>
+					<td> </td>
+					<td>OK(1)</td>
+				</tr>
+				<tr>
+					<td>Opera 9 Preview 1</td>
+					<td>OK(1)</td>
+					<td>OK(1)</td>
+				</tr>
+			</table>
+		</p>
+		<p>
+		<ul>
+			<li>(1) - Partialy working</li>
+			<li>(2) - Buggy browser version</li>
+		</ul>
+		</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/credits.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/credits.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/credits.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Credits</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Credits</h1>
-</div>
-
-<div class="content">
-	<h2>Contributors</h2>
-	<div class="section">
-		<p>These are the people, companies or organizations that have contributed in some way to the TinyMCE project. If you feel we are missing someone please inform us right away and we will correct this in future versions of TinyMCE.</p>
-		<p>
-		Please note that some of these have contributed with complete language packs and some have updated parts of language packs or similar.
-		</p>
-	</div>
-	<div class="separator"></div>
-		<div class="section">
-			<p>
-			<ul>
-				<li class="list_subtitle">Code / Solutions / Features</li>
-				<ul>
-					<li>Digital Ventures</li>
-					<li>donadoni</li>
-					<li>Michael Keck</li>
-					<li>Victor Nilsson</li>
-					<li>Jürgen Baute</li>
-					<li>"Neirda"</li>
-					<li>"speednet"</li>
-					<li>Virtuelcom</li>
-					<li>"SlyD"</li>
-					<li>Ernst de Moor</li>
-					<li>"jamesw"</li>
-					<li>Vincent FIACK</li>
-					<li>Aptest</li>
-				</ul>
-				<li class="list_subtitle">Language packs</li>
-				<ul>
-					<li>Marcin Szymon Sznyra</li>
-					<li>"revyag"</li>
-					<li>Jim Kou</li>
-					<li>"Krokogras"</li>
-					<li>Hani Suleiman</li>
-					<li>Jan Moelgaard</li>
-					<li>Christopher Müller</li>
-					<li>Virtuelcom</li>
-					<li>Pavel Novák</li>
-					<li>Simon Rupf</li>
-					<li>"Fabrix Xm"</li>
-					<li>Mats Löfström, York Consulting AB</li>
-					<li>Morteza Zafari</li>
-					<li>Laurent Dran</li>
-					<li>Tobias Heer</li>
-					<li>"Innozent"</li>
-					<li>"cube316"</li>
-					<li>José Pedro Pereira</li>
-					<li>"Martin"</li>
-					<li>Sten Aksel Heien</li>
-					<li>Setzer Gabbiani</li>
-					<li>Jacaranda Bill</li>
-					<li>Pat Boens</li>
-					<li>Roman Filippov</li>
-					<li>Arnoud van Delden</li>
-				</ul>
-			</ul>
-			</p>
-			<p>There are also a few corporations that have contributed in various ways to have features developed by payed support.
-			</p>
-		</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/credits.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/credits.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/credits.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/credits.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Credits</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Credits</h1>
+</div>
+
+<div class="content">
+	<h2>Contributors</h2>
+	<div class="section">
+		<p>These are the people, companies or organizations that have contributed in some way to the TinyMCE project. If you feel we are missing someone please inform us right away and we will correct this in future versions of TinyMCE.</p>
+		<p>
+		Please note that some of these have contributed with complete language packs and some have updated parts of language packs or similar.
+		</p>
+	</div>
+	<div class="separator"></div>
+		<div class="section">
+			<p>
+			<ul>
+				<li class="list_subtitle">Code / Solutions / Features</li>
+				<ul>
+					<li>Digital Ventures</li>
+					<li>donadoni</li>
+					<li>Michael Keck</li>
+					<li>Victor Nilsson</li>
+					<li>Jürgen Baute</li>
+					<li>"Neirda"</li>
+					<li>"speednet"</li>
+					<li>Virtuelcom</li>
+					<li>"SlyD"</li>
+					<li>Ernst de Moor</li>
+					<li>"jamesw"</li>
+					<li>Vincent FIACK</li>
+					<li>Aptest</li>
+				</ul>
+				<li class="list_subtitle">Language packs</li>
+				<ul>
+					<li>Marcin Szymon Sznyra</li>
+					<li>"revyag"</li>
+					<li>Jim Kou</li>
+					<li>"Krokogras"</li>
+					<li>Hani Suleiman</li>
+					<li>Jan Moelgaard</li>
+					<li>Christopher Müller</li>
+					<li>Virtuelcom</li>
+					<li>Pavel Novák</li>
+					<li>Simon Rupf</li>
+					<li>"Fabrix Xm"</li>
+					<li>Mats Löfström, York Consulting AB</li>
+					<li>Morteza Zafari</li>
+					<li>Laurent Dran</li>
+					<li>Tobias Heer</li>
+					<li>"Innozent"</li>
+					<li>"cube316"</li>
+					<li>José Pedro Pereira</li>
+					<li>"Martin"</li>
+					<li>Sten Aksel Heien</li>
+					<li>Setzer Gabbiani</li>
+					<li>Jacaranda Bill</li>
+					<li>Pat Boens</li>
+					<li>Roman Filippov</li>
+					<li>Arnoud van Delden</li>
+				</ul>
+			</ul>
+			</p>
+			<p>There are also a few corporations that have contributed in various ways to have features developed by payed support.
+			</p>
+		</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/css/screen.css
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/css/screen.css	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/css/screen.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,168 +0,0 @@
-body {
-	background-color: #FFFFFF;
-	font-family: Verdana, Arial, helvetica, sans-serif;
-	font-size: 12px;
-}
-
-.header {
-	border: #E0E0E0 solid 1px;
-}
-
-.footer {
-	border: #E0E0E0 solid 1px;
-	height: 20px;
-}
-
-h1 {
-	font-size: 18px;
-	font-weight: bold;
-	padding: 0;
-	margin: 4px;
-}
-
-h2 {
-	font-size: 14px;
-	font-weight: bold;
-	padding: 0;
-	margin: 0;
-	margin-top: 4px;
-	margin-bottom: 4px;
-}
-
-h3 {
-	font-size: 11px;
-	font-weight: bold;
-	padding: 0;
-	margin: 0;
-	margin-bottom: 3px;
-}
-
-.section {
-	margin-left: 15px;
-}
-
-.column {
-	margin-right: 20px;
-	float: left
-}
-
-.separator {
-	border-bottom: 1px solid #E6EBF1;
-	margin-top: 10px;
-	margin-bottom: 10px;
-}
-
-p {
-}
-
-.helpindex {
-	margin-left: 20px;
-	padding-left: 0;
-}
-
-
-.optionlist {
-	margin: 0;
-	padding: 0;
-	margin-bottom: 10px;
-}
-
-.optionlist li {
-	padding: 0;
-	margin: 0;
-	margin-top: 3px;
-	margin-bottom: 3px;
-	margin-left: 10px;
-	list-style-type: none;
-}
-
-.helpindex li {
-	margin-top: 3px;
-}
-
-.content {
-	margin: 10px;
-}
-
-.example {
-	background-color: #E6EBF1;
-	margin-left: 10px;
-}
-
-code, pre {
-	margin: 0;
-	padding: 0;
-	background-color: #E6EBF1;
-}
-
-.copyright {
-	margin: 3px;
-	float: left;
-}
-
-.helpindexlink {
-	margin: 3px;
-	float: right;
-}
-
-a:visited {
-	color: #666666;
-	text-decoration: underline;
-}
-
-a:active {
-	color: #666666;
-	text-decoration: underline;
-}
-
-a:hover {
-	color: #666666;
-	text-decoration: underline;
-}
-
-a {
-	color: #666666;
-	text-decoration: underline;
-}
-
-.list_subtitle {
-	padding-top: 5px;
-}
-
-.note {
-	margin-top: 5px;
-	margin-left: 10px;
-	font-size: 10px;
-}
-
-.marked {
-	color: red;
-	font-weight: bold;
-}
-
-thead {
-	background-color: #E6EBF1;	
-}
-
-.btable {
-}
-
-.btable th {
-	border: 1px solid gray;
-	vertical-align: top;
-}
-
-.btable td {
-	border: 1px solid gray;
-	vertical-align: top;
-}
-
-.plist {
-	list-style-type: none;
-	margin: 0;
-	padding: 0;
-}
-
-.plist li {
-	padding-bottom: 3px;
-}
\ No newline at end of file

Copied: trunk/htdocs/js/tinymce/docs/css/screen.css (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/css/screen.css)
===================================================================
--- trunk/htdocs/js/tinymce/docs/css/screen.css	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/css/screen.css	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,168 @@
+body {
+	background-color: #FFFFFF;
+	font-family: Verdana, Arial, helvetica, sans-serif;
+	font-size: 12px;
+}
+
+.header {
+	border: #E0E0E0 solid 1px;
+}
+
+.footer {
+	border: #E0E0E0 solid 1px;
+	height: 20px;
+}
+
+h1 {
+	font-size: 18px;
+	font-weight: bold;
+	padding: 0;
+	margin: 4px;
+}
+
+h2 {
+	font-size: 14px;
+	font-weight: bold;
+	padding: 0;
+	margin: 0;
+	margin-top: 4px;
+	margin-bottom: 4px;
+}
+
+h3 {
+	font-size: 11px;
+	font-weight: bold;
+	padding: 0;
+	margin: 0;
+	margin-bottom: 3px;
+}
+
+.section {
+	margin-left: 15px;
+}
+
+.column {
+	margin-right: 20px;
+	float: left
+}
+
+.separator {
+	border-bottom: 1px solid #E6EBF1;
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
+
+p {
+}
+
+.helpindex {
+	margin-left: 20px;
+	padding-left: 0;
+}
+
+
+.optionlist {
+	margin: 0;
+	padding: 0;
+	margin-bottom: 10px;
+}
+
+.optionlist li {
+	padding: 0;
+	margin: 0;
+	margin-top: 3px;
+	margin-bottom: 3px;
+	margin-left: 10px;
+	list-style-type: none;
+}
+
+.helpindex li {
+	margin-top: 3px;
+}
+
+.content {
+	margin: 10px;
+}
+
+.example {
+	background-color: #E6EBF1;
+	margin-left: 10px;
+}
+
+code, pre {
+	margin: 0;
+	padding: 0;
+	background-color: #E6EBF1;
+}
+
+.copyright {
+	margin: 3px;
+	float: left;
+}
+
+.helpindexlink {
+	margin: 3px;
+	float: right;
+}
+
+a:visited {
+	color: #666666;
+	text-decoration: underline;
+}
+
+a:active {
+	color: #666666;
+	text-decoration: underline;
+}
+
+a:hover {
+	color: #666666;
+	text-decoration: underline;
+}
+
+a {
+	color: #666666;
+	text-decoration: underline;
+}
+
+.list_subtitle {
+	padding-top: 5px;
+}
+
+.note {
+	margin-top: 5px;
+	margin-left: 10px;
+	font-size: 10px;
+}
+
+.marked {
+	color: red;
+	font-weight: bold;
+}
+
+thead {
+	background-color: #E6EBF1;	
+}
+
+.btable {
+}
+
+.btable th {
+	border: 1px solid gray;
+	vertical-align: top;
+}
+
+.btable td {
+	border: 1px solid gray;
+	vertical-align: top;
+}
+
+.plist {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+}
+
+.plist li {
+	padding-bottom: 3px;
+}
\ No newline at end of file

Deleted: trunk/htdocs/js/tinymce/docs/customization_language_packs.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/customization_language_packs.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/customization_language_packs.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,57 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Customization - Creating a language pack</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Customization - Creating a language pack</h1>
-</div>
-
-<div class="content">
-	<h2>Making language packs</h2>
-	<p>Language packs are simply JavaScript name/value arrays placed in the "<ISO-639-1 code>.js" files in the "lang" directory. Remember to allways use the "lang_" prefix for these value names so that they don't override other variables in the templates. The example below shows how the cut, copy and paste texts are lang packed. Notice there are three kinds of language packs the first one is the general one shared by all themes these are located in the "jscripts/tiny_mce/langs" directory the secound ones are theme specific language packs these are contained in "jscripts/tiny_mce/themes/<some theme>/langs" and the last one is plugin specific language packs located in each plugin.
-	</p>
-	<p>
-	<div class="example">
-<pre>
-tinyMCE.addToLang('',{
-cut_desc : 'Cut (Ctrl+X)',
-copy_desc : 'Copy (Ctrl+C)',
-paste_desc : 'Paste (Ctrl+P)'
-);
-</pre>
-	</div>
-	</p>
-	<p>
-	Remember the last translation line should not have a , character at the end. The first parameter to the addToLang is the prefix to add before each variable, this was added to reduce the overall size of the language packs to reduce the overall download time.
-	</p>
-	<h3>Files to edit</h3>
-	<p>
-	When translating TinyMCE, these are the files that currently needs to be translated:
-	</p>
-	<p>
-	/tinymce/jscripts/tiny_mce/langs/en.js<br />
-	/tinymce/jscripts/tiny_mce/plugins/<plugin>/langs/en.js<br />
-	/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js<br />
-	</p>
-	<p>
-	Notice some language variables may include a name/url of a gif image or simmilar, for example the button for bold has a "F" character in the Swedish language pack. There are also relative window sizes located in the language packs, for example is the link dialog needs to be bigger inorder to fit a specific translation you can alter the width of the window by modifying these variables.
-	</p>
-	<h3>Contributing your language pack</h3>
-	<p>
-	Go to the <a href="http://sourceforge.net/tracker/?atid=635684&group_id=103281&func=browse">sourceforge patch page</a> and upload a zip containing all the language files in the correct directory structure.<br /><br />
-	Please translate all the plugins, even if you aren't using them.<br />
-	</p>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/customization_language_packs.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/customization_language_packs.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/customization_language_packs.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/customization_language_packs.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Customization - Creating a language pack</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Customization - Creating a language pack</h1>
+</div>
+
+<div class="content">
+	<h2>Making language packs</h2>
+	<p>Language packs are simply JavaScript name/value arrays placed in the "<ISO-639-1 code>.js" files in the "lang" directory. Remember to allways use the "lang_" prefix for these value names so that they don't override other variables in the templates. The example below shows how the cut, copy and paste texts are lang packed. Notice there are three kinds of language packs the first one is the general one shared by all themes these are located in the "jscripts/tiny_mce/langs" directory the secound ones are theme specific language packs these are contained in "jscripts/tiny_mce/themes/<some theme>/langs" and the last one is plugin specific language packs located in each plugin.
+	</p>
+	<p>
+	<div class="example">
+<pre>
+tinyMCE.addToLang('',{
+cut_desc : 'Cut (Ctrl+X)',
+copy_desc : 'Copy (Ctrl+C)',
+paste_desc : 'Paste (Ctrl+P)'
+);
+</pre>
+	</div>
+	</p>
+	<p>
+	Remember the last translation line should not have a , character at the end. The first parameter to the addToLang is the prefix to add before each variable, this was added to reduce the overall size of the language packs to reduce the overall download time.
+	</p>
+	<h3>Files to edit</h3>
+	<p>
+	When translating TinyMCE, these are the files that currently needs to be translated:
+	</p>
+	<p>
+	/tinymce/jscripts/tiny_mce/langs/en.js<br />
+	/tinymce/jscripts/tiny_mce/plugins/<plugin>/langs/en.js<br />
+	/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js<br />
+	</p>
+	<p>
+	Notice some language variables may include a name/url of a gif image or simmilar, for example the button for bold has a "F" character in the Swedish language pack. There are also relative window sizes located in the language packs, for example is the link dialog needs to be bigger inorder to fit a specific translation you can alter the width of the window by modifying these variables.
+	</p>
+	<h3>Contributing your language pack</h3>
+	<p>
+	Go to the <a href="http://sourceforge.net/tracker/?atid=635684&group_id=103281&func=browse">sourceforge patch page</a> and upload a zip containing all the language files in the correct directory structure.<br /><br />
+	Please translate all the plugins, even if you aren't using them.<br />
+	</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/customization_plugins.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/customization_plugins.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/customization_plugins.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,227 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Customization - Creating a plugin</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Customization - Creating a plugin</h1>
-</div>
-
-<div class="content">
-	
-<h2>Creating your own plugins</h2>
-<p>
-Creating you own plugins for the TinyMCE application is fairly easy if you know the basics of HTML, CSS and Javascript. The most easy way is to copy the "_template" directory or one of the other core plugins and work from there. The "_template" directory is a tutorial plugin that shows how to create a plugin. After you copy the template you need to change the red sections marked below to the name of your plugin this is needed so that plugins don't overlap in other words it gives the plugin a unique name.
-</p>
-<p>If you want you may add plugin specific options/settings but remember to namespace them in the following format "<your plugin>_<option>" for example "yourplugin_someoption".</p>
-<p>Specific callback functions that you don't need or doesn't do anything can be removed.</p>
-
-<div class="separator"></div>
-<h3>Plugin directory structure</h3>
-<p>
-<table class="btable">
-<thead>
-	<th>File/Directory</td>	
-	<th>Description</td>	
-</thead>
-<tbody>
-	<tr><td>css</td><td>Plugin specific CSS files</td></tr>
-	<tr><td>docs</td><td>Plugin specific documentation</td></tr>
-	<tr><td>images</td><td>Plugin specific images</td></tr>
-	<tr><td>jscripts</td><td>Plugin specific jscripts for HTML dialogs</td></tr>
-	<tr><td>langs</td><td>Plugin specific language files</td></tr>
-	<tr><td>editor_plugin.js</td><td>Editor plugin file (compressed).</td></tr>
-	<tr><td>editor_plugin_src.js</td><td>Editor plugin file (source).</td></tr>
-	<tr><td>somedialog.htm</td><td>Plugin specific dialog HTML file.</td></tr>
-</table>
-</p>
-<div class="separator"></div>
-<h3>Plugin example source</h3>
-<p>
-The example below shows a simple empty plugin and all possible callbacks.
-</p>
-<p>
-<div class="example">
-<pre>
-var TinyMCE_<span class="marked">SomeName</span>Plugin = {
-	/**
-	 * Returns information about the plugin as a name/value array.
-	 * The current keys are longname, author, authorurl, infourl and version.
-	 *
-	 * @returns Name/value array containing information about the plugin.
-	 * @type Array 
-	 */
-	getInfo : function() {
-		return {
-			longname : 'Your plugin',
-			author : 'Your name',
-			authorurl : 'http://www.yoursite.com',
-			infourl : 'http://www.yoursite.com/docs/template.html',
-			version : "1.0"
-		};
-	},
-
-	/**
-	 * Gets executed when a TinyMCE editor instance is initialized.
-	 *
-	 * @param {TinyMCE_Control} Initialized TinyMCE editor control instance. 
-	 */
-	initInstance : function(inst) {
-		// You can take out plugin specific parameters
-		alert("Initialization parameter:" + tinyMCE.getParam("<span class="marked">somename</span>_someparam", false));
-
-		// Register custom keyboard shortcut
-		inst.addShortcut('ctrl', 't', 'lang_<span class="marked">somename</span>_desc', 'mceSomeCommand');
-	},
-
-	/**
-	 * Returns the HTML code for a specific control or empty string if this plugin doesn't have that control.
-	 * A control can be a button, select list or any other HTML item to present in the TinyMCE user interface.
-	 * The variable {$editor_id} will be replaced with the current editor instance id and {$pluginurl} will be replaced
-	 * with the URL of the plugin. Language variables such as {$lang_somekey} will also be replaced with contents from
-	 * the language packs.
-	 *
-	 * @param {string} cn Editor control/button name to get HTML for.
-	 * @return HTML code for a specific control or empty string.
-	 * @type string
-	 */
-	getControlHTML : function(cn) {
-		switch (cn) {
-			case "<span class="marked">SomeControl</span>":
-				return tinyMCE.getButtonHTML(cn, 'lang_<span class="marked">someplugin</span>_<span class="marked">button</span>_desc', '{$pluginurl}/images/<span class="marked">someimage</span>.gif', '<span class="marked">mceSomeCommand</span>');
-		}
-
-		return "";
-	},
-
-	getControlHTML : function(cn) {
-		switch (cn) {
-			case "advhr":
-				return tinyMCE.getButtonHTML(cn, 'lang_insert_advhr_desc', '{$pluginurl}/images/advhr.gif', 'mceAdvancedHr');
-		}
-
-		return "";
-	},
-
-
-	/**
-	 * Executes a specific command, this function handles plugin commands.
-	 *
-	 * @param {string} editor_id TinyMCE editor instance id that issued the command.
-	 * @param {HTMLElement} element Body or root element for the editor instance.
-	 * @param {string} command Command name to be executed.
-	 * @param {string} user_interface True/false if a user interface should be presented.
-	 * @param {mixed} value Custom value argument, can be anything.
-	 * @return true/false if the command was executed by this plugin or not.
-	 * @type
-	 */
-	execCommand : function(editor_id, element, command, user_interface, value) {
-		// Handle commands
-		switch (command) {
-			// Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser.
-			case "mce<span class="marked">SomeCommand</span>":
-				// Do your custom command logic here.
-
-				return true;
-		}
-
-		// Pass to next handler in chain
-		return false;
-	},
-
-	/**
-	 * Gets called ones the cursor/selection in a TinyMCE instance changes. This is useful to enable/disable
-	 * button controls depending on where the user are and what they have selected. This method gets executed
-	 * alot and should be as performance tuned as possible.
-	 *
-	 * @param {string} editor_id TinyMCE editor instance id that was changed.
-	 * @param {HTMLNode} node Current node location, where the cursor is in the DOM tree.
-	 * @param {int} undo_index The current undo index, if this is -1 custom undo/redo is disabled.
-	 * @param {int} undo_levels The current undo levels, if this is -1 custom undo/redo is disabled.
-	 * @param {boolean} visual_aid Is visual aids enabled/disabled ex: dotted lines on tables.
-	 * @param {boolean} any_selection Is there any selection at all or is there only a cursor.
-	 */
-	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-	},
-
-	/**
-	 * Gets called when a TinyMCE editor instance gets filled with content on startup.
-	 *
-	 * @param {string} editor_id TinyMCE editor instance id that was filled with content.
-	 * @param {HTMLElement} body HTML body element of editor instance.
-	 * @param {HTMLDocument} doc HTML document instance.
-	 */
-	setupContent : function(editor_id, body, doc) {
-	},
-
-	/**
-	 * Gets called when the contents of a TinyMCE area is modified, in other words when a undo level is
-	 * added.
-	 *
-	 * @param {TinyMCE_Control} inst TinyMCE editor area control instance that got modified.
-	 */
-	onChange : function(inst) {
-	},
-
-	/**
-	 * Gets called when TinyMCE handles events such as keydown, mousedown etc. TinyMCE
-	 * doesn't listen on all types of events so custom event handling may be required for
-	 * some purposes.
-	 *
-	 * @param {Event} e HTML editor event reference.
-	 * @return true - pass to next handler in chain, false - stop chain execution
-	 * @type boolean
-	 */
-	handleEvent : function(e) {
-		return true;
-	},
-
-	/**
-	 * Gets called when HTML contents is inserted or retrived from a TinyMCE editor instance.
-	 * The type parameter contains what type of event that was performed and what format the content is in.
-	 * Possible valuses for type is get_from_editor, insert_to_editor, get_from_editor_dom, insert_to_editor_dom.
-	 *
-	 * @param {string} type Cleanup event type.
-	 * @param {mixed} content Editor contents that gets inserted/extracted can be a string or DOM element.
-	 * @param {TinyMCE_Control} inst TinyMCE editor instance control that performes the cleanup.
-	 * @return New content or the input content depending on action.
-	 * @type string
-	 */
-	cleanup : function(type, content, inst) {
-		return content;
-	},
-
-	// Private plugin internal methods
-
-	/**
-	 * This is just a internal plugin method, prefix all internal methods with a _ character.
-	 * The prefix is needed so they doesn't collide with future TinyMCE callback functions.
-	 *
-	 * @param {string} a Some arg1.
-	 * @param {string} b Some arg2.
-	 * @return Some return.
-	 * @type string
-	 */
-	_someInternalFunction : function(a, b) {
-		return 1;
-	}
-};
-
-// Adds the plugin class to the list of available TinyMCE plugins
-tinyMCE.addPlugin("<span class="marked">someplugin</span>", TinyMCE_<span class="marked">SomePlugin</span>Plugin);
-</pre>
-</div>
-</p>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/customization_plugins.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/customization_plugins.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/customization_plugins.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/customization_plugins.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,227 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Customization - Creating a plugin</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Customization - Creating a plugin</h1>
+</div>
+
+<div class="content">
+	
+<h2>Creating your own plugins</h2>
+<p>
+Creating you own plugins for the TinyMCE application is fairly easy if you know the basics of HTML, CSS and Javascript. The most easy way is to copy the "_template" directory or one of the other core plugins and work from there. The "_template" directory is a tutorial plugin that shows how to create a plugin. After you copy the template you need to change the red sections marked below to the name of your plugin this is needed so that plugins don't overlap in other words it gives the plugin a unique name.
+</p>
+<p>If you want you may add plugin specific options/settings but remember to namespace them in the following format "<your plugin>_<option>" for example "yourplugin_someoption".</p>
+<p>Specific callback functions that you don't need or doesn't do anything can be removed.</p>
+
+<div class="separator"></div>
+<h3>Plugin directory structure</h3>
+<p>
+<table class="btable">
+<thead>
+	<th>File/Directory</td>	
+	<th>Description</td>	
+</thead>
+<tbody>
+	<tr><td>css</td><td>Plugin specific CSS files</td></tr>
+	<tr><td>docs</td><td>Plugin specific documentation</td></tr>
+	<tr><td>images</td><td>Plugin specific images</td></tr>
+	<tr><td>jscripts</td><td>Plugin specific jscripts for HTML dialogs</td></tr>
+	<tr><td>langs</td><td>Plugin specific language files</td></tr>
+	<tr><td>editor_plugin.js</td><td>Editor plugin file (compressed).</td></tr>
+	<tr><td>editor_plugin_src.js</td><td>Editor plugin file (source).</td></tr>
+	<tr><td>somedialog.htm</td><td>Plugin specific dialog HTML file.</td></tr>
+</table>
+</p>
+<div class="separator"></div>
+<h3>Plugin example source</h3>
+<p>
+The example below shows a simple empty plugin and all possible callbacks.
+</p>
+<p>
+<div class="example">
+<pre>
+var TinyMCE_<span class="marked">SomeName</span>Plugin = {
+	/**
+	 * Returns information about the plugin as a name/value array.
+	 * The current keys are longname, author, authorurl, infourl and version.
+	 *
+	 * @returns Name/value array containing information about the plugin.
+	 * @type Array 
+	 */
+	getInfo : function() {
+		return {
+			longname : 'Your plugin',
+			author : 'Your name',
+			authorurl : 'http://www.yoursite.com',
+			infourl : 'http://www.yoursite.com/docs/template.html',
+			version : "1.0"
+		};
+	},
+
+	/**
+	 * Gets executed when a TinyMCE editor instance is initialized.
+	 *
+	 * @param {TinyMCE_Control} Initialized TinyMCE editor control instance. 
+	 */
+	initInstance : function(inst) {
+		// You can take out plugin specific parameters
+		alert("Initialization parameter:" + tinyMCE.getParam("<span class="marked">somename</span>_someparam", false));
+
+		// Register custom keyboard shortcut
+		inst.addShortcut('ctrl', 't', 'lang_<span class="marked">somename</span>_desc', 'mceSomeCommand');
+	},
+
+	/**
+	 * Returns the HTML code for a specific control or empty string if this plugin doesn't have that control.
+	 * A control can be a button, select list or any other HTML item to present in the TinyMCE user interface.
+	 * The variable {$editor_id} will be replaced with the current editor instance id and {$pluginurl} will be replaced
+	 * with the URL of the plugin. Language variables such as {$lang_somekey} will also be replaced with contents from
+	 * the language packs.
+	 *
+	 * @param {string} cn Editor control/button name to get HTML for.
+	 * @return HTML code for a specific control or empty string.
+	 * @type string
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "<span class="marked">SomeControl</span>":
+				return tinyMCE.getButtonHTML(cn, 'lang_<span class="marked">someplugin</span>_<span class="marked">button</span>_desc', '{$pluginurl}/images/<span class="marked">someimage</span>.gif', '<span class="marked">mceSomeCommand</span>');
+		}
+
+		return "";
+	},
+
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "advhr":
+				return tinyMCE.getButtonHTML(cn, 'lang_insert_advhr_desc', '{$pluginurl}/images/advhr.gif', 'mceAdvancedHr');
+		}
+
+		return "";
+	},
+
+
+	/**
+	 * Executes a specific command, this function handles plugin commands.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that issued the command.
+	 * @param {HTMLElement} element Body or root element for the editor instance.
+	 * @param {string} command Command name to be executed.
+	 * @param {string} user_interface True/false if a user interface should be presented.
+	 * @param {mixed} value Custom value argument, can be anything.
+	 * @return true/false if the command was executed by this plugin or not.
+	 * @type
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			// Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser.
+			case "mce<span class="marked">SomeCommand</span>":
+				// Do your custom command logic here.
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	/**
+	 * Gets called ones the cursor/selection in a TinyMCE instance changes. This is useful to enable/disable
+	 * button controls depending on where the user are and what they have selected. This method gets executed
+	 * alot and should be as performance tuned as possible.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was changed.
+	 * @param {HTMLNode} node Current node location, where the cursor is in the DOM tree.
+	 * @param {int} undo_index The current undo index, if this is -1 custom undo/redo is disabled.
+	 * @param {int} undo_levels The current undo levels, if this is -1 custom undo/redo is disabled.
+	 * @param {boolean} visual_aid Is visual aids enabled/disabled ex: dotted lines on tables.
+	 * @param {boolean} any_selection Is there any selection at all or is there only a cursor.
+	 */
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+	},
+
+	/**
+	 * Gets called when a TinyMCE editor instance gets filled with content on startup.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was filled with content.
+	 * @param {HTMLElement} body HTML body element of editor instance.
+	 * @param {HTMLDocument} doc HTML document instance.
+	 */
+	setupContent : function(editor_id, body, doc) {
+	},
+
+	/**
+	 * Gets called when the contents of a TinyMCE area is modified, in other words when a undo level is
+	 * added.
+	 *
+	 * @param {TinyMCE_Control} inst TinyMCE editor area control instance that got modified.
+	 */
+	onChange : function(inst) {
+	},
+
+	/**
+	 * Gets called when TinyMCE handles events such as keydown, mousedown etc. TinyMCE
+	 * doesn't listen on all types of events so custom event handling may be required for
+	 * some purposes.
+	 *
+	 * @param {Event} e HTML editor event reference.
+	 * @return true - pass to next handler in chain, false - stop chain execution
+	 * @type boolean
+	 */
+	handleEvent : function(e) {
+		return true;
+	},
+
+	/**
+	 * Gets called when HTML contents is inserted or retrived from a TinyMCE editor instance.
+	 * The type parameter contains what type of event that was performed and what format the content is in.
+	 * Possible valuses for type is get_from_editor, insert_to_editor, get_from_editor_dom, insert_to_editor_dom.
+	 *
+	 * @param {string} type Cleanup event type.
+	 * @param {mixed} content Editor contents that gets inserted/extracted can be a string or DOM element.
+	 * @param {TinyMCE_Control} inst TinyMCE editor instance control that performes the cleanup.
+	 * @return New content or the input content depending on action.
+	 * @type string
+	 */
+	cleanup : function(type, content, inst) {
+		return content;
+	},
+
+	// Private plugin internal methods
+
+	/**
+	 * This is just a internal plugin method, prefix all internal methods with a _ character.
+	 * The prefix is needed so they doesn't collide with future TinyMCE callback functions.
+	 *
+	 * @param {string} a Some arg1.
+	 * @param {string} b Some arg2.
+	 * @return Some return.
+	 * @type string
+	 */
+	_someInternalFunction : function(a, b) {
+		return 1;
+	}
+};
+
+// Adds the plugin class to the list of available TinyMCE plugins
+tinyMCE.addPlugin("<span class="marked">someplugin</span>", TinyMCE_<span class="marked">SomePlugin</span>Plugin);
+</pre>
+</div>
+</p>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/customization_themes.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/customization_themes.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/customization_themes.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,262 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Customization - Creating a theme</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Customization - Creating a theme</h1>
-</div>
-
-<div class="content">
-<h2>Creating your own Themes</h2>
-<p>
-Creating you own themes for the TinyMCE application is fairly easy if you know the basics of HTML, CSS and Javascript. The most easy way is to copy the "simple" or the "advanced" template and rename it as your own name to for example "mytheme". After you copy the template you need to change the red sections marked below to "mytheme" this is needed so that themes don't overlap in other words it gives the theme a unique name. Then just alter the HTML code as you see fit but notice some elements needs to be there so check the docs below on each function also remember that your custom themes needs to be located in tiny_mce's "themes" directory. If you want you may add theme specific options/settings but remember to namespace them in the following format "theme_<your theme>_<option>".
-</p>
-<div class="separator"></div>
-<h3>Theme directory structure</h3>
-<p>
-<table class="btable">
-<thead>
-	<th>File/Directory</td>	
-	<th>Description</td>	
-</thead>
-<tbody>
-	<tr><td>css</td><td>Theme specific CSS files</td></tr>
-	<tr><td>docs</td><td>Theme specific documentation</td></tr>
-	<tr><td>images</td><td>Theme specific images</td></tr>
-	<tr><td>jscripts</td><td>Theme specific jscripts for HTML dialogs</td></tr>
-	<tr><td>langs</td><td>Theme specific language files</td></tr>
-	<tr><td>editor_template.js</td><td>Editor theme template file (compressed).</td></tr>
-	<tr><td>editor_template_src.js</td><td>Editor theme template file (source).</td></tr>
-	<tr><td>somedialog.htm</td><td>Theme specific dialog HTML file.</td></tr>
-</table>
-</p>
-<div class="separator"></div>
-<h3>Theme example source</h3>
-<p>
-The example below shows a simple empty theme and all possible callbacks.
-</p>
-<p>
-<div class="example">
-<pre>
-var TinyMCE_<span class="marked">SomeName</span>Theme = {
-	/**
-	 * Returns information about the theme as a name/value array.
-	 * The current keys are longname, author, authorurl, infourl and version.
-	 *
-	 * @returns Name/value array containing information about the theme.
-	 * @type Array 
-	 */
-	getInfo : function() {
-		return {
-			longname : 'Your Theme',
-			author : 'Your name',
-			authorurl : 'http://www.yoursite.com',
-			infourl : 'http://www.yoursite.com/docs/template.html',
-			version : "1.0"
-		};
-	},
-
-	/**
-	 * Gets executed when a TinyMCE editor instance is initialized.
-	 *
-	 * @param {TinyMCE_Control} Initialized TinyMCE editor control instance. 
-	 */
-	initInstance : function(inst) {
-		// You can take out theme specific parameters
-		alert("Initialization parameter:" + tinyMCE.getParam("<span class="marked">somename</span>_someparam", false));
-
-		// Register custom keyboard shortcut
-		inst.addShortcut('ctrl', 't', 'lang_<span class="marked">somename</span>_desc', 'mceSomeCommand');
-	},
-
-	/**
-	 * Returns the HTML code for a specific control or empty string if this theme doesn't have that control.
-	 * A control can be a button, select list or any other HTML item to present in the TinyMCE user interface.
-	 * The variable {$editor_id} will be replaced with the current editor instance id and {$themeurl} will be replaced
-	 * with the URL of the theme. Language variables such as {$lang_somekey} will also be replaced with contents from
-	 * the language packs.
-	 *
-	 * @param {string} cn Editor control/button name to get HTML for.
-	 * @return HTML code for a specific control or empty string.
-	 * @type string
-	 */
-	getControlHTML : function(cn) {
-		switch (cn) {
-			case "<span class="marked">SomeControl</span>":
-				return tinyMCE.getButtonHTML(cn, 'lang_<span class="marked">sometheme</span>_<span class="marked">button</span>_desc', '{$themeurl}/images/<span class="marked">someimage</span>.gif', '<span class="marked">mceSomeCommand</span>');
-		}
-
-		return "";
-	},
-
-	/**
-	 * Returns the HTML code that should be inserted for a specific editor instance.
-	 * This function should return a name/value array with three items html, delta_width, delta_height.
-	 * The html item should contain the HTML code to insert as a editor instance.
-	 * The variable {$editor_id} will be replaced with the current editor instance id and {$themeurl} will be replaced
-	 * with the URL of the theme. Language variables such as {$lang_somekey} will also be replaced with contents from
-	 * the language packs. Any element with the id {$editor_id} will be replaced with the editor iframe element.
-	 * The {$width} and {$height} variables will be replaced with the editors outside dimension values.
-	 * The delta_width/height is the relative width/height in pixels to add or remove from the iframe dimensions.
-	 *
-	 * @param {Array} settings Name/Value array instance settings.
-	 * @param {string} editor_id TinMYCE editor control instance id.
-	 * @return Name/Value array of editor template data.
-	 * @type Array
-	 */
-	getEditorTemplate : function(settings, editor_id) {
-		var html = "";
-
-		// Build toolbar and editor instance
-		html += "..";
-
-		return {
-			html : html,
-			delta_width : 0,
-			delta_height : 0
-		};
-	},
-
-	/**
-	 * Executes a specific command, this function handles theme commands.
-	 *
-	 * @param {string} editor_id TinyMCE editor instance id that issued the command.
-	 * @param {HTMLElement} element Body or root element for the editor instance.
-	 * @param {string} command Command name to be executed.
-	 * @param {string} user_interface True/false if a user interface should be presented.
-	 * @param {mixed} value Custom value argument, can be anything.
-	 * @return true/false if the command was executed by this theme or not.
-	 * @type
-	 */
-	execCommand : function(editor_id, element, command, user_interface, value) {
-		// Handle commands
-		switch (command) {
-			// Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser.
-			case "mce<span class="marked">SomeCommand</span>":
-				// Do your custom command logic here.
-
-				return true;
-		}
-
-		// Pass to next handler in chain
-		return false;
-	},
-
-	/**
-	 * Gets called ones the cursor/selection in a TinyMCE instance changes. This is useful to enable/disable
-	 * button controls depending on where the user are and what they have selected. This method gets executed
-	 * alot and should be as performance tuned as possible.
-	 *
-	 * @param {string} editor_id TinyMCE editor instance id that was changed.
-	 * @param {HTMLNode} node Current node location, where the cursor is in the DOM tree.
-	 * @param {int} undo_index The current undo index, if this is -1 custom undo/redo is disabled.
-	 * @param {int} undo_levels The current undo levels, if this is -1 custom undo/redo is disabled.
-	 * @param {boolean} visual_aid Is visual aids enabled/disabled ex: dotted lines on tables.
-	 * @param {boolean} any_selection Is there any selection at all or is there only a cursor.
-	 */
-	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
-	},
-
-	/**
-	 * Gets called when a TinyMCE editor instance gets filled with content on startup.
-	 *
-	 * @param {string} editor_id TinyMCE editor instance id that was filled with content.
-	 * @param {HTMLElement} body HTML body element of editor instance.
-	 * @param {HTMLDocument} doc HTML document instance.
-	 */
-	setupContent : function(editor_id, body, doc) {
-	},
-
-	/**
-	 * Gets called when the contents of a TinyMCE area is modified, in other words when a undo level is
-	 * added.
-	 *
-	 * @param {TinyMCE_Control} inst TinyMCE editor area control instance that got modified.
-	 */
-	onChange : function(inst) {
-	},
-
-	/**
-	 * Gets called when TinyMCE handles events such as keydown, mousedown etc. TinyMCE
-	 * doesn't listen on all types of events so custom event handling may be required for
-	 * some purposes.
-	 *
-	 * @param {Event} e HTML editor event reference.
-	 * @return true - pass to next handler in chain, false - stop chain execution
-	 * @type boolean
-	 */
-	handleEvent : function(e) {
-		return true;
-	},
-
-	/**
-	 * Gets called when HTML contents is inserted or retrived from a TinyMCE editor instance.
-	 * The type parameter contains what type of event that was performed and what format the content is in.
-	 * Possible valuses for type is get_from_editor, insert_to_editor, get_from_editor_dom, insert_to_editor_dom.
-	 *
-	 * @param {string} type Cleanup event type.
-	 * @param {mixed} content Editor contents that gets inserted/extracted can be a string or DOM element.
-	 * @param {TinyMCE_Control} inst TinyMCE editor instance control that performes the cleanup.
-	 * @return New content or the input content depending on action.
-	 * @type string
-	 */
-	cleanup : function(type, content, inst) {
-		return content;
-	},
-
-	// Private theme internal methods
-
-	/**
-	 * This is just a internal theme method, prefix all internal methods with a _ character.
-	 * The prefix is needed so they doesn't collide with future TinyMCE callback functions.
-	 *
-	 * @param {string} a Some arg1.
-	 * @param {string} b Some arg2.
-	 * @return Some return.
-	 * @type string
-	 */
-	_someInternalFunction : function(a, b) {
-		return 1;
-	}
-};
-
-// Adds the theme class to the list of available TinyMCE themes
-tinyMCE.addTheme("<span class="marked">sometheme</span>", TinyMCE_<span class="marked">SomeTheme</span>Theme);
-</pre>
-</div>
-</p>
-<div class="separator"></div>
-
-<h3>Creating popup HTML files</h3>
-<p>
-When creating a popup you need to include the "tiny_mce_popup.js" this enables you to retrive the tinyMCE global instance in all popup windows. All variables and language definitions gets replaced in the page when it loads. So language variables such as {$lang_something} can be places in the HTML code, if you need to get a language string in JavaScript simply use the tinyMCE.getLang function.
-</p>
-<h3>Example of simple popup file:</h3>
-<div class="example">
-<pre>
-<html>
-<head>
-<title>{$lang_theme_sample_title}</title>
-<script language="javascript" src="../../tiny_mce_popup.js"></script>
-<script language="javascript">
-     // getWindowArg returns any arguments passed to the window
-     alert(tinyMCE.getWindowArg('some_arg'));
-</script>
-<body>
-     <strong>{$lang_theme_sample_desc}</strong>
-</body>
-</pre>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/customization_themes.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/customization_themes.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/customization_themes.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/customization_themes.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,262 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Customization - Creating a theme</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Customization - Creating a theme</h1>
+</div>
+
+<div class="content">
+<h2>Creating your own Themes</h2>
+<p>
+Creating you own themes for the TinyMCE application is fairly easy if you know the basics of HTML, CSS and Javascript. The most easy way is to copy the "simple" or the "advanced" template and rename it as your own name to for example "mytheme". After you copy the template you need to change the red sections marked below to "mytheme" this is needed so that themes don't overlap in other words it gives the theme a unique name. Then just alter the HTML code as you see fit but notice some elements needs to be there so check the docs below on each function also remember that your custom themes needs to be located in tiny_mce's "themes" directory. If you want you may add theme specific options/settings but remember to namespace them in the following format "theme_<your theme>_<option>".
+</p>
+<div class="separator"></div>
+<h3>Theme directory structure</h3>
+<p>
+<table class="btable">
+<thead>
+	<th>File/Directory</td>	
+	<th>Description</td>	
+</thead>
+<tbody>
+	<tr><td>css</td><td>Theme specific CSS files</td></tr>
+	<tr><td>docs</td><td>Theme specific documentation</td></tr>
+	<tr><td>images</td><td>Theme specific images</td></tr>
+	<tr><td>jscripts</td><td>Theme specific jscripts for HTML dialogs</td></tr>
+	<tr><td>langs</td><td>Theme specific language files</td></tr>
+	<tr><td>editor_template.js</td><td>Editor theme template file (compressed).</td></tr>
+	<tr><td>editor_template_src.js</td><td>Editor theme template file (source).</td></tr>
+	<tr><td>somedialog.htm</td><td>Theme specific dialog HTML file.</td></tr>
+</table>
+</p>
+<div class="separator"></div>
+<h3>Theme example source</h3>
+<p>
+The example below shows a simple empty theme and all possible callbacks.
+</p>
+<p>
+<div class="example">
+<pre>
+var TinyMCE_<span class="marked">SomeName</span>Theme = {
+	/**
+	 * Returns information about the theme as a name/value array.
+	 * The current keys are longname, author, authorurl, infourl and version.
+	 *
+	 * @returns Name/value array containing information about the theme.
+	 * @type Array 
+	 */
+	getInfo : function() {
+		return {
+			longname : 'Your Theme',
+			author : 'Your name',
+			authorurl : 'http://www.yoursite.com',
+			infourl : 'http://www.yoursite.com/docs/template.html',
+			version : "1.0"
+		};
+	},
+
+	/**
+	 * Gets executed when a TinyMCE editor instance is initialized.
+	 *
+	 * @param {TinyMCE_Control} Initialized TinyMCE editor control instance. 
+	 */
+	initInstance : function(inst) {
+		// You can take out theme specific parameters
+		alert("Initialization parameter:" + tinyMCE.getParam("<span class="marked">somename</span>_someparam", false));
+
+		// Register custom keyboard shortcut
+		inst.addShortcut('ctrl', 't', 'lang_<span class="marked">somename</span>_desc', 'mceSomeCommand');
+	},
+
+	/**
+	 * Returns the HTML code for a specific control or empty string if this theme doesn't have that control.
+	 * A control can be a button, select list or any other HTML item to present in the TinyMCE user interface.
+	 * The variable {$editor_id} will be replaced with the current editor instance id and {$themeurl} will be replaced
+	 * with the URL of the theme. Language variables such as {$lang_somekey} will also be replaced with contents from
+	 * the language packs.
+	 *
+	 * @param {string} cn Editor control/button name to get HTML for.
+	 * @return HTML code for a specific control or empty string.
+	 * @type string
+	 */
+	getControlHTML : function(cn) {
+		switch (cn) {
+			case "<span class="marked">SomeControl</span>":
+				return tinyMCE.getButtonHTML(cn, 'lang_<span class="marked">sometheme</span>_<span class="marked">button</span>_desc', '{$themeurl}/images/<span class="marked">someimage</span>.gif', '<span class="marked">mceSomeCommand</span>');
+		}
+
+		return "";
+	},
+
+	/**
+	 * Returns the HTML code that should be inserted for a specific editor instance.
+	 * This function should return a name/value array with three items html, delta_width, delta_height.
+	 * The html item should contain the HTML code to insert as a editor instance.
+	 * The variable {$editor_id} will be replaced with the current editor instance id and {$themeurl} will be replaced
+	 * with the URL of the theme. Language variables such as {$lang_somekey} will also be replaced with contents from
+	 * the language packs. Any element with the id {$editor_id} will be replaced with the editor iframe element.
+	 * The {$width} and {$height} variables will be replaced with the editors outside dimension values.
+	 * The delta_width/height is the relative width/height in pixels to add or remove from the iframe dimensions.
+	 *
+	 * @param {Array} settings Name/Value array instance settings.
+	 * @param {string} editor_id TinMYCE editor control instance id.
+	 * @return Name/Value array of editor template data.
+	 * @type Array
+	 */
+	getEditorTemplate : function(settings, editor_id) {
+		var html = "";
+
+		// Build toolbar and editor instance
+		html += "..";
+
+		return {
+			html : html,
+			delta_width : 0,
+			delta_height : 0
+		};
+	},
+
+	/**
+	 * Executes a specific command, this function handles theme commands.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that issued the command.
+	 * @param {HTMLElement} element Body or root element for the editor instance.
+	 * @param {string} command Command name to be executed.
+	 * @param {string} user_interface True/false if a user interface should be presented.
+	 * @param {mixed} value Custom value argument, can be anything.
+	 * @return true/false if the command was executed by this theme or not.
+	 * @type
+	 */
+	execCommand : function(editor_id, element, command, user_interface, value) {
+		// Handle commands
+		switch (command) {
+			// Remember to have the "mce" prefix for commands so they don't intersect with built in ones in the browser.
+			case "mce<span class="marked">SomeCommand</span>":
+				// Do your custom command logic here.
+
+				return true;
+		}
+
+		// Pass to next handler in chain
+		return false;
+	},
+
+	/**
+	 * Gets called ones the cursor/selection in a TinyMCE instance changes. This is useful to enable/disable
+	 * button controls depending on where the user are and what they have selected. This method gets executed
+	 * alot and should be as performance tuned as possible.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was changed.
+	 * @param {HTMLNode} node Current node location, where the cursor is in the DOM tree.
+	 * @param {int} undo_index The current undo index, if this is -1 custom undo/redo is disabled.
+	 * @param {int} undo_levels The current undo levels, if this is -1 custom undo/redo is disabled.
+	 * @param {boolean} visual_aid Is visual aids enabled/disabled ex: dotted lines on tables.
+	 * @param {boolean} any_selection Is there any selection at all or is there only a cursor.
+	 */
+	handleNodeChange : function(editor_id, node, undo_index, undo_levels, visual_aid, any_selection) {
+	},
+
+	/**
+	 * Gets called when a TinyMCE editor instance gets filled with content on startup.
+	 *
+	 * @param {string} editor_id TinyMCE editor instance id that was filled with content.
+	 * @param {HTMLElement} body HTML body element of editor instance.
+	 * @param {HTMLDocument} doc HTML document instance.
+	 */
+	setupContent : function(editor_id, body, doc) {
+	},
+
+	/**
+	 * Gets called when the contents of a TinyMCE area is modified, in other words when a undo level is
+	 * added.
+	 *
+	 * @param {TinyMCE_Control} inst TinyMCE editor area control instance that got modified.
+	 */
+	onChange : function(inst) {
+	},
+
+	/**
+	 * Gets called when TinyMCE handles events such as keydown, mousedown etc. TinyMCE
+	 * doesn't listen on all types of events so custom event handling may be required for
+	 * some purposes.
+	 *
+	 * @param {Event} e HTML editor event reference.
+	 * @return true - pass to next handler in chain, false - stop chain execution
+	 * @type boolean
+	 */
+	handleEvent : function(e) {
+		return true;
+	},
+
+	/**
+	 * Gets called when HTML contents is inserted or retrived from a TinyMCE editor instance.
+	 * The type parameter contains what type of event that was performed and what format the content is in.
+	 * Possible valuses for type is get_from_editor, insert_to_editor, get_from_editor_dom, insert_to_editor_dom.
+	 *
+	 * @param {string} type Cleanup event type.
+	 * @param {mixed} content Editor contents that gets inserted/extracted can be a string or DOM element.
+	 * @param {TinyMCE_Control} inst TinyMCE editor instance control that performes the cleanup.
+	 * @return New content or the input content depending on action.
+	 * @type string
+	 */
+	cleanup : function(type, content, inst) {
+		return content;
+	},
+
+	// Private theme internal methods
+
+	/**
+	 * This is just a internal theme method, prefix all internal methods with a _ character.
+	 * The prefix is needed so they doesn't collide with future TinyMCE callback functions.
+	 *
+	 * @param {string} a Some arg1.
+	 * @param {string} b Some arg2.
+	 * @return Some return.
+	 * @type string
+	 */
+	_someInternalFunction : function(a, b) {
+		return 1;
+	}
+};
+
+// Adds the theme class to the list of available TinyMCE themes
+tinyMCE.addTheme("<span class="marked">sometheme</span>", TinyMCE_<span class="marked">SomeTheme</span>Theme);
+</pre>
+</div>
+</p>
+<div class="separator"></div>
+
+<h3>Creating popup HTML files</h3>
+<p>
+When creating a popup you need to include the "tiny_mce_popup.js" this enables you to retrive the tinyMCE global instance in all popup windows. All variables and language definitions gets replaced in the page when it loads. So language variables such as {$lang_something} can be places in the HTML code, if you need to get a language string in JavaScript simply use the tinyMCE.getLang function.
+</p>
+<h3>Example of simple popup file:</h3>
+<div class="example">
+<pre>
+<html>
+<head>
+<title>{$lang_theme_sample_title}</title>
+<script language="javascript" src="../../tiny_mce_popup.js"></script>
+<script language="javascript">
+     // getWindowArg returns any arguments passed to the window
+     alert(tinyMCE.getWindowArg('some_arg'));
+</script>
+<body>
+     <strong>{$lang_theme_sample_desc}</strong>
+</body>
+</pre>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/faq.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/faq.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/faq.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,220 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Frequently Asked Questions</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Frequently Asked Questions</h1>
-</div>
-
-<div class="content">
-	<p>Here are some common answers to common questions. If you need more help you can always visit the <a href="http://tinymce.moxiecode.com/">TinyMCE Forum</a> on the TinyMCE web site.</p>
-	<p>
-		<ul class="plist">
-			<li><a href="#broken">TinyMCE is broken, what should I do?</a></li>
-			<li><a href="#paths">Why is my paths incorrect, I want absolute/relative URLs?</a></li>
-			<li><a href="#strip">Why does TinyMCE strip aways attributes or tags from my source?</a></li>
-			<li><a href="#font">How do I change the default font size/face color of the editor?</a></li>
-			<li><a href="#remove">How do I remove/add buttons/controls to TinyMCE?</a></li>
-			<li><a href="#quotes">Why does my HTML output include lots of \" like <a href=\"mylink.htm\">link</a>?</a></li>
-			<li><a href="#load">TinyMCE takes ages to load, is there a way to make it load quicker?</a></li>
-			<li><a href="#hidden">TinyMCE stops working when placed in tabs or hidden divs?</a></li>
-			<li><a href="#commercial">Can I use TinyMCE in my commercial application?</a></li>
-			<li><a href="#commercial2">Are there any restrictions to using TinyMCE in my commercial application?</a></li>
-			<li><a href="#lgpl">I don't like LGPL, is there a commercial license available for me?</a></li>
-			<li><a href="#support">Do you provide support?</a></li>
-			<li><a href="#who">Who made this software?</a></li>
-		</ul>
-	</p>
-
-	<div class="separator"></div>
-
-	<a name="broken"></a>
-	<h2>TinyMCE is broken, what should I do?</h2>
-	<div class="section">
-		<p>There are a few things you should check before posting questions about your problem at the forum or sourceforge.</p>
-		<p>
-			<ul>
-				<li>Does TinyMCE work on the <a href="http://tinymce.moxiecode.com/example_full.php?example=true">TinyMCE website</a>. Then you know that TinyMCE works with your browser.</li>
-				<li>Try to disable any other JavaScripts on the page, some scripts interfere with internal functions that TinyMCE uses. Those scripts are probably poorly written.</li>
-				<li>Check that you havn't missed removing the last , character in your initialization code and that all the other rows have a trailing , character.</li>
-				<li>Verify that the path/URL to TinyMCE is correct, you can use the excellent tool <a href="http://www.fiddlertool.com/fiddler/">Fiddler</a> for this and other HTTP debugging.</li>
-				<li>Do not cross domain load TinyMCE or any other script unless you really really must, since this will invoke various browser security features. In other words, try placing everything on the same server.</li>
-				<li>Don't place textareas within paragraph elements since this is not valid HTML and it will break MSIE and TinyMCE.</li>
-			</ul>
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="paths"></a>
-	<h2>Why is my paths incorrect, I want absolute/relative URLs?</h2>
-	<div class="section">
-		<p>
-			These are the diffrent configuration scenarios for URLs within TinyMCE:
-			<table class="btable">
-				<thead>
-					<th>Output</th>
-					<th>Config</th>
-					<th>Description</th>
-				</thead>
-				<tbody>
-					<tr>
-						<td><strong>http://www.site.com/path1/path2/file.htm</strong> will be converted to <strong>path2/file.htm</strong></td>
-						<td nowrap="nowrap">
-<a href="option_relative_urls.html">relative_urls</a> : true,<br />
-<a href="option_document_base_url.html">document_base_url</a> : "http://www.site.com/path1/"<br />
-</td>
-						<td>This will convert all URLs within the same domain to relative URLs.<br /> <strong>The URLs will be relative from the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
-					</tr>
-
-					<tr>
-						<td><strong>path2/file.htm</strong> will be converted to <strong>/path1/path2/file.htm</strong></td>
-						<td nowrap="nowrap">
-<a href="option_relative_urls.html">relative_urls</a> : false,<br />
-<a href="option_remove_script_host.html">remove_script_host</a> : true,<br />
-<a href="option_document_base_url.html">document_base_url</a> : "http://www.site.com/path1/"<br />
-</td>
-						<td>This will convert all relative URLs to absolute URLs.<br /> <strong>The URLs will be absolute based on the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
-					</tr>
-
-					<tr>
-						<td><strong>path2/file.htm</strong> will be converted to <strong>http://www.site.com/path1/path2/file.htm</strong></td>
-						<td nowrap="nowrap">
-<a href="option_relative_urls.html">relative_urls</a> : false,<br />
-<a href="option_remove_script_host.html">remove_script_host</a> : false,<br />
-<a href="option_document_base_url.html">document_base_url</a> : "http://www.site.com/path1/"<br />
-</td>
-						<td>This will convert all relative URLs to absolute URLs.<br /> <strong>The URLs will be absolute based on the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
-					</tr>
-
-					<tr>
-						<td><strong>path2/file.htm</strong> or <strong>http://www.site.com/path1/path2/file.htm</strong> will not be converted at all.</td>
-						<td nowrap="nowrap">
-<a href="option_convert_urls.html">convert_urls</a> : false<br />
-</td>
-						<td>This option will preserve the URLs as they are in a separate attribute while editing, <strong>since browsers tend to auto convert URLs</strong>.</td>
-					</tr>
-
-				</tbody>
-			</table>
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="strip"></a>
-	<h2>Why does TinyMCE strip aways attributes or tags from my source?</h2>
-	<div class="section">
-		<p>You need to check out the "<a href="option_valid_elements.html">valid_elements</a>" and "<a href="option_extended_valid_elements.html">extended_valid_elements</a>" option in the configuration. By default, TinyMCE only allows certain tags and attributes. TinyMCE also tries to follow the XHTML specification as much as possible (and so should you), this can cause some unexpected source changes, there are however configuration options to battle this issue, study the configuration options in details.</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="font"></a>
-	<h2>How do I change the default font size/face color of the editor?</h2>
-	<div class="section">
-		<p>
-			We recommend that you have a look at the <a href="option_content_css.html">content_css</a> option, this enables you to switch the CSS file TinyMCE uses for it's editing area with a file with your CSS rules for font size and so forth.
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="remove"></a>
-	<h2>How do I remove/add buttons/controls to TinyMCE?</h2>
-	<div class="section">
-		<p>
-			There are quite a few options for this but a reference of all available buttons/control names can be found in the <a href="reference_buttons.html">button/control reference</a>.
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="quotes"></a>
-	<h2>Why does my HTML output include lots of \" like <a href=\"mylink.htm\">link</a>?</h2>
-	<div class="section">
-		<p>This is probably because you are using PHP and it has a feature that's called magic quotes that is enabled by default. You can read more about this at the <a href="http://se2.php.net/magic_quotes/">PHP website</a> or use the <a href="http://www.php.net/manual/en/function.stripslashes.php">stripslashes</a> function.</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="load"></a>
-	<h2>TinyMCE takes ages to load, is there a way to make it load quicker?</h2>
-	<div class="section">
-		<p>
-			If you use PHP on your server you can use tiny_mce_gzip.php instead of tiny_mce.js in page script call. This PHP file bundles all .js files together into two HTTP requests instead of one for each plugin, language file and theme and it also GZip compresses these files.
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="hidden"></a>
-	<h2>TinyMCE stops working when placed in tabs or hidden divs?</h2>
-	<div class="section">
-		<p>Since Gecko based browsers Mozilla/Firefox has a bug where it looses designMode on iframes that are hidden a special option is needed that re-enables the design mode when reappearing after being hidden. Enable this option to resolve the issue: "<a href="option_auto_reset_designmode.html">auto_reset_designmode</a>".</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="commercial"></a>
-	<h2>Can I use TinyMCE in my commercial application?</h2>
-	<div class="section">
-		<p>Yes you can, the LGPL license is a Free Software License. You can read the whole license <a href="license.html">here</a> or visit Free Software Foundation web site <a href="http://www.fsf.org/" target="_blank">here</a></p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="commercial2"></a>
-	<h2>Are there any restrictions to using TinyMCE in my commercial application?</h2>
-	<div class="section">
-		<p>
-			Yes, all copyright notices must be intact. Moxiecode Systems are still the copyright holders of the source code, so you can not use the code for other applications. Any modifications or add-ons you make to the source has to be contributes back to the TinyMCE community.
-		</p>
-		<p>
-			If you start to make a lot of revenue from using TinyMCE, please remember the time and dedication that has been put into this by other developers, respect this and give credit to those who deserve it.
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="lgpl"></a>
-	<h2>I don't like LGPL, is there a commercial license available for me?</h2>
-	<div class="section">
-		<p>
-			Yes, we can draw up a license for you that enables you to remove copyright restrictions or anything else you would like to have in this license agreement. Contact us through email, sales (at) moxiecode (dot) com.
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="support"></a>
-	<h2>Do you provide support?</h2>
-	<div class="section">
-		<p>
-			We do not provide any non-commercial support outside the forum on the <a href="http://tinymce.moxiecode.com/">TinyMCE</a> web site. If you require commercial support, contact us by email, sales (at) moxiecode (dot) com.
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<a name="who"></a>
-	<h2>Who made this software?</h2>
-	<div class="section">
-		<p>
-			The author of TinyMCE is <a href="http://www.moxiecode.com/" target="_blank">Moxiecode Systems</a>, parts of code has also been contributed by others, <a href="credits.html">here</a> are the credits list.
-		</p>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/faq.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/faq.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/faq.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/faq.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,220 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Frequently Asked Questions</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Frequently Asked Questions</h1>
+</div>
+
+<div class="content">
+	<p>Here are some common answers to common questions. If you need more help you can always visit the <a href="http://tinymce.moxiecode.com/">TinyMCE Forum</a> on the TinyMCE web site.</p>
+	<p>
+		<ul class="plist">
+			<li><a href="#broken">TinyMCE is broken, what should I do?</a></li>
+			<li><a href="#paths">Why is my paths incorrect, I want absolute/relative URLs?</a></li>
+			<li><a href="#strip">Why does TinyMCE strip aways attributes or tags from my source?</a></li>
+			<li><a href="#font">How do I change the default font size/face color of the editor?</a></li>
+			<li><a href="#remove">How do I remove/add buttons/controls to TinyMCE?</a></li>
+			<li><a href="#quotes">Why does my HTML output include lots of \" like <a href=\"mylink.htm\">link</a>?</a></li>
+			<li><a href="#load">TinyMCE takes ages to load, is there a way to make it load quicker?</a></li>
+			<li><a href="#hidden">TinyMCE stops working when placed in tabs or hidden divs?</a></li>
+			<li><a href="#commercial">Can I use TinyMCE in my commercial application?</a></li>
+			<li><a href="#commercial2">Are there any restrictions to using TinyMCE in my commercial application?</a></li>
+			<li><a href="#lgpl">I don't like LGPL, is there a commercial license available for me?</a></li>
+			<li><a href="#support">Do you provide support?</a></li>
+			<li><a href="#who">Who made this software?</a></li>
+		</ul>
+	</p>
+
+	<div class="separator"></div>
+
+	<a name="broken"></a>
+	<h2>TinyMCE is broken, what should I do?</h2>
+	<div class="section">
+		<p>There are a few things you should check before posting questions about your problem at the forum or sourceforge.</p>
+		<p>
+			<ul>
+				<li>Does TinyMCE work on the <a href="http://tinymce.moxiecode.com/example_full.php?example=true">TinyMCE website</a>. Then you know that TinyMCE works with your browser.</li>
+				<li>Try to disable any other JavaScripts on the page, some scripts interfere with internal functions that TinyMCE uses. Those scripts are probably poorly written.</li>
+				<li>Check that you havn't missed removing the last , character in your initialization code and that all the other rows have a trailing , character.</li>
+				<li>Verify that the path/URL to TinyMCE is correct, you can use the excellent tool <a href="http://www.fiddlertool.com/fiddler/">Fiddler</a> for this and other HTTP debugging.</li>
+				<li>Do not cross domain load TinyMCE or any other script unless you really really must, since this will invoke various browser security features. In other words, try placing everything on the same server.</li>
+				<li>Don't place textareas within paragraph elements since this is not valid HTML and it will break MSIE and TinyMCE.</li>
+			</ul>
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="paths"></a>
+	<h2>Why is my paths incorrect, I want absolute/relative URLs?</h2>
+	<div class="section">
+		<p>
+			These are the diffrent configuration scenarios for URLs within TinyMCE:
+			<table class="btable">
+				<thead>
+					<th>Output</th>
+					<th>Config</th>
+					<th>Description</th>
+				</thead>
+				<tbody>
+					<tr>
+						<td><strong>http://www.site.com/path1/path2/file.htm</strong> will be converted to <strong>path2/file.htm</strong></td>
+						<td nowrap="nowrap">
+<a href="option_relative_urls.html">relative_urls</a> : true,<br />
+<a href="option_document_base_url.html">document_base_url</a> : "http://www.site.com/path1/"<br />
+</td>
+						<td>This will convert all URLs within the same domain to relative URLs.<br /> <strong>The URLs will be relative from the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
+					</tr>
+
+					<tr>
+						<td><strong>path2/file.htm</strong> will be converted to <strong>/path1/path2/file.htm</strong></td>
+						<td nowrap="nowrap">
+<a href="option_relative_urls.html">relative_urls</a> : false,<br />
+<a href="option_remove_script_host.html">remove_script_host</a> : true,<br />
+<a href="option_document_base_url.html">document_base_url</a> : "http://www.site.com/path1/"<br />
+</td>
+						<td>This will convert all relative URLs to absolute URLs.<br /> <strong>The URLs will be absolute based on the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
+					</tr>
+
+					<tr>
+						<td><strong>path2/file.htm</strong> will be converted to <strong>http://www.site.com/path1/path2/file.htm</strong></td>
+						<td nowrap="nowrap">
+<a href="option_relative_urls.html">relative_urls</a> : false,<br />
+<a href="option_remove_script_host.html">remove_script_host</a> : false,<br />
+<a href="option_document_base_url.html">document_base_url</a> : "http://www.site.com/path1/"<br />
+</td>
+						<td>This will convert all relative URLs to absolute URLs.<br /> <strong>The URLs will be absolute based on the <a href="option_document_base_url.html">document_base_url</a></strong>.</td>
+					</tr>
+
+					<tr>
+						<td><strong>path2/file.htm</strong> or <strong>http://www.site.com/path1/path2/file.htm</strong> will not be converted at all.</td>
+						<td nowrap="nowrap">
+<a href="option_convert_urls.html">convert_urls</a> : false<br />
+</td>
+						<td>This option will preserve the URLs as they are in a separate attribute while editing, <strong>since browsers tend to auto convert URLs</strong>.</td>
+					</tr>
+
+				</tbody>
+			</table>
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="strip"></a>
+	<h2>Why does TinyMCE strip aways attributes or tags from my source?</h2>
+	<div class="section">
+		<p>You need to check out the "<a href="option_valid_elements.html">valid_elements</a>" and "<a href="option_extended_valid_elements.html">extended_valid_elements</a>" option in the configuration. By default, TinyMCE only allows certain tags and attributes. TinyMCE also tries to follow the XHTML specification as much as possible (and so should you), this can cause some unexpected source changes, there are however configuration options to battle this issue, study the configuration options in details.</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="font"></a>
+	<h2>How do I change the default font size/face color of the editor?</h2>
+	<div class="section">
+		<p>
+			We recommend that you have a look at the <a href="option_content_css.html">content_css</a> option, this enables you to switch the CSS file TinyMCE uses for it's editing area with a file with your CSS rules for font size and so forth.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="remove"></a>
+	<h2>How do I remove/add buttons/controls to TinyMCE?</h2>
+	<div class="section">
+		<p>
+			There are quite a few options for this but a reference of all available buttons/control names can be found in the <a href="reference_buttons.html">button/control reference</a>.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="quotes"></a>
+	<h2>Why does my HTML output include lots of \" like <a href=\"mylink.htm\">link</a>?</h2>
+	<div class="section">
+		<p>This is probably because you are using PHP and it has a feature that's called magic quotes that is enabled by default. You can read more about this at the <a href="http://se2.php.net/magic_quotes/">PHP website</a> or use the <a href="http://www.php.net/manual/en/function.stripslashes.php">stripslashes</a> function.</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="load"></a>
+	<h2>TinyMCE takes ages to load, is there a way to make it load quicker?</h2>
+	<div class="section">
+		<p>
+			If you use PHP on your server you can use tiny_mce_gzip.php instead of tiny_mce.js in page script call. This PHP file bundles all .js files together into two HTTP requests instead of one for each plugin, language file and theme and it also GZip compresses these files.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="hidden"></a>
+	<h2>TinyMCE stops working when placed in tabs or hidden divs?</h2>
+	<div class="section">
+		<p>Since Gecko based browsers Mozilla/Firefox has a bug where it looses designMode on iframes that are hidden a special option is needed that re-enables the design mode when reappearing after being hidden. Enable this option to resolve the issue: "<a href="option_auto_reset_designmode.html">auto_reset_designmode</a>".</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="commercial"></a>
+	<h2>Can I use TinyMCE in my commercial application?</h2>
+	<div class="section">
+		<p>Yes you can, the LGPL license is a Free Software License. You can read the whole license <a href="license.html">here</a> or visit Free Software Foundation web site <a href="http://www.fsf.org/" target="_blank">here</a></p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="commercial2"></a>
+	<h2>Are there any restrictions to using TinyMCE in my commercial application?</h2>
+	<div class="section">
+		<p>
+			Yes, all copyright notices must be intact. Moxiecode Systems are still the copyright holders of the source code, so you can not use the code for other applications. Any modifications or add-ons you make to the source has to be contributes back to the TinyMCE community.
+		</p>
+		<p>
+			If you start to make a lot of revenue from using TinyMCE, please remember the time and dedication that has been put into this by other developers, respect this and give credit to those who deserve it.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="lgpl"></a>
+	<h2>I don't like LGPL, is there a commercial license available for me?</h2>
+	<div class="section">
+		<p>
+			Yes, we can draw up a license for you that enables you to remove copyright restrictions or anything else you would like to have in this license agreement. Contact us through email, sales (at) moxiecode (dot) com.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="support"></a>
+	<h2>Do you provide support?</h2>
+	<div class="section">
+		<p>
+			We do not provide any non-commercial support outside the forum on the <a href="http://tinymce.moxiecode.com/">TinyMCE</a> web site. If you require commercial support, contact us by email, sales (at) moxiecode (dot) com.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<a name="who"></a>
+	<h2>Who made this software?</h2>
+	<div class="section">
+		<p>
+			The author of TinyMCE is <a href="http://www.moxiecode.com/" target="_blank">Moxiecode Systems</a>, parts of code has also been contributed by others, <a href="credits.html">here</a> are the credits list.
+		</p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/images/moxiecode.gif
===================================================================
(Binary files differ)

Copied: trunk/htdocs/js/tinymce/docs/images/moxiecode.gif (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/images/moxiecode.gif)
===================================================================
(Binary files differ)

Deleted: trunk/htdocs/js/tinymce/docs/index.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/index.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/index.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>TinyMCE Documentation - Index</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>TinyMCE Documentation</h1>
-</div>
-
-<div class="content">
-	<ul class="helpindex">
-		<li><a href="about.html">About TinyMCE</a></li>
-		<li><a href="installing.html">Installation instructions</a></li>
-		<li class="list_subtitle"><strong>Reference</strong></li>
-		<ul>
-			<li><a href="reference_configuration.html">Configuration</a></li>
-			<li><a href="reference_buttons.html">Button/control reference</a></li>
-			<li><a href="reference_javascript_functions.html">JavaScript functions</a></li>
-			<li><a href="reference_plugins.html">Plugins</a></li>
-		</ul>
-		<li class="list_subtitle"><strong>Customization</strong></li>
-		<ul style="padding-bottom: 5px;">
-			<li><a href="customization_plugins.html">Creating a plugin</a></li>
-			<li><a href="customization_language_packs.html">Creating a language pack</a></li>
-			<li><a href="customization_themes.html">Creating a theme</a></li>
-		</ul>
-		<li><a href="compatiblity_chart.html">Compatiblity chart</a></li>
-		<li><a href="faq.html">Frequently asked questions</a></li>
-		<li><a href="credits.html">Credits</a></li>
-		<li><a href="license.html">License (LGPL)</a></li>
-	</ul>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/index.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/index.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/index.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/index.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>TinyMCE Documentation - Index</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>TinyMCE Documentation</h1>
+</div>
+
+<div class="content">
+	<ul class="helpindex">
+		<li><a href="about.html">About TinyMCE</a></li>
+		<li><a href="installing.html">Installation instructions</a></li>
+		<li class="list_subtitle"><strong>Reference</strong></li>
+		<ul>
+			<li><a href="reference_configuration.html">Configuration</a></li>
+			<li><a href="reference_buttons.html">Button/control reference</a></li>
+			<li><a href="reference_javascript_functions.html">JavaScript functions</a></li>
+			<li><a href="reference_plugins.html">Plugins</a></li>
+		</ul>
+		<li class="list_subtitle"><strong>Customization</strong></li>
+		<ul style="padding-bottom: 5px;">
+			<li><a href="customization_plugins.html">Creating a plugin</a></li>
+			<li><a href="customization_language_packs.html">Creating a language pack</a></li>
+			<li><a href="customization_themes.html">Creating a theme</a></li>
+		</ul>
+		<li><a href="compatiblity_chart.html">Compatiblity chart</a></li>
+		<li><a href="faq.html">Frequently asked questions</a></li>
+		<li><a href="credits.html">Credits</a></li>
+		<li><a href="license.html">License (LGPL)</a></li>
+	</ul>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/installation_example_00.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/installation_example_00.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/installation_example_00.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Installation Example 00</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">
-tinyMCE.init({
-	mode : "textareas",
-	theme : "simple"
-});
-</script>
-</head>
-<body>
-
-<div class="header">
-	<h1>Installation example 00</h1>
-</div>
-
-<div class="content">
-	<h3>Example</h3>
-	<form method="post">
-		<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
-	</form>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/installation_example_00.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/installation_example_00.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/installation_example_00.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/installation_example_00.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 00</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "simple"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 00</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<form method="post">
+		<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/installation_example_01.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/installation_example_01.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/installation_example_01.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Installation Example 01</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-tinyMCE.init({
-	mode : "textareas",
-	theme : "advanced"
-});
-</script>
-</head>
-<body>
-
-<div class="header">
-	<h1>Installation example 01</h1>
-</div>
-
-<div class="content">
-	<h3>Example</h3>
-	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
-	<form method="post">
-		<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
-	</form>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/installation_example_01.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/installation_example_01.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/installation_example_01.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/installation_example_01.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 01</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 01</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
+	<form method="post">
+		<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/installation_example_02.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/installation_example_02.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/installation_example_02.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Installation Example 02</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">
-tinyMCE.init({
-	mode : "textareas",
-	theme : "advanced",
-	plugins : "table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu",
-	theme_advanced_buttons1_add_before : "save,separator",
-	theme_advanced_buttons1_add : "fontselect,fontsizeselect",
-	theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor",
-	theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator",
-	theme_advanced_buttons3_add_before : "tablecontrols,separator",
-	theme_advanced_buttons3_add : "emotions,iespell,flash,advhr,separator,print",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "left",
-	theme_advanced_path_location : "bottom",
-	plugin_insertdate_dateFormat : "%Y-%m-%d",
-	plugin_insertdate_timeFormat : "%H:%M:%S",
-	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
-	external_link_list_url : "example_data/example_link_list.js",
-	external_image_list_url : "example_data/example_image_list.js",
-	flash_external_list_url : "example_data/example_flash_list.js"
-});
-</script>
-</head>
-<body>
-
-<div class="header">
-	<h1>Installation example 02</h1>
-</div>
-
-<div class="content">
-	<h3>Example</h3>
-	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
-	<form method="post">
-		<textarea name="content" cols="85" rows="15">This is some content that will be editable with TinyMCE.</textarea>
-	</form>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/installation_example_02.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/installation_example_02.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/installation_example_02.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/installation_example_02.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 02</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced",
+	plugins : "table,save,advhr,advimage,advlink,emotions,iespell,insertdatetime,preview,zoom,flash,searchreplace,print,contextmenu",
+	theme_advanced_buttons1_add_before : "save,separator",
+	theme_advanced_buttons1_add : "fontselect,fontsizeselect",
+	theme_advanced_buttons2_add : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor",
+	theme_advanced_buttons2_add_before: "cut,copy,paste,separator,search,replace,separator",
+	theme_advanced_buttons3_add_before : "tablecontrols,separator",
+	theme_advanced_buttons3_add : "emotions,iespell,flash,advhr,separator,print",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_path_location : "bottom",
+	plugin_insertdate_dateFormat : "%Y-%m-%d",
+	plugin_insertdate_timeFormat : "%H:%M:%S",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+	external_link_list_url : "example_data/example_link_list.js",
+	external_image_list_url : "example_data/example_image_list.js",
+	flash_external_list_url : "example_data/example_flash_list.js"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 02</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
+	<form method="post">
+		<textarea name="content" cols="85" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/installation_example_03.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/installation_example_03.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/installation_example_03.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Installation Example 02</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">
-tinyMCE.init({
-	mode : "textareas",
-	theme : "advanced",
-	theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright, justifyfull,bullist,numlist,undo,redo,link,unlink",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "left",
-	theme_advanced_path_location : "bottom",
-	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"
-});
-</script>
-</head>
-<body>
-
-<div class="header">
-	<h1>Installation example 02</h1>
-</div>
-
-<div class="content">
-	<h3>Example</h3>
-	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
-	<form method="post">
-		<textarea name="content" cols="85" rows="15">This is some content that will be editable with TinyMCE.</textarea>
-	</form>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/installation_example_03.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/installation_example_03.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/installation_example_03.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/installation_example_03.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation Example 02</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+<script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced",
+	theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright, justifyfull,bullist,numlist,undo,redo,link,unlink",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_path_location : "bottom",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]"
+});
+</script>
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation example 02</h1>
+</div>
+
+<div class="content">
+	<h3>Example</h3>
+	<p>Open this page with "View source" or similar to see how the configuration is made.</p>
+	<form method="post">
+		<textarea name="content" cols="85" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+	</form>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/installing.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/installing.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/installing.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,121 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Installation instructions</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Installation instructions</h1>
-</div>
-
-<div class="content">
-	<p>Installing TinyMCE is very simple, follow the instructions here. We give a few examples of to integrate TinyMCE, also look at the extensive <a href="reference_configuration.html">options</a> for configuration.</p>
-
-	<div class="separator"></div>
-
-	<h2>Requirements</h2>
-	<div class="section">
-		<p>TinyMCE has no direct requirements except for <a href="compatiblity_chart.html">browser compatibility</a> and of course JavaScript needs to be turned on. There is NO backend code distributed with TinyMCE.
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<h2>Downloading</h2>
-	<div class="section">
-		<p>For download instructions check our <a href="http://tinymce.moxiecode.com">web site.</a></p>
-	</div>
-
-	<div class="separator"></div>
-
-	<h2>Extracting the archives</h2>
-	<div class="section">
-		<p>On windows you could use <a href="http://www.winzip.com">WinZip</a> or something similar. And on other operating systems such as Linux you simply extract the archive with the tar command. You can find a example on how to extract the archived file on Linux below.</p>
-		<p>
-			You should extract TinyMCE in your wwwroot or site domain root folder
-		</p>
-		<h3>Extract example using a shell:</h3>
-		<div class="example">
-<pre>
-$ cd wwwroot
-$ gzip -d tinymce_1_44.tar.gz
-$ tar xvf tinymce_1_44.tar
-</pre>
-		</div>
-		<p>
-			<h3>A folder structure looking like this is created:</h3>
-		<div class="example">
-<pre>
-/tinymce/
-/tinymce/docs/
-/tinymce/docs/zh_cn/
-/tinymce/examples/
-/tinymce/examples/zh_cn/
-/tinymce/jscripts/
-/tinymce/jscripts/tiny_mce/
-/tinymce/jscripts/tiny_mce/langs/
-/tinymce/jscripts/tiny_mce/plugins/
-/tinymce/jscripts/tiny_mce/plugins/<plugin folders>
-/tinymce/jscripts/tiny_mce/themes/
-/tinymce/jscripts/tiny_mce/themes/advanced/
-/tinymce/jscripts/tiny_mce/themes/default/
-/tinymce/jscripts/tiny_mce/themes/simple/
-</pre>
-		</div>
-		</p>
-	</div>
-
-	<div class="separator"></div>
-
-	<h2>Making changes on your web site</h2>
-	<div class="section">
-		<p>Once you have extracted the archive you will need to edit the pages to include the configuration and javascript for TinyMCE. Please note that you should probably only include the TinyMCE javascript on the pages that need it, not all the pages of the web site. Remember to change the URL to the .js below to match your installation path.</p>
-		<p>
-		<h3>The most basic page integration (converts all textarea elements into editors):</h3>
-		<div class="example">
-<pre>
-<html>
-<head>
-<title>TinyMCE Test</title>
-<strong><script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
-<script language="javascript" type="text/javascript">
-tinyMCE.init({
-	mode : "textareas"
-});
-</script></strong>
-</head>
-<body>
-<form method="post">
-	<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
-</form>
-</body>
-</html>
-</pre>
-		</div>
-		</p>
-		<p>
-			Here are a few different example of how you could integrate TinyMCE.
-		</p>
-		<p>
-			<ul>
-				<li><a href="installation_example_00.html">Example 00</a> - Simple Theme</li>
-				<li><a href="installation_example_01.html">Example 01</a> - Advanced Theme</li>
-				<li><a href="installation_example_02.html">Example 02</a> - Advanced Theme Full</li>
-				<li><a href="installation_example_03.html">Example 03</a> - Advanced Theme Simplified</li>
-			</ul>
-		</p>
-		<p>
-			If you have any problems, you should check the forum on the <a href="http://tinymce.moxiecode.com/" target="_blank">TinyMCE web site.</a></p>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/installing.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/installing.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/installing.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/installing.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,121 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Installation instructions</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Installation instructions</h1>
+</div>
+
+<div class="content">
+	<p>Installing TinyMCE is very simple, follow the instructions here. We give a few examples of to integrate TinyMCE, also look at the extensive <a href="reference_configuration.html">options</a> for configuration.</p>
+
+	<div class="separator"></div>
+
+	<h2>Requirements</h2>
+	<div class="section">
+		<p>TinyMCE has no direct requirements except for <a href="compatiblity_chart.html">browser compatibility</a> and of course JavaScript needs to be turned on. There is NO backend code distributed with TinyMCE.
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<h2>Downloading</h2>
+	<div class="section">
+		<p>For download instructions check our <a href="http://tinymce.moxiecode.com">web site.</a></p>
+	</div>
+
+	<div class="separator"></div>
+
+	<h2>Extracting the archives</h2>
+	<div class="section">
+		<p>On windows you could use <a href="http://www.winzip.com">WinZip</a> or something similar. And on other operating systems such as Linux you simply extract the archive with the tar command. You can find a example on how to extract the archived file on Linux below.</p>
+		<p>
+			You should extract TinyMCE in your wwwroot or site domain root folder
+		</p>
+		<h3>Extract example using a shell:</h3>
+		<div class="example">
+<pre>
+$ cd wwwroot
+$ gzip -d tinymce_1_44.tar.gz
+$ tar xvf tinymce_1_44.tar
+</pre>
+		</div>
+		<p>
+			<h3>A folder structure looking like this is created:</h3>
+		<div class="example">
+<pre>
+/tinymce/
+/tinymce/docs/
+/tinymce/docs/zh_cn/
+/tinymce/examples/
+/tinymce/examples/zh_cn/
+/tinymce/jscripts/
+/tinymce/jscripts/tiny_mce/
+/tinymce/jscripts/tiny_mce/langs/
+/tinymce/jscripts/tiny_mce/plugins/
+/tinymce/jscripts/tiny_mce/plugins/<plugin folders>
+/tinymce/jscripts/tiny_mce/themes/
+/tinymce/jscripts/tiny_mce/themes/advanced/
+/tinymce/jscripts/tiny_mce/themes/default/
+/tinymce/jscripts/tiny_mce/themes/simple/
+</pre>
+		</div>
+		</p>
+	</div>
+
+	<div class="separator"></div>
+
+	<h2>Making changes on your web site</h2>
+	<div class="section">
+		<p>Once you have extracted the archive you will need to edit the pages to include the configuration and javascript for TinyMCE. Please note that you should probably only include the TinyMCE javascript on the pages that need it, not all the pages of the web site. Remember to change the URL to the .js below to match your installation path.</p>
+		<p>
+		<h3>The most basic page integration (converts all textarea elements into editors):</h3>
+		<div class="example">
+<pre>
+<html>
+<head>
+<title>TinyMCE Test</title>
+<strong><script language="javascript" type="text/javascript" src="../jscripts/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas"
+});
+</script></strong>
+</head>
+<body>
+<form method="post">
+	<textarea name="content" cols="50" rows="15">This is some content that will be editable with TinyMCE.</textarea>
+</form>
+</body>
+</html>
+</pre>
+		</div>
+		</p>
+		<p>
+			Here are a few different example of how you could integrate TinyMCE.
+		</p>
+		<p>
+			<ul>
+				<li><a href="installation_example_00.html">Example 00</a> - Simple Theme</li>
+				<li><a href="installation_example_01.html">Example 01</a> - Advanced Theme</li>
+				<li><a href="installation_example_02.html">Example 02</a> - Advanced Theme Full</li>
+				<li><a href="installation_example_03.html">Example 03</a> - Advanced Theme Simplified</li>
+			</ul>
+		</p>
+		<p>
+			If you have any problems, you should check the forum on the <a href="http://tinymce.moxiecode.com/" target="_blank">TinyMCE web site.</a></p>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/license.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/license.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/license.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,465 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>TinyMCE License (LGPL)</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>TinyMCE License (LGPL)</h1>
-</div>
-
-<div class="content">
-<p>
-Visit the <a href="faq.html">FAQ</a> for general answers surrounding TinyMCE. Or visit <a href="http://www.fsf.org" target="_blank">http://www.fsf.org</a> for more information about Open-Source licenses.
-</p>
-<pre>
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the library GPL.  It is
- numbered 2 because it goes with version 2 of the ordinary GPL.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Library General Public License, applies to some
-specially designated Free Software Foundation software, and to any
-other libraries whose authors decide to use it.  You can use it for
-your libraries, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if
-you distribute copies of the library, or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link a program with the library, you must provide
-complete object files to the recipients so that they can relink them
-with the library, after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  Our method of protecting your rights has two steps: (1) copyright
-the library, and (2) offer you this license which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  Also, for each distributor's protection, we want to make certain
-that everyone understands that there is no warranty for this free
-library.  If the library is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original
-version, so that any problems introduced by others will not reflect on
-the original authors' reputations.
-.
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that companies distributing free
-software will individually obtain patent licenses, thus in effect
-transforming the program into proprietary software.  To prevent this,
-we have made it clear that any patent must be licensed for everyone's
-free use or not licensed at all.
-
-  Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License, which was designed for utility programs.  This
-license, the GNU Library General Public License, applies to certain
-designated libraries.  This license is quite different from the ordinary
-one; be sure to read it in full, and don't assume that anything in it is
-the same as in the ordinary license.
-
-  The reason we have a separate public license for some libraries is that
-they blur the distinction we usually make between modifying or adding to a
-program and simply using it.  Linking a program with a library, without
-changing the library, is in some sense simply using the library, and is
-analogous to running a utility program or application program.  However, in
-a textual and legal sense, the linked executable is a combined work, a
-derivative of the original library, and the ordinary General Public License
-treats it as such.
-
-  Because of this blurred distinction, using the ordinary General
-Public License for libraries did not effectively promote software
-sharing, because most developers did not use the libraries.  We
-concluded that weaker conditions might promote sharing better.
-
-  However, unrestricted linking of non-free programs would deprive the
-users of those programs of all benefit from the free status of the
-libraries themselves.  This Library General Public License is intended to
-permit developers of non-free programs to use free libraries, while
-preserving your freedom as a user of such programs to change the free
-libraries that are incorporated in them.  (We have not seen how to achieve
-this as regards changes in header files, but we have achieved it as regards
-changes in the actual functions of the Library.)  The hope is that this
-will lead to faster development of free libraries.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, while the latter only
-works together with the library.
-
-  Note that it is possible for a library to be covered by the ordinary
-General Public License rather than by this special one.
-.
-		  GNU LIBRARY GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library which
-contains a notice placed by the copyright holder or other authorized
-party saying it may be distributed under the terms of this Library
-General Public License (also called "this License").  Each licensee is
-addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-.
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-.
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-.
-  6. As an exception to the Sections above, you may also compile or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    c) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    d) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the source code distributed need not include anything that is normally
-distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-.
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-.
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Library General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-.
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-</pre>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/license.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/license.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/license.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/license.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,465 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>TinyMCE License (LGPL)</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>TinyMCE License (LGPL)</h1>
+</div>
+
+<div class="content">
+<p>
+Visit the <a href="faq.html">FAQ</a> for general answers surrounding TinyMCE. Or visit <a href="http://www.fsf.org" target="_blank">http://www.fsf.org</a> for more information about Open-Source licenses.
+</p>
+<pre>
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the library GPL.  It is
+ numbered 2 because it goes with version 2 of the ordinary GPL.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Library General Public License, applies to some
+specially designated Free Software Foundation software, and to any
+other libraries whose authors decide to use it.  You can use it for
+your libraries, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if
+you distribute copies of the library, or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link a program with the library, you must provide
+complete object files to the recipients so that they can relink them
+with the library, after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  Our method of protecting your rights has two steps: (1) copyright
+the library, and (2) offer you this license which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  Also, for each distributor's protection, we want to make certain
+that everyone understands that there is no warranty for this free
+library.  If the library is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original
+version, so that any problems introduced by others will not reflect on
+the original authors' reputations.
+.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that companies distributing free
+software will individually obtain patent licenses, thus in effect
+transforming the program into proprietary software.  To prevent this,
+we have made it clear that any patent must be licensed for everyone's
+free use or not licensed at all.
+
+  Most GNU software, including some libraries, is covered by the ordinary
+GNU General Public License, which was designed for utility programs.  This
+license, the GNU Library General Public License, applies to certain
+designated libraries.  This license is quite different from the ordinary
+one; be sure to read it in full, and don't assume that anything in it is
+the same as in the ordinary license.
+
+  The reason we have a separate public license for some libraries is that
+they blur the distinction we usually make between modifying or adding to a
+program and simply using it.  Linking a program with a library, without
+changing the library, is in some sense simply using the library, and is
+analogous to running a utility program or application program.  However, in
+a textual and legal sense, the linked executable is a combined work, a
+derivative of the original library, and the ordinary General Public License
+treats it as such.
+
+  Because of this blurred distinction, using the ordinary General
+Public License for libraries did not effectively promote software
+sharing, because most developers did not use the libraries.  We
+concluded that weaker conditions might promote sharing better.
+
+  However, unrestricted linking of non-free programs would deprive the
+users of those programs of all benefit from the free status of the
+libraries themselves.  This Library General Public License is intended to
+permit developers of non-free programs to use free libraries, while
+preserving your freedom as a user of such programs to change the free
+libraries that are incorporated in them.  (We have not seen how to achieve
+this as regards changes in header files, but we have achieved it as regards
+changes in the actual functions of the Library.)  The hope is that this
+will lead to faster development of free libraries.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, while the latter only
+works together with the library.
+
+  Note that it is possible for a library to be covered by the ordinary
+General Public License rather than by this special one.
+.
+		  GNU LIBRARY GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library which
+contains a notice placed by the copyright holder or other authorized
+party saying it may be distributed under the terms of this Library
+General Public License (also called "this License").  Each licensee is
+addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+.
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+.
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+.
+  6. As an exception to the Sections above, you may also compile or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    c) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    d) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the source code distributed need not include anything that is normally
+distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+.
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+.
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Library General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+.
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+</pre>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_accessibility_focus.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_accessibility_focus.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_accessibility_focus.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: accessibility_focus</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: accessibility_focus</h1>
-</div>
-
-<div class="content">
-	<p>
-		If this option is set to true some accessibility focus will available to all buttons, you will be able to tab through them all. If you set this option to false, focus will be placed inside the text area when you tab through the interface.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the accessibility_focus option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>accessibility_focus : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_accessibility_focus.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_accessibility_focus.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_accessibility_focus.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_accessibility_focus.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: accessibility_focus</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: accessibility_focus</h1>
+</div>
+
+<div class="content">
+	<p>
+		If this option is set to true some accessibility focus will available to all buttons, you will be able to tab through them all. If you set this option to false, focus will be placed inside the text area when you tab through the interface.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the accessibility_focus option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>accessibility_focus : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_accessibility_warnings.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_accessibility_warnings.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_accessibility_warnings.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: accessibility_warnings</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: accessibility_warnings</h1>
-</div>
-
-<div class="content">
-	<p>
-		If this option is set to true some accessibility warnings will be presented to the user if they miss specifying that information. This option is set to true default, since we should all try to make this world a better place for disabled people. But if you are annoyed with the warnings, set this option to false.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the accessibility_warnings option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>accessibility_warnings : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_accessibility_warnings.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_accessibility_warnings.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_accessibility_warnings.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_accessibility_warnings.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: accessibility_warnings</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: accessibility_warnings</h1>
+</div>
+
+<div class="content">
+	<p>
+		If this option is set to true some accessibility warnings will be presented to the user if they miss specifying that information. This option is set to true default, since we should all try to make this world a better place for disabled people. But if you are annoyed with the warnings, set this option to false.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the accessibility_warnings option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>accessibility_warnings : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: add_form_submit_trigger</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: add_form_submit_trigger</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to turn on/off the onsubmit event listener. This feature adds a onsubmit event listener on all forms on the page, if a form is submitted a tinyMCE.triggerSave() JavaScript calls gets executed, this function moves HTML content from the editor iframe and to the hidden form element. This option is set to true by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the add_form_submit_trigger option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>add_form_submit_trigger : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_add_form_submit_trigger.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: add_form_submit_trigger</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: add_form_submit_trigger</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to turn on/off the onsubmit event listener. This feature adds a onsubmit event listener on all forms on the page, if a form is submitted a tinyMCE.triggerSave() JavaScript calls gets executed, this function moves HTML content from the editor iframe and to the hidden form element. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the add_form_submit_trigger option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>add_form_submit_trigger : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_add_unload_trigger.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_add_unload_trigger.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_add_unload_trigger.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: add_unload_trigger</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: add_unload_trigger</h1>
-</div>
-
-<div class="content">
-	<p>
-		If you set this option to true, page contents will be stored away is the page is unloaded for example is the user navigates away from the page and then navigated back to it by pressing the back button. This option is set to true by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the add_unload_trigger option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>add_unload_trigger : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_add_unload_trigger.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_add_unload_trigger.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_add_unload_trigger.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_add_unload_trigger.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: add_unload_trigger</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: add_unload_trigger</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true, page contents will be stored away is the page is unloaded for example is the user navigates away from the page and then navigated back to it by pressing the back button. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the add_unload_trigger option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>add_unload_trigger : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_apply_source_formatting.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_apply_source_formatting.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_apply_source_formatting.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: apply_source_formatting</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: apply_source_formatting</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to tell TinyMCE to apply some source formatting to the output HTML code. This function is disabled by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the apply_source_formatting option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>apply_source_formatting : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_apply_source_formatting.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_apply_source_formatting.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_apply_source_formatting.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_apply_source_formatting.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: apply_source_formatting</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: apply_source_formatting</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to tell TinyMCE to apply some source formatting to the output HTML code. This function is disabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the apply_source_formatting option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>apply_source_formatting : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_ask.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_ask.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_ask.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: ask</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: ask</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to add a confirmation dialog when focusing textareas. This dialog asks if the focused textarea should be converted into a editor instance or not. It will only ask once since it would get annoying otherwice. The default value of this option is "false".
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the ask option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>ask : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_ask.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_ask.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_ask.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_ask.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: ask</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: ask</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add a confirmation dialog when focusing textareas. This dialog asks if the focused textarea should be converted into a editor instance or not. It will only ask once since it would get annoying otherwice. The default value of this option is "false".
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the ask option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>ask : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_auto_focus.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_auto_focus.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_auto_focus.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: auto_focus</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: auto_focus</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to auto focus a editor instance. The value of this option should be a editor instance id. Editor instance ids are specified as "mce_editor_<index>" where index is a value starting from 0. So if there are 3 editor instances on a page these would have the following ids mce_editor_0, mce_editor_1 and mce_editor_2.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the auto_focus option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>auto_focus : "mce_editor_2"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_auto_focus.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_auto_focus.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_auto_focus.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_auto_focus.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: auto_focus</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: auto_focus</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to auto focus a editor instance. The value of this option should be a editor instance id. Editor instance ids are specified as "mce_editor_<index>" where index is a value starting from 0. So if there are 3 editor instances on a page these would have the following ids mce_editor_0, mce_editor_1 and mce_editor_2.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the auto_focus option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>auto_focus : "mce_editor_2"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_auto_reset_designmode.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_auto_reset_designmode.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_auto_reset_designmode.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: auto_reset_designmode</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: auto_reset_designmode</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is very useful if TinyMCE is used in a DHTML tab system or other divs that are hidden and displayed by some JavaScript. Since Mozilla has a bug when using display:none, the designMode state gets lost. To prevent this from happening you should enable this option. The default value of this option is "true".
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the auto_reset_designmode option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>auto_reset_designmode : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_auto_reset_designmode.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_auto_reset_designmode.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_auto_reset_designmode.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_auto_reset_designmode.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: auto_reset_designmode</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: auto_reset_designmode</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is very useful if TinyMCE is used in a DHTML tab system or other divs that are hidden and displayed by some JavaScript. Since Mozilla has a bug when using display:none, the designMode state gets lost. To prevent this from happening you should enable this option. The default value of this option is "true".
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the auto_reset_designmode option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>auto_reset_designmode : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_auto_resize.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_auto_resize.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_auto_resize.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: auto_resize</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: auto_resize</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to get the TinyMCE editor area to resize to the bounderies of the contents. This option is very experimental and is set to false by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the auto_resize option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>auto_resize : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_auto_resize.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_auto_resize.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_auto_resize.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_auto_resize.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: auto_resize</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: auto_resize</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to get the TinyMCE editor area to resize to the bounderies of the contents. This option is very experimental and is set to false by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the auto_resize option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>auto_resize : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_browsers.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_browsers.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_browsers.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: browsers</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: browsers</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of supported browsers. This enables you to for example disable the editor while running on Safari. The default value of this option is: msie,gecko,safari,opera and since the support for Safari is very limited a warning message will appear until a better version is released. The possible values of this option is msie, gecko and safari.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the browsers option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>browsers : "msie,gecko,opera"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_browsers.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_browsers.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_browsers.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_browsers.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: browsers</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: browsers</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of supported browsers. This enables you to for example disable the editor while running on Safari. The default value of this option is: msie,gecko,safari,opera and since the support for Safari is very limited a warning message will appear until a better version is released. The possible values of this option is msie, gecko and safari.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the browsers option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>browsers : "msie,gecko,opera"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_button_tile_map.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_button_tile_map.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_button_tile_map.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: button_tile_map</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: button_tile_map</h1>
-</div>
-
-<div class="content">
-	<p>
-		If this option is set to true TinyMCE will use tiled images instead of individual images for most of the editor controls. This produces faster loading time since only one GIF image needs to be loaded instead of a GIF for each individual button. This option is set to false by default since it doesn't work with some DOCTYPE declarations.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the button_tile_map option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>button_tile_map : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_button_tile_map.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_button_tile_map.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_button_tile_map.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_button_tile_map.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: button_tile_map</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: button_tile_map</h1>
+</div>
+
+<div class="content">
+	<p>
+		If this option is set to true TinyMCE will use tiled images instead of individual images for most of the editor controls. This produces faster loading time since only one GIF image needs to be loaded instead of a GIF for each individual button. This option is set to false by default since it doesn't work with some DOCTYPE declarations.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the button_tile_map option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>button_tile_map : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_cleanup.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_cleanup.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_cleanup.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: cleanup</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: cleanup</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to turn on/off the built in cleanup functionality. TinyMCE is equipped with powerful cleanup functionality that enables you to specify what elements and attributes are allowed and how HTML contents should be generated. This option is set to true by default, but if you want to disable it you may set it to false. <strong>Notice: It's not recommended to disable this feature.</strong>
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the cleanup option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>cleanup : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_cleanup.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_cleanup.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_cleanup.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_cleanup.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: cleanup</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: cleanup</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to turn on/off the built in cleanup functionality. TinyMCE is equipped with powerful cleanup functionality that enables you to specify what elements and attributes are allowed and how HTML contents should be generated. This option is set to true by default, but if you want to disable it you may set it to false. <strong>Notice: It's not recommended to disable this feature.</strong>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the cleanup option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>cleanup : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_cleanup_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_cleanup_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_cleanup_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,72 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: cleanup_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: cleanup_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to add custom cleanup logic to TinyMCE. This function is called when the cleanup process is executed this process occures when the editor saves/submits content, user hits the cleanup button and when the HTML editor dialog is presented. The format of this function is: customCleanup(type, value). Where type can be "get_from_editor" when the contents is extracted from TinyMCE for example when the user submits the form. The "insert_to_editor" type value gets passed when new contents is inserted into the editor on initialization or when the HTML editor dialog commits new content. The "get_from_editor_dom" value is executed when cleanup process has a valid DOM tree and is extracted from the editor. The "insert_to_editor_dom" gets passed when the editor has a valid DOM tree and contents has been inserted into the editor. The example below illustrated all these types.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the cleanup_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomCleanup</strong>(type, value) {
-	switch (type) {
-		case "get_from_editor":
-			alert("Value HTML string: " + value);
-
-			// Do custom cleanup code here
-
-			break;
-
-		case "insert_to_editor":
-			alert("Value HTML string: " + value);
-
-			// Do custom cleanup code here
-
-			break;
-
-		case "get_from_editor_dom":
-			alert("Value DOM Element " + value);
-
-			// Do custom cleanup code here
-
-			break;
-
-		case "insert_to_editor_dom":
-			alert("Value DOM Element: " + value);
-
-			// Do custom cleanup code here
-
-			break;
-	}
-
-	return value;
-}
-
-tinyMCE.init({
-	...
-	<strong>cleanup_callback : "myCustomCleanup"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_cleanup_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_cleanup_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_cleanup_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_cleanup_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,72 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: cleanup_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: cleanup_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add custom cleanup logic to TinyMCE. This function is called when the cleanup process is executed this process occures when the editor saves/submits content, user hits the cleanup button and when the HTML editor dialog is presented. The format of this function is: customCleanup(type, value). Where type can be "get_from_editor" when the contents is extracted from TinyMCE for example when the user submits the form. The "insert_to_editor" type value gets passed when new contents is inserted into the editor on initialization or when the HTML editor dialog commits new content. The "get_from_editor_dom" value is executed when cleanup process has a valid DOM tree and is extracted from the editor. The "insert_to_editor_dom" gets passed when the editor has a valid DOM tree and contents has been inserted into the editor. The example below illustrated all these types.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the cleanup_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomCleanup</strong>(type, value) {
+	switch (type) {
+		case "get_from_editor":
+			alert("Value HTML string: " + value);
+
+			// Do custom cleanup code here
+
+			break;
+
+		case "insert_to_editor":
+			alert("Value HTML string: " + value);
+
+			// Do custom cleanup code here
+
+			break;
+
+		case "get_from_editor_dom":
+			alert("Value DOM Element " + value);
+
+			// Do custom cleanup code here
+
+			break;
+
+		case "insert_to_editor_dom":
+			alert("Value DOM Element: " + value);
+
+			// Do custom cleanup code here
+
+			break;
+	}
+
+	return value;
+}
+
+tinyMCE.init({
+	...
+	<strong>cleanup_callback : "myCustomCleanup"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_cleanup_on_startup.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_cleanup_on_startup.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_cleanup_on_startup.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: cleanup_on_startup</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: cleanup_on_startup</h1>
-</div>
-
-<div class="content">
-	<p>
-		If you set this option to true, TinyMCE will perform a HTML cleanup call when the editor loads. This option is set to false by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the cleanup_on_startup option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>cleanup_on_startup : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_cleanup_on_startup.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_cleanup_on_startup.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_cleanup_on_startup.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_cleanup_on_startup.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: cleanup_on_startup</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: cleanup_on_startup</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true, TinyMCE will perform a HTML cleanup call when the editor loads. This option is set to false by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the cleanup_on_startup option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>cleanup_on_startup : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_content_css.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_content_css.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_content_css.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: content_css</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: content_css</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify a custom CSS file that extends the theme content CSS. This CSS file is the one used within the editor (the editable area). The default location of this CSS file is within the current theme. This option can also be a comma separated list of URLs.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the content_css option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>content_css : "/mycontent.css"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_content_css.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_content_css.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_content_css.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_content_css.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: content_css</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: content_css</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a custom CSS file that extends the theme content CSS. This CSS file is the one used within the editor (the editable area). The default location of this CSS file is within the current theme. This option can also be a comma separated list of URLs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the content_css option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>content_css : "/mycontent.css"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: convert_fonts_to_spans</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: convert_fonts_to_spans</h1>
-</div>
-
-<div class="content">
-	<p>If you set this option to true, all TinyMCE will convert all font elements to span elements and generate span elements instead of font elements. This option should be used inorder to get more W3C compatible code, since font elements are deprecated. How sizes gets converted can be controlled by the <a href="option_font_size_classes.html">font_size_classes</a> and <a href="option_font_size_style_values.html">font_size_style_values</a> options.</p>
-	<p>
-		More information about this subject can be found in this article: <a href="http://www.microsoft.com/typography/web/designer/face7.htm">What's wrong with FONT FACE</a>
-	</p>
-	<div class="separator"></div>
-
-	<h3>Example of usage of the convert_fonts_to_spans option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>convert_fonts_to_spans : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_convert_fonts_to_spans.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: convert_fonts_to_spans</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: convert_fonts_to_spans</h1>
+</div>
+
+<div class="content">
+	<p>If you set this option to true, all TinyMCE will convert all font elements to span elements and generate span elements instead of font elements. This option should be used inorder to get more W3C compatible code, since font elements are deprecated. How sizes gets converted can be controlled by the <a href="option_font_size_classes.html">font_size_classes</a> and <a href="option_font_size_style_values.html">font_size_style_values</a> options.</p>
+	<p>
+		More information about this subject can be found in this article: <a href="http://www.microsoft.com/typography/web/designer/face7.htm">What's wrong with FONT FACE</a>
+	</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the convert_fonts_to_spans option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>convert_fonts_to_spans : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: convert_newlines_to_brs</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: convert_newlines_to_brs</h1>
-</div>
-
-<div class="content">
-	<p>
-		If you set this option to true newline characters codes gets converted in to br elements. This option is set to false by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the convert_newlines_to_brs option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>convert_newlines_to_brs : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_convert_newlines_to_brs.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: convert_newlines_to_brs</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: convert_newlines_to_brs</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true newline characters codes gets converted in to br elements. This option is set to false by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the convert_newlines_to_brs option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>convert_newlines_to_brs : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_convert_urls.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_convert_urls.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_convert_urls.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: convert_urls</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: convert_urls</h1>
-</div>
-
-<div class="content">
-	<p>This option enables you to control if TinyMCE is to be clever and restore urls to their original values. URLs are auto converted/messed up by default since the built in browser logic works this way, there is no way to get the real URL unless you store it away. If you set this option to false it will try to keep these URLs intact. This option is set to true by default that means URLs will be forced absolute or relative depending on the state of <a href="option_relative_urls.html">relative_urls</a>.</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the convert_urls option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>convert_urls : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_convert_urls.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_convert_urls.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_convert_urls.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_convert_urls.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: convert_urls</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: convert_urls</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to control if TinyMCE is to be clever and restore urls to their original values. URLs are auto converted/messed up by default since the built in browser logic works this way, there is no way to get the real URL unless you store it away. If you set this option to false it will try to keep these URLs intact. This option is set to true by default that means URLs will be forced absolute or relative depending on the state of <a href="option_relative_urls.html">relative_urls</a>.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the convert_urls option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>convert_urls : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_custom_shortcuts.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_custom_shortcuts.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_custom_shortcuts.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: custom_shortcuts</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: custom_shortcuts</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to disable/enable the custom keyboard shortcuts plugins and themes may register. The value of this
-		option is set to true by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the custom_shortcuts option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>custom_shortcuts : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_custom_shortcuts.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_custom_shortcuts.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_custom_shortcuts.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_custom_shortcuts.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_shortcuts</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_shortcuts</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to disable/enable the custom keyboard shortcuts plugins and themes may register. The value of this
+		option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_shortcuts option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_shortcuts : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: custom_undo_redo</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: custom_undo_redo</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is a true/false option that enables you to disable/enable the custom undo/redo logic within TinyMCE. This option is enabled by default, if you disable it some operations may not be undoable.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the custom_undo_redo option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>custom_undo_redo : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_custom_undo_redo.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is a true/false option that enables you to disable/enable the custom undo/redo logic within TinyMCE. This option is enabled by default, if you disable it some operations may not be undoable.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: custom_undo_redo_keyboard_shortcuts</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: custom_undo_redo_keyboard_shortcuts</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to disable/enable the usage of keyboard shortcuts for undo/redo. This feature is enabled by default. Keyboard shortcurs are Ctrl+Z for undo, Ctrl+Y for redo.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the custom_undo_redo_keyboard_shortcuts option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>custom_undo_redo_keyboard_shortcuts : "false"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_keyboard_shortcuts.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo_keyboard_shortcuts</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo_keyboard_shortcuts</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to disable/enable the usage of keyboard shortcuts for undo/redo. This feature is enabled by default. Keyboard shortcurs are Ctrl+Z for undo, Ctrl+Y for redo.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo_keyboard_shortcuts option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo_keyboard_shortcuts : "false"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: custom_undo_redo_levels</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: custom_undo_redo_levels</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain the number of undo levels to keep in memory. This is set to -1 by default and such a value tells TinyMCE to use a unlimited number of undo levels. But this steals lots of memory so for low end systems a value of 10 may be better.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the custom_undo_redo_levels option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>custom_undo_redo_levels : 10</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_levels.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo_levels</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo_levels</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain the number of undo levels to keep in memory. This is set to -1 by default and such a value tells TinyMCE to use a unlimited number of undo levels. But this steals lots of memory so for low end systems a value of 10 may be better.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo_levels option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo_levels : 10</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: custom_undo_redo_restore_selection</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: custom_undo_redo_restore_selection</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option gives you the possibility to turn on/off the restoration of the cursor/selection when a undo/redo event occurs. This option is enabled by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the custom_undo_redo_restore_selection option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>custom_undo_redo_restore_selection : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_custom_undo_redo_restore_selection.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: custom_undo_redo_restore_selection</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: custom_undo_redo_restore_selection</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the possibility to turn on/off the restoration of the cursor/selection when a undo/redo event occurs. This option is enabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the custom_undo_redo_restore_selection option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>custom_undo_redo_restore_selection : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_debug.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_debug.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_debug.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: debug</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: debug</h1>
-</div>
-
-<div class="content">
-	<p>
-		If the value of this option is set to "true" some debugging information will appear such as a list of what CSS files are used. The default value of this option is false.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the debug option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>debug : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_debug.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_debug.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_debug.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_debug.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: debug</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: debug</h1>
+</div>
+
+<div class="content">
+	<p>
+		If the value of this option is set to "true" some debugging information will appear such as a list of what CSS files are used. The default value of this option is false.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the debug option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>debug : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_dialog_type.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_dialog_type.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_dialog_type.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: dialog_type</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: dialog_type</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify how dialogs/popups should be opened, possible values are "window" and "modal", where the window option opens a normal window and the dialog option opens a modal dialog. This option is set to "window" by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the dialog_type option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>dialog_type : "modal"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_dialog_type.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_dialog_type.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_dialog_type.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_dialog_type.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: dialog_type</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: dialog_type</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify how dialogs/popups should be opened, possible values are "window" and "modal", where the window option opens a normal window and the dialog option opens a modal dialog. This option is set to "window" by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the dialog_type option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>dialog_type : "modal"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_directionality.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_directionality.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_directionality.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: directionality</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: directionality</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option specifies the default writing direction, some languages writes from right to left instead of left to right. The default value of this option is &quot:ltr" but if you want to use from right to left mode specify "rtl" instead.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the directionality option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>directionality : "rtl"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_directionality.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_directionality.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_directionality.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_directionality.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: directionality</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: directionality</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option specifies the default writing direction, some languages writes from right to left instead of left to right. The default value of this option is &quot:ltr" but if you want to use from right to left mode specify "rtl" instead.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the directionality option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>directionality : "rtl"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_display_tab_class.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_display_tab_class.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_display_tab_class.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: display_tab_class</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: display_tab_class</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the display_tab_class option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>display_tab_class : "showTab"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_display_tab_class.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_display_tab_class.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_display_tab_class.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_display_tab_class.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: display_tab_class</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: display_tab_class</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the display_tab_class option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>display_tab_class : "showTab"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_docs_language.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_docs_language.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_docs_language.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: docs_language</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: docs_language</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a language code of the editor documentation to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of "tinymce/jscripts/tiny_mce/theme/<theme used>/docs". The default value of this option is the value specified in the  "language" option or "en" for English.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the docs_language option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>docs_language : "sv"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_docs_language.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_docs_language.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_docs_language.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_docs_language.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: docs_language</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: docs_language</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a language code of the editor documentation to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of "tinymce/jscripts/tiny_mce/theme/<theme used>/docs". The default value of this option is the value specified in the  "language" option or "en" for English.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the docs_language option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>docs_language : "sv"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_doctype.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_doctype.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_doctype.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: doctype</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: doctype</h1>
-</div>
-
-<div class="content">
-	<p>This option enables you to specify the doctype that is used while editing content within TinyMCE, this defaults to <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">.</p>
-	<div class="separator"></div>
-
-	<h3>Example of usage of the doctype option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>doctype : "<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_doctype.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_doctype.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_doctype.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_doctype.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: doctype</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: doctype</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to specify the doctype that is used while editing content within TinyMCE, this defaults to <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the doctype option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>doctype : "<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_document_base_url.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_document_base_url.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_document_base_url.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: document_base_url</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: document_base_url</h1>
-</div>
-
-<div class="content">
-	<p>This option enables you to specify the URL from where all URLs will be relative to this option is only used when the <a href="option_relative_urls.html">relative_urls</a> option is set to true. The value of this option is set to the current document by default.</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the document_base_url option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>document_base_url : "/somedir/somfile.html"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_document_base_url.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_document_base_url.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_document_base_url.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_document_base_url.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: document_base_url</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: document_base_url</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to specify the URL from where all URLs will be relative to this option is only used when the <a href="option_relative_urls.html">relative_urls</a> option is set to true. The value of this option is set to the current document by default.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the document_base_url option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>document_base_url : "/somedir/somfile.html"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_editor_css.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_editor_css.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_editor_css.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: editor_css</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: editor_css</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify the CSS to be used for the editor toolbars/user interface of TinyMCE this option is set to a CSS file found in the currently used theme by default. This CSS contains layout information about panels and buttons used by TinyMCE.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the editor_css option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>editor_css : "/myeditor.css"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_editor_css.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_editor_css.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_editor_css.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_editor_css.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: editor_css</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: editor_css</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify the CSS to be used for the editor toolbars/user interface of TinyMCE this option is set to a CSS file found in the currently used theme by default. This CSS contains layout information about panels and buttons used by TinyMCE.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the editor_css option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>editor_css : "/myeditor.css"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_editor_deselector.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_editor_deselector.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_editor_deselector.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: editor_deselector</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: editor_deselector</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify a CSS class name that will be deselect textareas from being converted into editor instances. If this option isn't set to a value this option will not have any effect and the <a href="option_mode.html">mode</a> option will choose textareas instead. The default value of this option is "mceNoEditor" so if mceNoEditor is added to the class attribute of a textarea it will be excluded for convertion.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the editor_deselector option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>editor_deselector : "mceNoEditor"</strong>
-});
-</pre>
-	</div>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage in the HTML:</h3>
-	<div class="example">
-<pre>
-<textarea id="myarea1" class="<strong>mceNoEditor</strong>">This will be a NOT be a editor.</textarea>
-
-<textarea id="myarea2">This will be a editor.</textarea>
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_editor_deselector.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_editor_deselector.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_editor_deselector.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_editor_deselector.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: editor_deselector</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: editor_deselector</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a CSS class name that will be deselect textareas from being converted into editor instances. If this option isn't set to a value this option will not have any effect and the <a href="option_mode.html">mode</a> option will choose textareas instead. The default value of this option is "mceNoEditor" so if mceNoEditor is added to the class attribute of a textarea it will be excluded for convertion.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the editor_deselector option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>editor_deselector : "mceNoEditor"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage in the HTML:</h3>
+	<div class="example">
+<pre>
+<textarea id="myarea1" class="<strong>mceNoEditor</strong>">This will be a NOT be a editor.</textarea>
+
+<textarea id="myarea2">This will be a editor.</textarea>
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_editor_selector.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_editor_selector.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_editor_selector.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: editor_selector</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: editor_selector</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify a CSS class name that will be required on the text areas that is to be converted. This enables you to select specific text areas for convertion by adding this CSS class name to the class attribute of the text area. If this option isn't set to a value this option will not have any effect and the <a href="option_mode.html">mode</a> option will choose textareas instead. If you want all editors to be converted and just specific editors to be excluded check the <a href="option_editor_deselector.html">editor_deselector</a> option.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the editor_selector option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>editor_selector : "mceEditor"</strong>
-});
-</pre>
-	</div>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage in the HTML:</h3>
-	<div class="example">
-<pre>
-<textarea id="myarea1" class="<strong>mceEditor</strong>">This will be a editor.</textarea>
-
-<textarea id="myarea2">This will NOT be a editor.</textarea>
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_editor_selector.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_editor_selector.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_editor_selector.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_editor_selector.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: editor_selector</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: editor_selector</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a CSS class name that will be required on the text areas that is to be converted. This enables you to select specific text areas for convertion by adding this CSS class name to the class attribute of the text area. If this option isn't set to a value this option will not have any effect and the <a href="option_mode.html">mode</a> option will choose textareas instead. If you want all editors to be converted and just specific editors to be excluded check the <a href="option_editor_deselector.html">editor_deselector</a> option.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the editor_selector option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>editor_selector : "mceEditor"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage in the HTML:</h3>
+	<div class="example">
+<pre>
+<textarea id="myarea1" class="<strong>mceEditor</strong>">This will be a editor.</textarea>
+
+<textarea id="myarea2">This will NOT be a editor.</textarea>
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_elements.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_elements.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: elements</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: elements</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of element id's to convert into editor instances. This option is only used if <a href="option_mode.html">mode</a> is set to "exact".
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the elements option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>elements : "elm1,elm2"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_elements.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_elements.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_elements.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of element id's to convert into editor instances. This option is only used if <a href="option_mode.html">mode</a> is set to "exact".
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>elements : "elm1,elm2"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_encoding.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_encoding.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_encoding.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: encoding</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: encoding</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to get XML escaped contents out of TinyMCE. Posted content will be converted to a XML string escaping characters such as < > " & to &lt; &gt; &quot; &amp;. This option is set nothing by default and is there for disabled.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the encoding option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>encoding : "xml"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_encoding.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_encoding.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_encoding.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_encoding.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: encoding</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: encoding</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to get XML escaped contents out of TinyMCE. Posted content will be converted to a XML string escaping characters such as < > " & to &lt; &gt; &quot; &amp;. This option is set nothing by default and is there for disabled.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the encoding option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>encoding : "xml"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_entities.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_entities.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_entities.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: entities</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: entities</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option contains a comma separated list of entity names that is used instead of characters. Odd items are the character code and even items are the name of the character code. The default value of this option is placed in the example below.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the entities option / default value:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>entities : "160,nbsp,38,amp,34,quot,162,cent,8364,euro,163,pound,165,yen,169,copy,174,reg,8482,trade,8240,permil,181,micro,183,middot,8226,bull,8230,hellip,8242,prime,8243,Prime,167,sect,182,para,223,szlig,8249,lsaquo,8250,rsaquo,171,laquo,187,raquo,8216,lsquo,8217,rsquo,8220,ldquo,8221,rdquo,8218,sbquo,8222,bdquo,60,lt,62,gt,8804,le,8805,ge,8211,ndash,8212,mdash,175,macr,8254,oline,164,curren,166,brvbar,168,uml,161,iexcl,191,iquest,710,circ,732,tilde,176,deg,8722,minus,177,plusmn,247,divide,8260,frasl,215,times,185,sup1,178,sup2,179,sup3,188,frac14,189,frac12,190,frac34,402,fnof,8747,int,8721,sum,8734,infin,8730,radic,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8712,isin,8713,notin,8715,ni,8719,prod,8743,and,8744,or,172,not,8745,cap,8746,cup,8706,part,8704,forall,8707,exist,8709,empty,8711,nabla,8727,lowast,8733,prop,8736,ang,180,acute,184,cedil,170,ordf,186,ordm,8224,dagger,8225,Dagger,192,Agrave,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,202,Ecirc,203,Euml,204,Igrave,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,212,Ocirc,213,Otilde,214,Ouml,216,Oslash,338,OElig,217,Ugrave,219,Ucirc,220,Uuml,376,Yuml,222,THORN,224,agrave,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,234,ecirc,235,euml,236,igrave,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,244,ocirc,245,otilde,246,ouml,248,oslash,339,oelig,249,ugrave,251,ucirc,252,uuml,254,thorn,255,yuml,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,8501,alefsym,982,piv,8476,real,977,thetasym,978,upsih,8472,weierp,8465,image,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8756,there4,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,173,shy,233,eacute,237,iacute,243,oacute,250,uacute,193,Aacute,225,aacute,201,Eacute,205,Iacute,211,Oacute,218,Uacute,221,Yacute,253,yacute"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_entities.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_entities.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_entities.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_entities.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: entities</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: entities</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option contains a comma separated list of entity names that is used instead of characters. Odd items are the character code and even items are the name of the character code. The default value of this option is placed in the example below.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the entities option / default value:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>entities : "160,nbsp,38,amp,34,quot,162,cent,8364,euro,163,pound,165,yen,169,copy,174,reg,8482,trade,8240,permil,181,micro,183,middot,8226,bull,8230,hellip,8242,prime,8243,Prime,167,sect,182,para,223,szlig,8249,lsaquo,8250,rsaquo,171,laquo,187,raquo,8216,lsquo,8217,rsquo,8220,ldquo,8221,rdquo,8218,sbquo,8222,bdquo,60,lt,62,gt,8804,le,8805,ge,8211,ndash,8212,mdash,175,macr,8254,oline,164,curren,166,brvbar,168,uml,161,iexcl,191,iquest,710,circ,732,tilde,176,deg,8722,minus,177,plusmn,247,divide,8260,frasl,215,times,185,sup1,178,sup2,179,sup3,188,frac14,189,frac12,190,frac34,402,fnof,8747,int,8721,sum,8734,infin,8730,radic,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8712,isin,8713,notin,8715,ni,8719,prod,8743,and,8744,or,172,not,8745,cap,8746,cup,8706,part,8704,forall,8707,exist,8709,empty,8711,nabla,8727,lowast,8733,prop,8736,ang,180,acute,184,cedil,170,ordf,186,ordm,8224,dagger,8225,Dagger,192,Agrave,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,202,Ecirc,203,Euml,204,Igrave,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,212,Ocirc,213,Otilde,214,Ouml,216,Oslash,338,OElig,217,Ugrave,219,Ucirc,220,Uuml,376,Yuml,222,THORN,224,agrave,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,234,ecirc,235,euml,236,igrave,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,244,ocirc,245,otilde,246,ouml,248,oslash,339,oelig,249,ugrave,251,ucirc,252,uuml,254,thorn,255,yuml,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,8501,alefsym,982,piv,8476,real,977,thetasym,978,upsih,8472,weierp,8465,image,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8756,there4,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,173,shy,233,eacute,237,iacute,243,oacute,250,uacute,193,Aacute,225,aacute,201,Eacute,205,Iacute,211,Oacute,218,Uacute,221,Yacute,253,yacute"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_entity_encoding.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_entity_encoding.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_entity_encoding.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: entity_encoding</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: entity_encoding</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option controls how entities/characters gets processed by TinyMCE. The value can be set to numeric, named or raw. Where numeric is numeric representation such as "&#160;" named is entity names such as "&nbsp;" and raw is " ". The default value of this option is named, if named is used the <a href="option_entities.html">entities</a> option will be used to convert the codes into names.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the entity_encoding option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>entity_encoding : "raw"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_entity_encoding.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_entity_encoding.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_entity_encoding.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_entity_encoding.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: entity_encoding</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: entity_encoding</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option controls how entities/characters gets processed by TinyMCE. The value can be set to numeric, named or raw. Where numeric is numeric representation such as "&#160;" named is entity names such as "&nbsp;" and raw is " ". The default value of this option is named, if named is used the <a href="option_entities.html">entities</a> option will be used to convert the codes into names.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the entity_encoding option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>entity_encoding : "raw"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_event_elements.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_event_elements.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_event_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: event_elements</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: event_elements</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of elements thay may have event attributes such as onclick and simmilar. This option is needed since some browsers execute these events while editing content. This option is set to "a,img" default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the event_elements option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>event_elements : "a,img,span"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_event_elements.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_event_elements.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_event_elements.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_event_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: event_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: event_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of elements thay may have event attributes such as onclick and simmilar. This option is needed since some browsers execute these events while editing content. This option is set to "a,img" default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the event_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>event_elements : "a,img,span"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_execcommand_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_execcommand_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_execcommand_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: execcommand_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: execcommand_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option allows you to add a custom callback function for execCommand handling. This enables you to override internal
-		command functions in TinyMCE. The example below shows how the mceLink and mceImage are overriden.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the execcommand_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomExecCommandHandler</strong>(editor_id, elm, command, user_interface, value) {
-	var linkElm, imageElm, inst;
-
-	switch (command) {
-		case "mceLink":
-			inst = tinyMCE.getInstanceById(editor_id);
-			linkElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "a");
-
-			if (linkElm)
-				alert("Link dialog has been overriden. Found link href: " + tinyMCE.getAttrib(linkElm, "href"));
-			else
-				alert("Link dialog has been overriden.");
-
-			return true;
-
-		case "mceImage":
-			inst = tinyMCE.getInstanceById(editor_id);
-			imageElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "img");
-
-			if (imageElm)
-				alert("Image dialog has been overriden. Found image src: " + tinyMCE.getAttrib(imageElm, "src"));
-			else
-				alert("Image dialog has been overriden.");
-
-			return true;
-	}
-
-	return false; // Pass to next handler in chain
-}
-
-tinyMCE.init({
-	...
-	<strong>execcommand_callback : "myCustomExecCommandHandler"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_execcommand_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_execcommand_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_execcommand_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_execcommand_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,69 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: execcommand_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: execcommand_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option allows you to add a custom callback function for execCommand handling. This enables you to override internal
+		command functions in TinyMCE. The example below shows how the mceLink and mceImage are overriden.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the execcommand_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomExecCommandHandler</strong>(editor_id, elm, command, user_interface, value) {
+	var linkElm, imageElm, inst;
+
+	switch (command) {
+		case "mceLink":
+			inst = tinyMCE.getInstanceById(editor_id);
+			linkElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "a");
+
+			if (linkElm)
+				alert("Link dialog has been overriden. Found link href: " + tinyMCE.getAttrib(linkElm, "href"));
+			else
+				alert("Link dialog has been overriden.");
+
+			return true;
+
+		case "mceImage":
+			inst = tinyMCE.getInstanceById(editor_id);
+			imageElm = tinyMCE.getParentElement(inst.selection.getFocusElement(), "img");
+
+			if (imageElm)
+				alert("Image dialog has been overriden. Found image src: " + tinyMCE.getAttrib(imageElm, "src"));
+			else
+				alert("Image dialog has been overriden.");
+
+			return true;
+	}
+
+	return false; // Pass to next handler in chain
+}
+
+tinyMCE.init({
+	...
+	<strong>execcommand_callback : "myCustomExecCommandHandler"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_extended_valid_elements.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_extended_valid_elements.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_extended_valid_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: extended_valid_elements</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: extended_valid_elements</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is very similar to <a href="option_valid_elements.html">valid_elements</a> the only diffrance between this option and valid_elements is that this one gets added to the existing rule set. This can be very useful if the existing rule set is fine but you want to add some specific elements that also should be valid.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the extended_valid_elements option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>extended_valid_elements : "img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_extended_valid_elements.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_extended_valid_elements.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_extended_valid_elements.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_extended_valid_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: extended_valid_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: extended_valid_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is very similar to <a href="option_valid_elements.html">valid_elements</a> the only diffrance between this option and valid_elements is that this one gets added to the existing rule set. This can be very useful if the existing rule set is fine but you want to add some specific elements that also should be valid.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the extended_valid_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>extended_valid_elements : "img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_external_image_list_url.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_external_image_list_url.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_external_image_list_url.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: external_image_list_url</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: external_image_list_url</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to have a external list of images this list of images can be generated by a server side page and then inserted into the image dialog windows of TinyMCE. The images can be to internal site images or external URLs.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the external_image_list_url option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>external_image_list_url : "myexternallist.js"</strong>
-});
-</pre>
-	</div>
-
-	<div class="separator"></div>
-
-	<h3>Example of a external link list file: (myexternallist.js)</h3>
-	<div class="example">
-<pre>
-var tinyMCEImageList = new Array(
-	// Name, URL
-	["Logo 1", "logo.jpg"],
-	["Logo 2 Over", "logo_over.jpg"]
-);
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_external_image_list_url.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_external_image_list_url.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_external_image_list_url.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_external_image_list_url.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,51 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: external_image_list_url</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: external_image_list_url</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to have a external list of images this list of images can be generated by a server side page and then inserted into the image dialog windows of TinyMCE. The images can be to internal site images or external URLs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the external_image_list_url option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>external_image_list_url : "myexternallist.js"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of a external link list file: (myexternallist.js)</h3>
+	<div class="example">
+<pre>
+var tinyMCEImageList = new Array(
+	// Name, URL
+	["Logo 1", "logo.jpg"],
+	["Logo 2 Over", "logo_over.jpg"]
+);
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_external_link_list_url.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_external_link_list_url.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_external_link_list_url.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,52 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: external_link_list_url</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: external_link_list_url</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to have a external list of links this list of links can be generated by a server side page and then inserted into the link dialog windows of TinyMCE. The links can be to internal site documents or external URLs.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the external_link_list_url option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>external_link_list_url : "myexternallist.js"</strong>
-});
-</pre>
-	</div>
-
-	<div class="separator"></div>
-
-	<h3>Example of a external link list file: (myexternallist.js)</h3>
-	<div class="example">
-<pre>
-var tinyMCELinkList = new Array(
-	// Name, URL
-	["Moxiecode", "http://www.moxiecode.com"],
-	["Freshmeat", "http://www.freshmeat.com"],
-	["Sourceforge", "http://www.sourceforge.com"]
-);
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_external_link_list_url.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_external_link_list_url.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_external_link_list_url.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_external_link_list_url.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: external_link_list_url</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: external_link_list_url</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to have a external list of links this list of links can be generated by a server side page and then inserted into the link dialog windows of TinyMCE. The links can be to internal site documents or external URLs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the external_link_list_url option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>external_link_list_url : "myexternallist.js"</strong>
+});
+</pre>
+	</div>
+
+	<div class="separator"></div>
+
+	<h3>Example of a external link list file: (myexternallist.js)</h3>
+	<div class="example">
+<pre>
+var tinyMCELinkList = new Array(
+	// Name, URL
+	["Moxiecode", "http://www.moxiecode.com"],
+	["Freshmeat", "http://www.freshmeat.com"],
+	["Sourceforge", "http://www.sourceforge.com"]
+);
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_file_browser_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_file_browser_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_file_browser_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: file_browser_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: file_browser_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to add your own file browser/image browser to TinyMCE. This function is executed each time a user clicks on the "browse" buttons in various dialogs. The format of this callback function is: fileBrowser(field_name, url, type, win) where field_name is the id/name of the form element that the browser should insert it's URL into. The url parameter contains the URL value that is currently inside the field. The type parameter contains what type of browser to present this value can be file, image or flash depending on what dialog is calling the function. The win parameter contains a reference to the dialog/window that executes the function.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the file_browser_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomFileBrowser</strong>(field_name, url, type, win) {
-	// Do custom browser logic
-	win.document.forms[0].elements[field_name].value = 'my browser value';
-}
-
-tinyMCE.init({
-	...
-	<strong>file_browser_callback : "myCustomFileBrowser"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_file_browser_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_file_browser_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_file_browser_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_file_browser_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: file_browser_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: file_browser_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add your own file browser/image browser to TinyMCE. This function is executed each time a user clicks on the "browse" buttons in various dialogs. The format of this callback function is: fileBrowser(field_name, url, type, win) where field_name is the id/name of the form element that the browser should insert it's URL into. The url parameter contains the URL value that is currently inside the field. The type parameter contains what type of browser to present this value can be file, image or flash depending on what dialog is calling the function. The win parameter contains a reference to the dialog/window that executes the function.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the file_browser_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomFileBrowser</strong>(field_name, url, type, win) {
+	// Do custom browser logic
+	win.document.forms[0].elements[field_name].value = 'my browser value';
+}
+
+tinyMCE.init({
+	...
+	<strong>file_browser_callback : "myCustomFileBrowser"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_fix_content_duplication.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_fix_content_duplication.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_fix_content_duplication.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: fix_content_duplication</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: fix_content_duplication</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is available since MSIE has a serious bug where the DOM tree sometimes can include the same node twice. This produces duplication of content when the cleanup process runs. This option is enabled by default and removes any duplicated nodes.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the fix_content_duplication option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>fix_content_duplication : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_fix_content_duplication.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_fix_content_duplication.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_fix_content_duplication.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_fix_content_duplication.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: fix_content_duplication</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: fix_content_duplication</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is available since MSIE has a serious bug where the DOM tree sometimes can include the same node twice. This produces duplication of content when the cleanup process runs. This option is enabled by default and removes any duplicated nodes.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the fix_content_duplication option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>fix_content_duplication : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_fix_list_elements.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_fix_list_elements.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_fix_list_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,62 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: fix_list_elements</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: fix_list_elements</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify that list elements UL/OL is to be converted to valid XHTML. This option is disabled by default.<br /><br />
-	<div class="example">
-<pre>
-This invalid list:
-<ol>
-	<li>a</li>
-	<ol>
-		<li>b</li>
-		<li>c</li>
-	</ol>
-	<li>e</li>
-</ol>
-
-Gets converted into this valid list:
-<ol>
-	<li>a
-		<ol>
-			<li>b</li>
-			<li>c</li>
-		</ol>
-	</li>
-	<li>e</li>
-</ol>
-</pre>
-	</div>
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the fix_list_elements option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>fix_list_elements : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_fix_list_elements.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_fix_list_elements.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_fix_list_elements.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_fix_list_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,62 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: fix_list_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: fix_list_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify that list elements UL/OL is to be converted to valid XHTML. This option is disabled by default.<br /><br />
+	<div class="example">
+<pre>
+This invalid list:
+<ol>
+	<li>a</li>
+	<ol>
+		<li>b</li>
+		<li>c</li>
+	</ol>
+	<li>e</li>
+</ol>
+
+Gets converted into this valid list:
+<ol>
+	<li>a
+		<ol>
+			<li>b</li>
+			<li>c</li>
+		</ol>
+	</li>
+	<li>e</li>
+</ol>
+</pre>
+	</div>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the fix_list_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>fix_list_elements : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_fix_table_elements.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_fix_table_elements.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_fix_table_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,63 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: fix_table_elements</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: fix_table_elements</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify that list table elements should be moved outside paragraphs or other block elements. If you enable this option block elements will be split into two chunks when a table is found within it, see the example below for details. This option is disabled by default.<br /><br />
-	<div class="example">
-<pre>
-This invalid table:
-<p>
-a
-<table>
-	<tr><td>b</td></tr>
-	<tr><td>c</td></tr>
-</table>
-d
-</p>
-
-Gets converted into this valid XHTML:
-<p>
-a
-</p>
-<table>
-	<tr><td>b</td></tr>
-	<tr><td>c</td></tr>
-</table>
-<p>
-d
-</p>
-</pre>
-	</div>
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the fix_table_elements option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>fix_table_elements : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_fix_table_elements.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_fix_table_elements.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_fix_table_elements.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_fix_table_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,63 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: fix_table_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: fix_table_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify that list table elements should be moved outside paragraphs or other block elements. If you enable this option block elements will be split into two chunks when a table is found within it, see the example below for details. This option is disabled by default.<br /><br />
+	<div class="example">
+<pre>
+This invalid table:
+<p>
+a
+<table>
+	<tr><td>b</td></tr>
+	<tr><td>c</td></tr>
+</table>
+d
+</p>
+
+Gets converted into this valid XHTML:
+<p>
+a
+</p>
+<table>
+	<tr><td>b</td></tr>
+	<tr><td>c</td></tr>
+</table>
+<p>
+d
+</p>
+</pre>
+	</div>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the fix_table_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>fix_table_elements : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_focus_alert.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_focus_alert.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_focus_alert.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: focus_alert</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: focus_alert</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify if a "Editor is not focused" alert message should appear if the user calls tinyMCE.execCommand and havn't selected a editor instance before. This message will normaly not appear unless some integration has been made. Using tinyMCE.execInstanceCommand prevents this from happening since it auto focuses the editor specified. The default value of this option is "true".
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the focus_alert option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>focus_alert : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_focus_alert.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_focus_alert.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_focus_alert.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_focus_alert.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: focus_alert</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: focus_alert</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify if a "Editor is not focused" alert message should appear if the user calls tinyMCE.execCommand and havn't selected a editor instance before. This message will normaly not appear unless some integration has been made. Using tinyMCE.execInstanceCommand prevents this from happening since it auto focuses the editor specified. The default value of this option is "true".
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the focus_alert option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>focus_alert : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_font_size_classes.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_font_size_classes.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_font_size_classes.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: font_size_classes</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: font_size_classes</h1>
-</div>
-
-<div class="content">
-	<p>Comma separated list of class names that is to be used when the user selects font sizes, this option is only used when the <a href="option_convert_fonts_to_spans.html">convert_fonts_to_spans</a> option is enabled. This list of classes should be 7 items. This option is not used by default, but can be useful if you want to have custom classes for each font size for browser compatiblity.</p>
-	<div class="separator"></div>
-
-	<h3>Example of usage of the font_size_classes option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>font_size_classes : "fontSize1,fontSize2,fontSize3,fontSize4,fontSize5,fontSize6,fontSize7"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_font_size_classes.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_font_size_classes.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_font_size_classes.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_font_size_classes.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: font_size_classes</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: font_size_classes</h1>
+</div>
+
+<div class="content">
+	<p>Comma separated list of class names that is to be used when the user selects font sizes, this option is only used when the <a href="option_convert_fonts_to_spans.html">convert_fonts_to_spans</a> option is enabled. This list of classes should be 7 items. This option is not used by default, but can be useful if you want to have custom classes for each font size for browser compatiblity.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the font_size_classes option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>font_size_classes : "fontSize1,fontSize2,fontSize3,fontSize4,fontSize5,fontSize6,fontSize7"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_font_size_style_values.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_font_size_style_values.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_font_size_style_values.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: font_size_style_values</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: font_size_style_values</h1>
-</div>
-
-<div class="content">
-	<p>Comma separated list of style values that is to be used when the user selects font sizes, this option is only used when the <a href="option_convert_fonts_to_spans.html">convert_fonts_to_spans</a> option is enabled. This list of style values should be 7 items. This option is not used by default, but can be useful if you want to have custom CSS values for each font size for browser compatiblity. Defaults to: xx-small,x-small,small,medium,large,x-large,xx-large.</p>
-	<div class="separator"></div>
-
-	<h3>Example of usage of the font_size_style_values option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>font_size_style_values : "xx-small,x-small,small,medium,large,x-large,xx-large"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_font_size_style_values.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_font_size_style_values.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_font_size_style_values.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_font_size_style_values.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: font_size_style_values</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: font_size_style_values</h1>
+</div>
+
+<div class="content">
+	<p>Comma separated list of style values that is to be used when the user selects font sizes, this option is only used when the <a href="option_convert_fonts_to_spans.html">convert_fonts_to_spans</a> option is enabled. This list of style values should be 7 items. This option is not used by default, but can be useful if you want to have custom CSS values for each font size for browser compatiblity. Defaults to: xx-small,x-small,small,medium,large,x-large,xx-large.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the font_size_style_values option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>font_size_style_values : "xx-small,x-small,small,medium,large,x-large,xx-large"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_force_br_newlines.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_force_br_newlines.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_force_br_newlines.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: force_br_newlines</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: force_br_newlines</h1>
-</div>
-
-<div class="content">
-	<p>
-		If you set this option to true, TinyMCE will force BR elements on newlines instead of inserting paragraphs. This option is set to false by default since paragraphs is a much better concept. You can style P elements to be one row by adding p { margin: 0; padding: 0; } to your CSS, P tags where invented for a reason and should be used. <strong>BR elements should only be used when you really have to (mostly never)</strong>.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the force_br_newlines option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>force_br_newlines : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_force_br_newlines.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_force_br_newlines.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_force_br_newlines.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_force_br_newlines.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: force_br_newlines</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: force_br_newlines</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you set this option to true, TinyMCE will force BR elements on newlines instead of inserting paragraphs. This option is set to false by default since paragraphs is a much better concept. You can style P elements to be one row by adding p { margin: 0; padding: 0; } to your CSS, P tags where invented for a reason and should be used. <strong>BR elements should only be used when you really have to (mostly never)</strong>.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the force_br_newlines option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>force_br_newlines : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_force_hex_style_colors.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_force_hex_style_colors.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_force_hex_style_colors.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: force_hex_style_colors</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: force_hex_style_colors</h1>
-</div>
-
-<div class="content">
-	<p>This option enables you to control TinyMCE to force the color format to use hexa decimal instead of rgb strings. It converts for example "color: rgb(255, 255, 0)" to "#FFFF00". This option is set to true by default since otherwice MSIE and Firefox would differ in this behavior.</p>
-	<div class="separator"></div>
-
-	<h3>Example of usage of the force_hex_style_colors option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>force_hex_style_colors : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_force_hex_style_colors.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_force_hex_style_colors.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_force_hex_style_colors.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_force_hex_style_colors.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: force_hex_style_colors</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: force_hex_style_colors</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to control TinyMCE to force the color format to use hexa decimal instead of rgb strings. It converts for example "color: rgb(255, 255, 0)" to "#FFFF00". This option is set to true by default since otherwice MSIE and Firefox would differ in this behavior.</p>
+	<div class="separator"></div>
+
+	<h3>Example of usage of the force_hex_style_colors option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>force_hex_style_colors : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_force_p_newlines.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_force_p_newlines.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_force_p_newlines.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: force_p_newlines</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: force_p_newlines</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to disable/enable the creation of paragraphs on return/enter in Mozilla/Firefox. The default value of this option is true.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the force_p_newlines option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>force_p_newlines : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_force_p_newlines.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_force_p_newlines.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_force_p_newlines.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_force_p_newlines.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: force_p_newlines</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: force_p_newlines</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to disable/enable the creation of paragraphs on return/enter in Mozilla/Firefox. The default value of this option is true.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the force_p_newlines option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>force_p_newlines : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_handle_event_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_handle_event_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_handle_event_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,46 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: handle_event_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: handle_event_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a function name to be executed each time TinyMCE intercepts and handles a event such as keydown, mousedown and so forth. The format of this function is: handleEvent(event), where inst is the editor instance object reference. If the handle event function returns false it will terminate the internal event handling.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the handle_event_callback option:</h3>
-	<div class="example">
-<pre>
-// Remember to enable the possibility to switch status messages in the browser before trying the example below
-
-function <strong>myHandleEvent</strong>(e) {
-	window.status = "event:" + e.type;
-
-	return true; // Continue handling
-}
-
-tinyMCE.init({
-	...
-	<strong>handle_event_callback : "myHandleEvent"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_handle_event_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_handle_event_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_handle_event_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_handle_event_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,46 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: handle_event_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: handle_event_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a function name to be executed each time TinyMCE intercepts and handles a event such as keydown, mousedown and so forth. The format of this function is: handleEvent(event), where inst is the editor instance object reference. If the handle event function returns false it will terminate the internal event handling.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the handle_event_callback option:</h3>
+	<div class="example">
+<pre>
+// Remember to enable the possibility to switch status messages in the browser before trying the example below
+
+function <strong>myHandleEvent</strong>(e) {
+	window.status = "event:" + e.type;
+
+	return true; // Continue handling
+}
+
+tinyMCE.init({
+	...
+	<strong>handle_event_callback : "myHandleEvent"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_height.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_height.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_height.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: height</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: height</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option gives you the ability to specify the height of the editor in pixels or percent. This height can be very userful to specify if the editor is used in hidden tabs or if the editor area should be bigger than the replaced element. The default value of this option is set to the height of the HTML element TinyMCE replaces for example the pixel height of a textarea.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the height option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>height : "480"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_height.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_height.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_height.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_height.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: height</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: height</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option gives you the ability to specify the height of the editor in pixels or percent. This height can be very userful to specify if the editor is used in hidden tabs or if the editor area should be bigger than the replaced element. The default value of this option is set to the height of the HTML element TinyMCE replaces for example the pixel height of a textarea.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the height option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>height : "480"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_hidden_tab_class.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_hidden_tab_class.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_hidden_tab_class.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: hidden_tab_class</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: hidden_tab_class</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the hidden_tab_class option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>hidden_tab_class : "hideTab"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_hidden_tab_class.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_hidden_tab_class.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_hidden_tab_class.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_hidden_tab_class.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: hidden_tab_class</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: hidden_tab_class</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option is useful when TinyMCE is used within tabs in MSIE. This property is needed since MSIE has a bug where it's impossible to retrive the width/height on elements like images while it's hidden using display:none. So use this property to define the class name that is used to hide a specific tab, this will help TinyMCE to display the tab while getting the image data.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the hidden_tab_class option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>hidden_tab_class : "hideTab"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_init_instance_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_init_instance_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_init_instance_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: init_instance_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: init_instance_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a function name to be executed each time a editor instance is initialized. The format of this function is: initInstance(inst) where inst is the editor instance object reference.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the init_instance_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomInitInstance</strong>(inst) {
-	alert("Editor: " + inst.editorId + " is now initialized.");
-}
-
-tinyMCE.init({
-	...
-	<strong>init_instance_callback : "myCustomInitInstance"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_init_instance_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_init_instance_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_init_instance_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_init_instance_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: init_instance_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: init_instance_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a function name to be executed each time a editor instance is initialized. The format of this function is: initInstance(inst) where inst is the editor instance object reference.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the init_instance_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomInitInstance</strong>(inst) {
+	alert("Editor: " + inst.editorId + " is now initialized.");
+}
+
+tinyMCE.init({
+	...
+	<strong>init_instance_callback : "myCustomInitInstance"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_inline_styles.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_inline_styles.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_inline_styles.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: inline_styles</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: inline_styles</h1>
-</div>
-
-<div class="content">
-	<p>
-		If you enable the inline styles feature by setting this option to true. Most of the attributes gets converted into CSS style attributes instead. This will make the editor output more XHTML strict compatible.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the inline_styles option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>inline_styles : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_inline_styles.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_inline_styles.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_inline_styles.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_inline_styles.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: inline_styles</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: inline_styles</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you enable the inline styles feature by setting this option to true. Most of the attributes gets converted into CSS style attributes instead. This will make the editor output more XHTML strict compatible.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the inline_styles option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>inline_styles : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_insertimage_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_insertimage_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_insertimage_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,60 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: insertimage_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1><span class="marked">(deprecated)</span> Option: insertimage_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This callback was removed in 2.0.3, use <a href="option_execcommand_callback.html">execcommand_callback</a> instead this also enables you to override other things than the image and link dialogs.
-	</p>
-	<p>
-		This option enables you to override the built in functionality for inserting images. This option should contain a function name to be executed when a new image is inserted into TinyMCE. The format of this callback function is: insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the insertimage_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomInsertImage</strong>(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action) {
-	var result = new Array();
-
-	// Do some custom logic
-	result['src'] = "logo.jpg";
-	result['alt'] = "test description";
-	result['border'] = "2";
-	result['hspace'] = "5";
-	result['vspace'] = "5";
-	result['width'] = width;
-	result['height'] = height;
-	result['align'] = "right";
-	result['title'] = "Some title";
-	result['onmouseover'] = "";
-	result['onmouseout'] = "";
-
-	return data;
-}
-
-tinyMCE.init({
-	...
-	<strong>insertimage_callback : "myCustomInsertImage"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_insertimage_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_insertimage_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_insertimage_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_insertimage_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,60 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: insertimage_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1><span class="marked">(deprecated)</span> Option: insertimage_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This callback was removed in 2.0.3, use <a href="option_execcommand_callback.html">execcommand_callback</a> instead this also enables you to override other things than the image and link dialogs.
+	</p>
+	<p>
+		This option enables you to override the built in functionality for inserting images. This option should contain a function name to be executed when a new image is inserted into TinyMCE. The format of this callback function is: insertImage(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the insertimage_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomInsertImage</strong>(src, alt, border, hspace, vspace, width, height, align, title, onmouseover, onmouseout, action) {
+	var result = new Array();
+
+	// Do some custom logic
+	result['src'] = "logo.jpg";
+	result['alt'] = "test description";
+	result['border'] = "2";
+	result['hspace'] = "5";
+	result['vspace'] = "5";
+	result['width'] = width;
+	result['height'] = height;
+	result['align'] = "right";
+	result['title'] = "Some title";
+	result['onmouseover'] = "";
+	result['onmouseout'] = "";
+
+	return data;
+}
+
+tinyMCE.init({
+	...
+	<strong>insertimage_callback : "myCustomInsertImage"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_insertlink_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_insertlink_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_insertlink_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,53 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: insertlink_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1><span class="marked">(deprecated)</span> Option: insertlink_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This callback was removed in 2.0.3, use <a href="option_execcommand_callback.html">execcommand_callback</a> instead this also enables you to override other things than the image and link dialogs.
-	</p>
-	<p>
-		This option enables you to override the built in functionality for inserting links. This option should contain a function name to be executed when a new link is inserted into TinyMCE. The format of this callback function is: insertLink(href, target, title, onclick, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the insertlink_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomInsertLink</strong>(href, target, title, onclick, action) {
-	var result = new Array();
-
-	// Do some custom logic
-	result['href'] = "some_page.htm";
-	result['target'] = "_self";
-	result['title'] = "Some link title";
-	result['onclick'] = "";
-
-	return data;
-}
-
-tinyMCE.init({
-	...
-	<strong>insertlink_callback : "myCustomInsertLink"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_insertlink_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_insertlink_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_insertlink_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_insertlink_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: insertlink_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1><span class="marked">(deprecated)</span> Option: insertlink_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This callback was removed in 2.0.3, use <a href="option_execcommand_callback.html">execcommand_callback</a> instead this also enables you to override other things than the image and link dialogs.
+	</p>
+	<p>
+		This option enables you to override the built in functionality for inserting links. This option should contain a function name to be executed when a new link is inserted into TinyMCE. The format of this callback function is: insertLink(href, target, title, onclick, action). Where most of these options are self explained the action can be "update" or "insert" depending on what operation type. This function should return an array with the same values as the incomming parameters, the example below describes how this is done. This option is set to a internal TinyMCE function by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the insertlink_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomInsertLink</strong>(href, target, title, onclick, action) {
+	var result = new Array();
+
+	// Do some custom logic
+	result['href'] = "some_page.htm";
+	result['target'] = "_self";
+	result['title'] = "Some link title";
+	result['onclick'] = "";
+
+	return data;
+}
+
+tinyMCE.init({
+	...
+	<strong>insertlink_callback : "myCustomInsertLink"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_invalid_elements.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_invalid_elements.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_invalid_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: invalid_elements</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: invalid_elements</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of element names to exclude from the content. Elements in this list will removed when TinyMCE executes a cleanup.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the invalid_elements option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>invalid_elements : "strong,em"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_invalid_elements.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_invalid_elements.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_invalid_elements.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_invalid_elements.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: invalid_elements</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: invalid_elements</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of element names to exclude from the content. Elements in this list will removed when TinyMCE executes a cleanup.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the invalid_elements option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>invalid_elements : "strong,em"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_language.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_language.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_language.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: language</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: language</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a language code of the language pack to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of "tinymce/jscripts/tiny_mce/langs". The default value of this option is "en" for English.
-	</p>
-
-	<p>
-		If TinyMCE doesn't have a language pack for your language you could always write your own and contribute this back to this project by uploading it as a Patch at <a href="http://sourceforge.net/projects/tinymce/">SourceForge</a>. A description on how to create language packs can be found in <a href="customization_language_packs.html">Language packs</a> section.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the language option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>language : "en"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_language.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_language.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_language.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_language.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: language</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: language</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a language code of the language pack to use with TinyMCE. These codes are in <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-1</a> format to see if your language is available check the contents of "tinymce/jscripts/tiny_mce/langs". The default value of this option is "en" for English.
+	</p>
+
+	<p>
+		If TinyMCE doesn't have a language pack for your language you could always write your own and contribute this back to this project by uploading it as a Patch at <a href="http://sourceforge.net/projects/tinymce/">SourceForge</a>. A description on how to create language packs can be found in <a href="customization_language_packs.html">Language packs</a> section.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the language option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>language : "en"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: merge_styles_invalid_parents</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: merge_styles_invalid_parents</h1>
-</div>
-
-<div class="content">
-	<p>This option enables you to specify a regexp with elements you want to exclude from parent mergeing. By default style information are attached to the parent element of a selection if all childrent/the whole element contents is selected. For example if you select a whole strong element and select a font size, the font-size style will be applied to the strong element and not with a wrapping style element. But sometimes you want to force a span element, this is where this option comes in to place. This option is set to nothing by default and applies to the font size/face/color and class drop drown lists.</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the merge_styles_invalid_parents option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	// Excludes table cells and strong elements from any parent merge operation
-	<strong>merge_styles_invalid_parents : "^TD|STRONG$"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_merge_styles_invalid_parents.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: merge_styles_invalid_parents</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: merge_styles_invalid_parents</h1>
+</div>
+
+<div class="content">
+	<p>This option enables you to specify a regexp with elements you want to exclude from parent mergeing. By default style information are attached to the parent element of a selection if all childrent/the whole element contents is selected. For example if you select a whole strong element and select a font size, the font-size style will be applied to the strong element and not with a wrapping style element. But sometimes you want to force a span element, this is where this option comes in to place. This option is set to nothing by default and applies to the font size/face/color and class drop drown lists.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the merge_styles_invalid_parents option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	// Excludes table cells and strong elements from any parent merge operation
+	<strong>merge_styles_invalid_parents : "^TD|STRONG$"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_mode.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_mode.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_mode.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: mode</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: mode</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option specifies how elements is to be converted into TinyMCE WYSIWYG editor instances. This option can be set to any of the values below.
-	</p>
-
-	<p>
-		<h3>textareas</h3>
-		Converts all textarea elements to editors when the page loads.
-	</p>
-
-	<p>
-		<h3>specific_textareas</h3>
-		Converts all textarea elements with the a <a href="option_textarea_trigger.html">textarea_trigger</a> attribute set to "true".
-	</p>
-
-	<p>
-		<h3>exact</h3>
-		exact - Converts only explicit elements, these are listed in the <a href="option_elements.html">elements</a> option. These elements can be any kind for example textareas or divs.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the mode option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>mode : "exact",</strong>
-	elements : "elm1,elm2"
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_mode.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_mode.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_mode.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_mode.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: mode</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: mode</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option specifies how elements is to be converted into TinyMCE WYSIWYG editor instances. This option can be set to any of the values below.
+	</p>
+
+	<p>
+		<h3>textareas</h3>
+		Converts all textarea elements to editors when the page loads.
+	</p>
+
+	<p>
+		<h3>specific_textareas</h3>
+		Converts all textarea elements with the a <a href="option_textarea_trigger.html">textarea_trigger</a> attribute set to "true".
+	</p>
+
+	<p>
+		<h3>exact</h3>
+		exact - Converts only explicit elements, these are listed in the <a href="option_elements.html">elements</a> option. These elements can be any kind for example textareas or divs.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the mode option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>mode : "exact",</strong>
+	elements : "elm1,elm2"
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_nowrap.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_nowrap.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_nowrap.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: nowrap</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: nowrap</h1>
-</div>
-
-<div class="content">
-	<p>
-		This nowrap option enables you to control how whitespace is to be wordwrapped within the editor. This option is set to false by default, but if you enable it by setting it to true editor contents will never wrap.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the nowrap option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>nowrap : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_nowrap.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_nowrap.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_nowrap.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_nowrap.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: nowrap</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: nowrap</h1>
+</div>
+
+<div class="content">
+	<p>
+		This nowrap option enables you to control how whitespace is to be wordwrapped within the editor. This option is set to false by default, but if you enable it by setting it to true editor contents will never wrap.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the nowrap option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>nowrap : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_object_resizing.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_object_resizing.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_object_resizing.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: object_resizing</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: object_resizing</h1>
-</div>
-
-<div class="content">
-	<p>
-		This true/false option gives you the ability to turn on/off the inline resizing controls of tables and images in Firefox/Mozilla. These are enabled by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the object_resizing option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>object_resizing : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_object_resizing.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_object_resizing.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_object_resizing.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_object_resizing.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: object_resizing</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: object_resizing</h1>
+</div>
+
+<div class="content">
+	<p>
+		This true/false option gives you the ability to turn on/off the inline resizing controls of tables and images in Firefox/Mozilla. These are enabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the object_resizing option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>object_resizing : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_onchange_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_onchange_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_onchange_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: onchange_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: onchange_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a function name to be executed each time contents is modified by TinyMCE. This function is called each time a undo level is added to TinyMCE. The format of this function is: onchange(inst), where inst is the editor instance object reference.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the onchange_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomOnChangeHandler</strong>(inst) {
-	alert("Some one modified something");
-	alert("The HTML is now:" + inst.getBody().innerHTML);
-}
-
-tinyMCE.init({
-	...
-	<strong>onchange_callback : "myCustomOnChangeHandler"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_onchange_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_onchange_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_onchange_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_onchange_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: onchange_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: onchange_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a function name to be executed each time contents is modified by TinyMCE. This function is called each time a undo level is added to TinyMCE. The format of this function is: onchange(inst), where inst is the editor instance object reference.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the onchange_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomOnChangeHandler</strong>(inst) {
+	alert("Some one modified something");
+	alert("The HTML is now:" + inst.getBody().innerHTML);
+}
+
+tinyMCE.init({
+	...
+	<strong>onchange_callback : "myCustomOnChangeHandler"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_oninit.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_oninit.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_oninit.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: oninit</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: oninit</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify a function name to be executed when all editor instances has finished it's initialization. This is much like the onload event of a HTML page.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the oninit option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomOnInit</strong>() {
-	alert("We are ready to rumble!!");
-}
-
-tinyMCE.init({
-	...
-	<strong>oninit : "myCustomOnInit"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_oninit.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_oninit.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_oninit.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_oninit.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: oninit</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: oninit</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a function name to be executed when all editor instances has finished it's initialization. This is much like the onload event of a HTML page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the oninit option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomOnInit</strong>() {
+	alert("We are ready to rumble!!");
+}
+
+tinyMCE.init({
+	...
+	<strong>oninit : "myCustomOnInit"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_onpageload.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_onpageload.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_onpageload.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,42 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: onpageload</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: onpageload</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify a function name to be executed when the page is loaded but before the TinyMCE instances are created.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the onpageload option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomOnPageLoad</strong>() {
-	alert("We are nearly ready to rumble!!");
-}
-
-tinyMCE.init({
-	...
-	<strong>onpageload : "myCustomOnPageLoad"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_onpageload.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_onpageload.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_onpageload.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_onpageload.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,42 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: onpageload</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: onpageload</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify a function name to be executed when the page is loaded but before the TinyMCE instances are created.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the onpageload option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomOnPageLoad</strong>() {
+	alert("We are nearly ready to rumble!!");
+}
+
+tinyMCE.init({
+	...
+	<strong>onpageload : "myCustomOnPageLoad"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_plugins.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_plugins.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_plugins.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: plugins</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: plugins</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of plugins. Plugins are loaded from the "tinymce/jscripts/tiny_mce/plugins" directory and the plugin name matches the name of the directory. TinyMCE is shipped with some core plugins these are described in greater detail in the <a href="reference_plugins.html">Plugins reference</a>.
-	</p>
-	<p>
-		TinyMCE also supports the ability to have plugins added from a external resource, these plugins needs to be self registrering and loaded after the tinyMCE.init call. You should also prefix these plugins with a "-" character so that TinyMCE doesn't try to load it from the TinyMCE plugins directory.
-	</p>
-
-	<p>
-		There are many third party plugins for TinyMCE some of these may be found under "Plugins" at <a href="http://sourceforge.net/projects/tinymce/">SourceForge</a> and if you have developed one of your own please contribute it to this project by uploading it to SourceForge.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the plugins option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>plugins : "table,contextmenu,paste,-externalplugin"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_plugins.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_plugins.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_plugins.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_plugins.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: plugins</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: plugins</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of plugins. Plugins are loaded from the "tinymce/jscripts/tiny_mce/plugins" directory and the plugin name matches the name of the directory. TinyMCE is shipped with some core plugins these are described in greater detail in the <a href="reference_plugins.html">Plugins reference</a>.
+	</p>
+	<p>
+		TinyMCE also supports the ability to have plugins added from a external resource, these plugins needs to be self registrering and loaded after the tinyMCE.init call. You should also prefix these plugins with a "-" character so that TinyMCE doesn't try to load it from the TinyMCE plugins directory.
+	</p>
+
+	<p>
+		There are many third party plugins for TinyMCE some of these may be found under "Plugins" at <a href="http://sourceforge.net/projects/tinymce/">SourceForge</a> and if you have developed one of your own please contribute it to this project by uploading it to SourceForge.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the plugins option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>plugins : "table,contextmenu,paste,-externalplugin"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_popups_css.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_popups_css.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_popups_css.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: popups_css</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: popups_css</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify the CSS to be used in all popup/dialog windows within TinyMCE this option is set to a CSS file found in the currently used theme by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the popups_css option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>popups_css : "/mypopup.css"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_popups_css.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_popups_css.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_popups_css.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_popups_css.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: popups_css</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: popups_css</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify the CSS to be used in all popup/dialog windows within TinyMCE this option is set to a CSS file found in the currently used theme by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the popups_css option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>popups_css : "/mypopup.css"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_preformatted.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_preformatted.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_preformatted.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: preformatted</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: preformatted</h1>
-</div>
-
-<div class="content">
-	<p>
-		If you enable this feature, whitespace such as tabs and spaces will be preserved. Much like the bahavior of a PRE element. This can be handy when integrating TinyMCE with webmail clients. This option is disabled by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the preformatted option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>preformatted : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_preformatted.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_preformatted.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_preformatted.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_preformatted.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: preformatted</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: preformatted</h1>
+</div>
+
+<div class="content">
+	<p>
+		If you enable this feature, whitespace such as tabs and spaces will be preserved. Much like the bahavior of a PRE element. This can be handy when integrating TinyMCE with webmail clients. This option is disabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the preformatted option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>preformatted : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_relative_urls.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_relative_urls.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_relative_urls.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,36 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: relative_urls</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: relative_urls</h1>
-</div>
-
-<div class="content">
-	<p>If this option is set to true, all URLs returned from the MCFileManager will be relative from the specified <a href="option_document_base_url.html">document_base_url</a> if it's set to false all URLs will be converted to absolute URLs. This feature can not be disabled since MSIE and FF modifies the URLs of DOM objects by them self so TinyMCE tries to solve this problem by reconverting them. This option is set to true by default.</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the relative_urls option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>relative_urls : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_relative_urls.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_relative_urls.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_relative_urls.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_relative_urls.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: relative_urls</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: relative_urls</h1>
+</div>
+
+<div class="content">
+	<p>If this option is set to true, all URLs returned from the MCFileManager will be relative from the specified <a href="option_document_base_url.html">document_base_url</a> if it's set to false all URLs will be converted to absolute URLs. This feature can not be disabled since MSIE and FF modifies the URLs of DOM objects by them self so TinyMCE tries to solve this problem by reconverting them. This option is set to true by default.</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the relative_urls option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>relative_urls : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_remove_linebreaks.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_remove_linebreaks.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_remove_linebreaks.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: remove_linebreaks</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: remove_linebreaks</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option controls if linebreak characters should be removed from output HTML or not. This option is enabled by default since many backend systems use newline to <br /> convertion since they used to be plain old textarea based. With this option enables all HTML content will be placed on one line.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the remove_linebreaks option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>remove_linebreaks : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_remove_linebreaks.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_remove_linebreaks.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_remove_linebreaks.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_remove_linebreaks.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: remove_linebreaks</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: remove_linebreaks</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option controls if linebreak characters should be removed from output HTML or not. This option is enabled by default since many backend systems use newline to <br /> convertion since they used to be plain old textarea based. With this option enables all HTML content will be placed on one line.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the remove_linebreaks option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>remove_linebreaks : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_remove_script_host.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_remove_script_host.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_remove_script_host.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,37 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: remove_script_host</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: remove_script_host</h1>
-</div>
-
-<div class="content">
-	<p>If this option is enabled the protocol and host part of the URLs returned from the MCFileManager will be removed. This option is only used if the <a href="option_relative_urls.html">relative_urls</a> option is set to false. This option is set to true by default.</p>
-	<p>URL:s will be returned in this format: "/somedir/somefile.htm" instead of the default mode: "http://www.somesite.com/somedir/somefile.htm".</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the remove_script_host option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>remove_script_host : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_remove_script_host.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_remove_script_host.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_remove_script_host.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_remove_script_host.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,37 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: remove_script_host</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: remove_script_host</h1>
+</div>
+
+<div class="content">
+	<p>If this option is enabled the protocol and host part of the URLs returned from the MCFileManager will be removed. This option is only used if the <a href="option_relative_urls.html">relative_urls</a> option is set to false. This option is set to true by default.</p>
+	<p>URL:s will be returned in this format: "/somedir/somefile.htm" instead of the default mode: "http://www.somesite.com/somedir/somefile.htm".</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the remove_script_host option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>remove_script_host : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_save_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_save_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_save_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,45 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: save_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: save_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to add custom logic to be executed when the contents is extracted/saved. This custom logic can then modify the contents before it's submited to a serverside page. This can be useful if you want to do your own regexp cleanups and so forth. The format of this function is: saveContent(element_id, html, body). Where element id is the form element/div id of the editor and HTML is the HTML contents after the built in cleanup process has executed. This function should return the new HTML contents.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the save_callback option:</h3>
-	<div class="example">
-<pre>
-function <strong>myCustomSaveContent</strong>(element_id, html, body) {
-	// Do some custom HTML cleanup
-	html = html.replace(/a/g,'b');
-
-	return html;
-}
-
-tinyMCE.init({
-	...
-	<strong>save_callback : "myCustomSaveContent"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_save_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_save_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_save_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_save_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,45 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: save_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: save_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to add custom logic to be executed when the contents is extracted/saved. This custom logic can then modify the contents before it's submited to a serverside page. This can be useful if you want to do your own regexp cleanups and so forth. The format of this function is: saveContent(element_id, html, body). Where element id is the form element/div id of the editor and HTML is the HTML contents after the built in cleanup process has executed. This function should return the new HTML contents.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the save_callback option:</h3>
+	<div class="example">
+<pre>
+function <strong>myCustomSaveContent</strong>(element_id, html, body) {
+	// Do some custom HTML cleanup
+	html = html.replace(/a/g,'b');
+
+	return html;
+}
+
+tinyMCE.init({
+	...
+	<strong>save_callback : "myCustomSaveContent"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_setupcontent_callback.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_setupcontent_callback.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_setupcontent_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,43 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: setupcontent_callback</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: setupcontent_callback</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to execute custom setup content logic when the editor initializes. The format of this callback is:
-		setupContent(editor_id, body, doc). Where editor_id is the TinyMCE editor instance id the editor instance object reference can be retrived by using tinyMCE.getInstanceById(editor_id). The body parameter is a reference to the iframes body element and doc is the iframes document element. This option is not used if it's not specified.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the setupcontent_callback option:</h3>
-	<div class="example">
-<pre>
-function myCustomSetupContent(editor_id, body, doc) {
-	body.innerHTML = "my new content" + body.innerHTML;
-}
-
-tinyMCE.init({
-	...
-	<strong>setupcontent_callback : "myCustomSetupContent"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_setupcontent_callback.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_setupcontent_callback.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_setupcontent_callback.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_setupcontent_callback.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: setupcontent_callback</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: setupcontent_callback</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to execute custom setup content logic when the editor initializes. The format of this callback is:
+		setupContent(editor_id, body, doc). Where editor_id is the TinyMCE editor instance id the editor instance object reference can be retrived by using tinyMCE.getInstanceById(editor_id). The body parameter is a reference to the iframes body element and doc is the iframes document element. This option is not used if it's not specified.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the setupcontent_callback option:</h3>
+	<div class="example">
+<pre>
+function myCustomSetupContent(editor_id, body, doc) {
+	body.innerHTML = "my new content" + body.innerHTML;
+}
+
+tinyMCE.init({
+	...
+	<strong>setupcontent_callback : "myCustomSetupContent"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_strict_loading_mode.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_strict_loading_mode.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_strict_loading_mode.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-	<title>Option: strict_loading_mode</title>
-	<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: strict_loading_mode</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option will force TinyMCE to load script using a DOM insert method instead of document.write on Gecko browsers. Since this results in asynchronous script loading a build in synchronized will ensure that themes, plugins and language packs files are loaded in the correct order. This will on the otherhand make the initialization procedure of TinyMCE a bit slower thats why this isn't the default behavior. So this option is set to true by default if the document content type is application/xhtml+xml.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the strict_loading_mode option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>strict_loading_mode : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_strict_loading_mode.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_strict_loading_mode.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_strict_loading_mode.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_strict_loading_mode.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>Option: strict_loading_mode</title>
+	<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: strict_loading_mode</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option will force TinyMCE to load script using a DOM insert method instead of document.write on Gecko browsers. Since this results in asynchronous script loading a build in synchronized will ensure that themes, plugins and language packs files are loaded in the correct order. This will on the otherhand make the initialization procedure of TinyMCE a bit slower thats why this isn't the default behavior. So this option is set to true by default if the document content type is application/xhtml+xml.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the strict_loading_mode option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>strict_loading_mode : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_submit_patch.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_submit_patch.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_submit_patch.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: submit_patch</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: submit_patch</h1>
-</div>
-
-<div class="content">
-	<p>
-		This toggle option enables you to turn on/off the auto patching of the submit function in forms. TinyMCE will auto move contents from the iframe to the hidden textarea field if for example a JavaScript uses a form[0].submit() call. This is the same as using the tinyMCE.triggerSave() call. This option is set to true by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the submit_patch option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>submit_patch : false</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_submit_patch.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_submit_patch.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_submit_patch.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_submit_patch.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: submit_patch</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: submit_patch</h1>
+</div>
+
+<div class="content">
+	<p>
+		This toggle option enables you to turn on/off the auto patching of the submit function in forms. TinyMCE will auto move contents from the iframe to the hidden textarea field if for example a JavaScript uses a form[0].submit() call. This is the same as using the tinyMCE.triggerSave() call. This option is set to true by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the submit_patch option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>submit_patch : false</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_table_inline_editing.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_table_inline_editing.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_table_inline_editing.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: table_inline_editing</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: table_inline_editing</h1>
-</div>
-
-<div class="content">
-	<p>
-		This true/false option gives you the ability to turn on/off the inline table editing controls in Firefox/Mozilla. These controls are somewhat buggy and not redesignable so they are disabled by default.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the table_inline_editing option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>table_inline_editing : true</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_table_inline_editing.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_table_inline_editing.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_table_inline_editing.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_table_inline_editing.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: table_inline_editing</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: table_inline_editing</h1>
+</div>
+
+<div class="content">
+	<p>
+		This true/false option gives you the ability to turn on/off the inline table editing controls in Firefox/Mozilla. These controls are somewhat buggy and not redesignable so they are disabled by default.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the table_inline_editing option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>table_inline_editing : true</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_textarea_trigger.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_textarea_trigger.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_textarea_trigger.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,47 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: textarea_trigger</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: textarea_trigger</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify the name of the attribute to check if it's value is true/false. If the <a href="option_mode.html">mode</a> option is set to "specific_textareas", only specific textareas with a attribute by the name of the value of this option gets converted and only if it's set to true. This option defaults to "mce_editable".
-	</p>
-
-	<p>
-		If the mode is set to textareas and the textarea trigger attribute value is set to false, these textareas will not be converted.
-	</p>
-
-	<p>
-		<strong>Notice: This option is deprecated.</strong>
-		We strongly recommend you to use the <a href="option_editor_selector.html">editor_selector</a>/<a href="option_editor_deselector.html">editor_deselector</a> options instead since they validate with W3C specifications.<strong>
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the textarea_trigger option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>textarea_trigger : "convert_this"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_textarea_trigger.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_textarea_trigger.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_textarea_trigger.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_textarea_trigger.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: textarea_trigger</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: textarea_trigger</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify the name of the attribute to check if it's value is true/false. If the <a href="option_mode.html">mode</a> option is set to "specific_textareas", only specific textareas with a attribute by the name of the value of this option gets converted and only if it's set to true. This option defaults to "mce_editable".
+	</p>
+
+	<p>
+		If the mode is set to textareas and the textarea trigger attribute value is set to false, these textareas will not be converted.
+	</p>
+
+	<p>
+		<strong>Notice: This option is deprecated.</strong>
+		We strongly recommend you to use the <a href="option_editor_selector.html">editor_selector</a>/<a href="option_editor_deselector.html">editor_deselector</a> options instead since they validate with W3C specifications.<strong>
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the textarea_trigger option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>textarea_trigger : "convert_this"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_theme.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_theme.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_theme.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option enables you to specify what theme to use when rendering the TinyMCE WYSIWYG editor instances. This name matches the directories located in "tinymce/jscripts/tiny_mce/themes". The default value of this option is "advanced". TinyMCE has three built in themes and these are described in greater detail below.
-	</p>
-
-	<p>
-		<h3>advanced</h3>
-		This is the advanced theme of TinyMCE, this theme enables users to add/remove buttons and panels and is a lot more flexible than the simple or default theme. For more information about this themes specific options check the "Advanced theme" configuration section.
-	</p>
-
-	<p>
-		<h3>simple</h3>
-		This is the most simple theme for TinyMCE it contains only the basic functions.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme : "advanced",</strong>
-	theme_advanced_buttons3_add_before : "tablecontrols,separator"
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_theme.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_theme.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_theme.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_theme.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,49 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option enables you to specify what theme to use when rendering the TinyMCE WYSIWYG editor instances. This name matches the directories located in "tinymce/jscripts/tiny_mce/themes". The default value of this option is "advanced". TinyMCE has three built in themes and these are described in greater detail below.
+	</p>
+
+	<p>
+		<h3>advanced</h3>
+		This is the advanced theme of TinyMCE, this theme enables users to add/remove buttons and panels and is a lot more flexible than the simple or default theme. For more information about this themes specific options check the "Advanced theme" configuration section.
+	</p>
+
+	<p>
+		<h3>simple</h3>
+		This is the most simple theme for TinyMCE it contains only the basic functions.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme : "advanced",</strong>
+	theme_advanced_buttons3_add_before : "tablecontrols,separator"
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,38 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme_advanced_blockformats</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme_advanced_blockformats</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of block formats the default value of this option is "p,div,address,pre,h1,h2,h3,h4,h5,h6". This option is only available if the advanced theme is used.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme_advanced_blockformats option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6,div,blockquote,dt,dd,code,samp"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_blockformats.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,38 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_blockformats</title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_blockformats</h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of block formats the default value of this option is "p,div,address,pre,h1,h2,h3,h4,h5,h6". This option is only available if the advanced theme is used.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_blockformats option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_blockformats : "p,div,h1,h2,h3,h4,h5,h6,div,blockquote,dt,dd,code,samp"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme_advanced_buttons<1-n></title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme_advanced_buttons<1-n></h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of button/control names to insert into the toolbar. The number 1-n is the row number to insert the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
-		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of "SimpleLayout".
-	</p>
-	<p>
-		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme_advanced_buttons<1-n> option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme_advanced_buttons1 : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
-	<strong>theme_advanced_buttons2 : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
-	<strong>theme_advanced_buttons3 : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_buttons<1-n></title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_buttons<1-n></h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of button/control names to insert into the toolbar. The number 1-n is the row number to insert the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of "SimpleLayout".
+	</p>
+	<p>
+		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_buttons<1-n> option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_buttons1 : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
+	<strong>theme_advanced_buttons2 : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
+	<strong>theme_advanced_buttons3 : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme_advanced_buttons<1-n_add></title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme_advanced_buttons<1-n_add></h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of button/control names to add to the end of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
-		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of "SimpleLayout".
-	</p>
-	<p>
-		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme_advanced_buttons<1-n>_add option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme_advanced_buttons1_add : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
-	<strong>theme_advanced_buttons2_add : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
-	<strong>theme_advanced_buttons3_add : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_buttons<1-n_add></title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_buttons<1-n_add></h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of button/control names to add to the end of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of "SimpleLayout".
+	</p>
+	<p>
+		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_buttons<1-n>_add option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_buttons1_add : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
+	<strong>theme_advanced_buttons2_add : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
+	<strong>theme_advanced_buttons3_add : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme_advanced_buttons<1-n_add_before></title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme_advanced_buttons<1-n_add_before></h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain a comma separated list of button/control names to add to the beginning of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
-		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of "SimpleLayout".
-	</p>
-	<p>
-		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme_advanced_buttons<1-n>_add_before option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme_advanced_buttons1_add_before : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
-	<strong>theme_advanced_buttons2_add_before : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
-	<strong>theme_advanced_buttons3_add_before : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_buttons_n_add_before.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,44 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_buttons<1-n_add_before></title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_buttons<1-n_add_before></h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain a comma separated list of button/control names to add to the beginning of the specified toolbar row. The number 1-n is the row number to add the buttons/controls to. Below is a list of built in controls, plugins may include other controls names that can be inserted but these are documented in the individual plugins.
+		This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the default value of "SimpleLayout".
+	</p>
+	<p>
+		A complete reference of all built in buttons and controls can be found in the <a href="reference_buttons.html">button/control reference</a> page.
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_buttons<1-n>_add_before option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_buttons1_add_before : "separator,insertdate,inserttime,preview,zoom,separator,forecolor,backcolor"</strong>
+	<strong>theme_advanced_buttons2_add_before : "bullist,numlist,separator,outdent,indent,separator,undo,redo,separator,link,unlink,anchor,image,cleanup,help,code"</strong>
+	<strong>theme_advanced_buttons3_add_before : "hr,removeformat,visualaid,separator,sub,sup,separator,charmap"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_theme_advanced_container.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_container.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_container.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme_advanced_container_<container></title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme_advanced_container_<container></h1>
-</div>
-
-<div class="content">
-	<p>
-		This option should contain buttons/control that you wich to insert into the container, the button names available is the same as in the <a href="option_theme_advanced_buttons_n.html">theme_advanced_buttons_<1-3></a> option but two extra controls available when this layout option is used these are "mceEditor" and "mceElementpath". The <container> part of this option should be replaced with a name within the <a href="option_theme_advanced_containers.html">theme_advanced_containers</a> list. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of "RowLayout".
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme_advanced_container_<container> option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme_advanced_container_somecontainer1 : "bold,italic",</strong>
-	<strong>theme_advanced_container_somecontainer2 : "strikethrough,cut"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
-	<br style="clear: both" />
-</div>
-
-</body>
-</html>

Copied: trunk/htdocs/js/tinymce/docs/option_theme_advanced_container.html (from rev 656, branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_container.html)
===================================================================
--- trunk/htdocs/js/tinymce/docs/option_theme_advanced_container.html	                        (rev 0)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_container.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -0,0 +1,39 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Option: theme_advanced_container_<container></title>
+<link href="css/screen.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div class="header">
+	<h1>Option: theme_advanced_container_<container></h1>
+</div>
+
+<div class="content">
+	<p>
+		This option should contain buttons/control that you wich to insert into the container, the button names available is the same as in the <a href="option_theme_advanced_buttons_n.html">theme_advanced_buttons_<1-3></a> option but two extra controls available when this layout option is used these are "mceEditor" and "mceElementpath". The <container> part of this option should be replaced with a name within the <a href="option_theme_advanced_containers.html">theme_advanced_containers</a> list. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of "RowLayout".
+	</p>
+
+	<div class="separator"></div>
+
+	<h3>Example of usage of the theme_advanced_container_<container> option:</h3>
+	<div class="example">
+<pre>
+tinyMCE.init({
+	...
+	<strong>theme_advanced_container_somecontainer1 : "bold,italic",</strong>
+	<strong>theme_advanced_container_somecontainer2 : "strikethrough,cut"</strong>
+});
+</pre>
+	</div>
+</div>
+
+<div class="footer">
+	<div class="helpindexlink"><a href="index.html">Index</a></div>
+	<div class="copyright">Copyright © 2003-2006 <a href="http://www.moxiecode.com">Moxiecode Systems AB</a></div>
+	<br style="clear: both" />
+</div>
+
+</body>
+</html>

Deleted: trunk/htdocs/js/tinymce/docs/option_theme_advanced_container_align.html
===================================================================
--- branches/sucs-site/htdocs/js/tinymce/docs/option_theme_advanced_container_align.html	2015-04-05 15:53:18 UTC (rev 656)
+++ trunk/htdocs/js/tinymce/docs/option_theme_advanced_container_align.html	2015-04-05 16:42:47 UTC (rev 657)
@@ -1,39 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Option: theme_advanced_container_align</title>
-<link href="css/screen.css" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div class="header">
-	<h1>Option: theme_advanced_container_<container>_align</h1>
-</div>
-
-<div class="content">
-	<p>
-		This option is used to set the alignment of a specific containerer. The <container> part of this option should be replaced with a name within the <a href="option_theme_advanced_containers.html">theme_advanced_containers</a> list. This option can only be used when <a href="option_theme.html">theme</a> is set to advanced and when the <a href="option_theme_advanced_layout_manager.html">theme_advanced_layout_manager</a> option is set to the value of "RowLayout".
-	</p>
-
-	<div class="separator"></div>
-
-	<h3>Example of usage of the theme_advanced_container_<container>_align option:</h3>
-	<div class="example">
-<pre>
-tinyMCE.init({
-	...
-	<strong>theme_advanced_container_somecontainer1_align : "left"</strong>
-	<strong>theme_advanced_container_somecontainer2_align : "right"</strong>
-});
-</pre>
-	</div>
-</div>
-
-<div class="footer">
-	<div class="helpindexlink"><a href="index.html">Index</a></div>
-	<div cla