Menu
▾
▴
upstage-commits
|
From: <aut...@us...> - 2012-07-19 10:13:27
|
Revision: 339
http://upstage.svn.sourceforge.net/upstage/?rev=339&view=rev
Author: aut-upstage
Date: 2012-07-19 10:13:15 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
19/07/2012 UpStage 2.4.2
- With Player Search on Edit player
- Page Edit Mode
Modified Paths:
--------------
branches/2.4.2/config/audios.xml
branches/2.4.2/config/avatars.xml
branches/2.4.2/config/backdrops.xml
branches/2.4.2/config/players.xml
branches/2.4.2/config/stages.xml
branches/2.4.2/config/templates/editplayer.xhtml
branches/2.4.2/config/templates/home.xhtml
branches/2.4.2/config/templates/master_a.inc
branches/2.4.2/config/templates/master_b.inc
branches/2.4.2/config/templates/mediaedit.xhtml
branches/2.4.2/config/templates/mediaupload.xhtml
branches/2.4.2/config/templates/nonadmin.xhtml
branches/2.4.2/config/templates/stage.xhtml
branches/2.4.2/config/templates/stage_item_set.inc
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/config/templates/stagelist.xhtml
branches/2.4.2/config/templates/workshop.xhtml
branches/2.4.2/config/templates/workshop_nav.inc
branches/2.4.2/html/admin/nonadmin/index.html
branches/2.4.2/html/masterpage.js
branches/2.4.2/html/mediaedit.js
branches/2.4.2/html/stageedit.js
branches/2.4.2/html/style/main.css
branches/2.4.2/html/user.js
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/player.py
branches/2.4.2/upstage/stage.py
branches/2.4.2/upstage/web.py
Added Paths:
-----------
branches/2.4.2/config/stages/
branches/2.4.2/config/templates/edit.xhtml
branches/2.4.2/config/templates/edit_head.inc
branches/2.4.2/config/templates/home_editable.default
branches/2.4.2/config/templates/home_editable.inc
branches/2.4.2/config/templates/no_menu_master_a.inc
branches/2.4.2/config/templates/pageedit.xhtml
branches/2.4.2/config/templates/workshop_editable.default
branches/2.4.2/config/templates/workshop_editable.inc
branches/2.4.2/html/ckedit/
branches/2.4.2/html/ckedit/adapters/
branches/2.4.2/html/ckedit/adapters/jquery.js
branches/2.4.2/html/ckedit/ckeditor.js
branches/2.4.2/html/ckedit/contents.css
branches/2.4.2/html/ckedit/images/
branches/2.4.2/html/ckedit/images/spacer.gif
branches/2.4.2/html/ckedit/lang/
branches/2.4.2/html/ckedit/lang/_languages.js
branches/2.4.2/html/ckedit/lang/_translationstatus.txt
branches/2.4.2/html/ckedit/lang/af.js
branches/2.4.2/html/ckedit/lang/ar.js
branches/2.4.2/html/ckedit/lang/bg.js
branches/2.4.2/html/ckedit/lang/bn.js
branches/2.4.2/html/ckedit/lang/bs.js
branches/2.4.2/html/ckedit/lang/ca.js
branches/2.4.2/html/ckedit/lang/cs.js
branches/2.4.2/html/ckedit/lang/cy.js
branches/2.4.2/html/ckedit/lang/da.js
branches/2.4.2/html/ckedit/lang/de.js
branches/2.4.2/html/ckedit/lang/el.js
branches/2.4.2/html/ckedit/lang/en-au.js
branches/2.4.2/html/ckedit/lang/en-ca.js
branches/2.4.2/html/ckedit/lang/en-gb.js
branches/2.4.2/html/ckedit/lang/en.js
branches/2.4.2/html/ckedit/lang/eo.js
branches/2.4.2/html/ckedit/lang/es.js
branches/2.4.2/html/ckedit/lang/et.js
branches/2.4.2/html/ckedit/lang/eu.js
branches/2.4.2/html/ckedit/lang/fa.js
branches/2.4.2/html/ckedit/lang/fi.js
branches/2.4.2/html/ckedit/lang/fo.js
branches/2.4.2/html/ckedit/lang/fr-ca.js
branches/2.4.2/html/ckedit/lang/fr.js
branches/2.4.2/html/ckedit/lang/gl.js
branches/2.4.2/html/ckedit/lang/gu.js
branches/2.4.2/html/ckedit/lang/he.js
branches/2.4.2/html/ckedit/lang/hi.js
branches/2.4.2/html/ckedit/lang/hr.js
branches/2.4.2/html/ckedit/lang/hu.js
branches/2.4.2/html/ckedit/lang/is.js
branches/2.4.2/html/ckedit/lang/it.js
branches/2.4.2/html/ckedit/lang/ja.js
branches/2.4.2/html/ckedit/lang/ka.js
branches/2.4.2/html/ckedit/lang/km.js
branches/2.4.2/html/ckedit/lang/ko.js
branches/2.4.2/html/ckedit/lang/lt.js
branches/2.4.2/html/ckedit/lang/lv.js
branches/2.4.2/html/ckedit/lang/mk.js
branches/2.4.2/html/ckedit/lang/mn.js
branches/2.4.2/html/ckedit/lang/ms.js
branches/2.4.2/html/ckedit/lang/nb.js
branches/2.4.2/html/ckedit/lang/nl.js
branches/2.4.2/html/ckedit/lang/no.js
branches/2.4.2/html/ckedit/lang/pl.js
branches/2.4.2/html/ckedit/lang/pt-br.js
branches/2.4.2/html/ckedit/lang/pt.js
branches/2.4.2/html/ckedit/lang/ro.js
branches/2.4.2/html/ckedit/lang/ru.js
branches/2.4.2/html/ckedit/lang/sk.js
branches/2.4.2/html/ckedit/lang/sl.js
branches/2.4.2/html/ckedit/lang/sr-latn.js
branches/2.4.2/html/ckedit/lang/sr.js
branches/2.4.2/html/ckedit/lang/sv.js
branches/2.4.2/html/ckedit/lang/th.js
branches/2.4.2/html/ckedit/lang/tr.js
branches/2.4.2/html/ckedit/lang/ug.js
branches/2.4.2/html/ckedit/lang/uk.js
branches/2.4.2/html/ckedit/lang/vi.js
branches/2.4.2/html/ckedit/lang/zh-cn.js
branches/2.4.2/html/ckedit/lang/zh.js
branches/2.4.2/html/ckedit/plugins/
branches/2.4.2/html/ckedit/plugins/a11yhelp/
branches/2.4.2/html/ckedit/plugins/a11yhelp/dialogs/
branches/2.4.2/html/ckedit/plugins/a11yhelp/dialogs/a11yhelp.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/_translationstatus.txt
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/cs.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/cy.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/da.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/de.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/el.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/en.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/eo.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/fa.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/fi.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/fr.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/gu.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/he.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/it.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/mk.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/nb.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/nl.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/no.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/tr.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/ug.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/vi.js
branches/2.4.2/html/ckedit/plugins/a11yhelp/lang/zh-cn.js
branches/2.4.2/html/ckedit/plugins/about/
branches/2.4.2/html/ckedit/plugins/about/dialogs/
branches/2.4.2/html/ckedit/plugins/about/dialogs/about.js
branches/2.4.2/html/ckedit/plugins/about/dialogs/logo_ckeditor.png
branches/2.4.2/html/ckedit/plugins/adobeair/
branches/2.4.2/html/ckedit/plugins/adobeair/plugin.js
branches/2.4.2/html/ckedit/plugins/ajax/
branches/2.4.2/html/ckedit/plugins/ajax/plugin.js
branches/2.4.2/html/ckedit/plugins/autogrow/
branches/2.4.2/html/ckedit/plugins/autogrow/plugin.js
branches/2.4.2/html/ckedit/plugins/bbcode/
branches/2.4.2/html/ckedit/plugins/bbcode/plugin.js
branches/2.4.2/html/ckedit/plugins/clipboard/
branches/2.4.2/html/ckedit/plugins/clipboard/dialogs/
branches/2.4.2/html/ckedit/plugins/clipboard/dialogs/paste.js
branches/2.4.2/html/ckedit/plugins/colordialog/
branches/2.4.2/html/ckedit/plugins/colordialog/dialogs/
branches/2.4.2/html/ckedit/plugins/colordialog/dialogs/colordialog.js
branches/2.4.2/html/ckedit/plugins/devtools/
branches/2.4.2/html/ckedit/plugins/devtools/lang/
branches/2.4.2/html/ckedit/plugins/devtools/lang/_translationstatus.txt
branches/2.4.2/html/ckedit/plugins/devtools/lang/bg.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/cs.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/cy.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/da.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/de.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/el.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/en.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/eo.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/et.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/fa.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/fi.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/fr.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/gu.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/he.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/hr.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/it.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/nb.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/nl.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/no.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/pl.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/tr.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/ug.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/uk.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/vi.js
branches/2.4.2/html/ckedit/plugins/devtools/lang/zh-cn.js
branches/2.4.2/html/ckedit/plugins/devtools/plugin.js
branches/2.4.2/html/ckedit/plugins/dialog/
branches/2.4.2/html/ckedit/plugins/dialog/dialogDefinition.js
branches/2.4.2/html/ckedit/plugins/div/
branches/2.4.2/html/ckedit/plugins/div/dialogs/
branches/2.4.2/html/ckedit/plugins/div/dialogs/div.js
branches/2.4.2/html/ckedit/plugins/docprops/
branches/2.4.2/html/ckedit/plugins/docprops/dialogs/
branches/2.4.2/html/ckedit/plugins/docprops/dialogs/docprops.js
branches/2.4.2/html/ckedit/plugins/docprops/plugin.js
branches/2.4.2/html/ckedit/plugins/find/
branches/2.4.2/html/ckedit/plugins/find/dialogs/
branches/2.4.2/html/ckedit/plugins/find/dialogs/find.js
branches/2.4.2/html/ckedit/plugins/flash/
branches/2.4.2/html/ckedit/plugins/flash/dialogs/
branches/2.4.2/html/ckedit/plugins/flash/dialogs/flash.js
branches/2.4.2/html/ckedit/plugins/flash/images/
branches/2.4.2/html/ckedit/plugins/flash/images/placeholder.png
branches/2.4.2/html/ckedit/plugins/forms/
branches/2.4.2/html/ckedit/plugins/forms/dialogs/
branches/2.4.2/html/ckedit/plugins/forms/dialogs/button.js
branches/2.4.2/html/ckedit/plugins/forms/dialogs/checkbox.js
branches/2.4.2/html/ckedit/plugins/forms/dialogs/form.js
branches/2.4.2/html/ckedit/plugins/forms/dialogs/hiddenfield.js
branches/2.4.2/html/ckedit/plugins/forms/dialogs/radio.js
branches/2.4.2/html/ckedit/plugins/forms/dialogs/select.js
branches/2.4.2/html/ckedit/plugins/forms/dialogs/textarea.js
branches/2.4.2/html/ckedit/plugins/forms/dialogs/textfield.js
branches/2.4.2/html/ckedit/plugins/forms/images/
branches/2.4.2/html/ckedit/plugins/forms/images/hiddenfield.gif
branches/2.4.2/html/ckedit/plugins/iframe/
branches/2.4.2/html/ckedit/plugins/iframe/dialogs/
branches/2.4.2/html/ckedit/plugins/iframe/dialogs/iframe.js
branches/2.4.2/html/ckedit/plugins/iframe/images/
branches/2.4.2/html/ckedit/plugins/iframe/images/placeholder.png
branches/2.4.2/html/ckedit/plugins/iframedialog/
branches/2.4.2/html/ckedit/plugins/iframedialog/plugin.js
branches/2.4.2/html/ckedit/plugins/image/
branches/2.4.2/html/ckedit/plugins/image/dialogs/
branches/2.4.2/html/ckedit/plugins/image/dialogs/image.js
branches/2.4.2/html/ckedit/plugins/link/
branches/2.4.2/html/ckedit/plugins/link/dialogs/
branches/2.4.2/html/ckedit/plugins/link/dialogs/anchor.js
branches/2.4.2/html/ckedit/plugins/link/dialogs/link.js
branches/2.4.2/html/ckedit/plugins/link/images/
branches/2.4.2/html/ckedit/plugins/link/images/anchor.gif
branches/2.4.2/html/ckedit/plugins/liststyle/
branches/2.4.2/html/ckedit/plugins/liststyle/dialogs/
branches/2.4.2/html/ckedit/plugins/liststyle/dialogs/liststyle.js
branches/2.4.2/html/ckedit/plugins/pagebreak/
branches/2.4.2/html/ckedit/plugins/pagebreak/images/
branches/2.4.2/html/ckedit/plugins/pagebreak/images/pagebreak.gif
branches/2.4.2/html/ckedit/plugins/pastefromword/
branches/2.4.2/html/ckedit/plugins/pastefromword/filter/
branches/2.4.2/html/ckedit/plugins/pastefromword/filter/default.js
branches/2.4.2/html/ckedit/plugins/pastetext/
branches/2.4.2/html/ckedit/plugins/pastetext/dialogs/
branches/2.4.2/html/ckedit/plugins/pastetext/dialogs/pastetext.js
branches/2.4.2/html/ckedit/plugins/placeholder/
branches/2.4.2/html/ckedit/plugins/placeholder/dialogs/
branches/2.4.2/html/ckedit/plugins/placeholder/dialogs/placeholder.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/
branches/2.4.2/html/ckedit/plugins/placeholder/lang/_translationstatus.txt
branches/2.4.2/html/ckedit/plugins/placeholder/lang/bg.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/cs.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/cy.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/da.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/de.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/el.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/en.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/eo.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/et.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/fa.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/fi.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/fr.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/he.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/hr.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/it.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/nb.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/nl.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/no.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/pl.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/tr.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/ug.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/uk.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/vi.js
branches/2.4.2/html/ckedit/plugins/placeholder/lang/zh-cn.js
branches/2.4.2/html/ckedit/plugins/placeholder/placeholder.gif
branches/2.4.2/html/ckedit/plugins/placeholder/plugin.js
branches/2.4.2/html/ckedit/plugins/scayt/
branches/2.4.2/html/ckedit/plugins/scayt/dialogs/
branches/2.4.2/html/ckedit/plugins/scayt/dialogs/options.js
branches/2.4.2/html/ckedit/plugins/scayt/dialogs/toolbar.css
branches/2.4.2/html/ckedit/plugins/showblocks/
branches/2.4.2/html/ckedit/plugins/showblocks/images/
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_address.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_blockquote.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_div.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_h1.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_h2.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_h3.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_h4.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_h5.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_h6.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_p.png
branches/2.4.2/html/ckedit/plugins/showblocks/images/block_pre.png
branches/2.4.2/html/ckedit/plugins/smiley/
branches/2.4.2/html/ckedit/plugins/smiley/dialogs/
branches/2.4.2/html/ckedit/plugins/smiley/dialogs/smiley.js
branches/2.4.2/html/ckedit/plugins/smiley/images/
branches/2.4.2/html/ckedit/plugins/smiley/images/angel_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/angry_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/broken_heart.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/confused_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/cry_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/devil_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/embaressed_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/envelope.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/heart.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/kiss.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/lightbulb.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/omg_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/regular_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/sad_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/shades_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/teeth_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/thumbs_down.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/thumbs_up.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/tounge_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/whatchutalkingabout_smile.gif
branches/2.4.2/html/ckedit/plugins/smiley/images/wink_smile.gif
branches/2.4.2/html/ckedit/plugins/specialchar/
branches/2.4.2/html/ckedit/plugins/specialchar/dialogs/
branches/2.4.2/html/ckedit/plugins/specialchar/dialogs/specialchar.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/
branches/2.4.2/html/ckedit/plugins/specialchar/lang/_translationstatus.txt
branches/2.4.2/html/ckedit/plugins/specialchar/lang/cs.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/cy.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/de.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/en.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/eo.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/et.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/fa.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/fi.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/fr.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/hr.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/it.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/nb.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/nl.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/no.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/tr.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/ug.js
branches/2.4.2/html/ckedit/plugins/specialchar/lang/zh-cn.js
branches/2.4.2/html/ckedit/plugins/styles/
branches/2.4.2/html/ckedit/plugins/styles/styles/
branches/2.4.2/html/ckedit/plugins/styles/styles/default.js
branches/2.4.2/html/ckedit/plugins/stylesheetparser/
branches/2.4.2/html/ckedit/plugins/stylesheetparser/plugin.js
branches/2.4.2/html/ckedit/plugins/table/
branches/2.4.2/html/ckedit/plugins/table/dialogs/
branches/2.4.2/html/ckedit/plugins/table/dialogs/table.js
branches/2.4.2/html/ckedit/plugins/tableresize/
branches/2.4.2/html/ckedit/plugins/tableresize/plugin.js
branches/2.4.2/html/ckedit/plugins/tabletools/
branches/2.4.2/html/ckedit/plugins/tabletools/dialogs/
branches/2.4.2/html/ckedit/plugins/tabletools/dialogs/tableCell.js
branches/2.4.2/html/ckedit/plugins/templates/
branches/2.4.2/html/ckedit/plugins/templates/dialogs/
branches/2.4.2/html/ckedit/plugins/templates/dialogs/templates.js
branches/2.4.2/html/ckedit/plugins/templates/templates/
branches/2.4.2/html/ckedit/plugins/templates/templates/default.js
branches/2.4.2/html/ckedit/plugins/templates/templates/images/
branches/2.4.2/html/ckedit/plugins/templates/templates/images/template1.gif
branches/2.4.2/html/ckedit/plugins/templates/templates/images/template2.gif
branches/2.4.2/html/ckedit/plugins/templates/templates/images/template3.gif
branches/2.4.2/html/ckedit/plugins/uicolor/
branches/2.4.2/html/ckedit/plugins/uicolor/dialogs/
branches/2.4.2/html/ckedit/plugins/uicolor/dialogs/uicolor.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/
branches/2.4.2/html/ckedit/plugins/uicolor/lang/_translationstatus.txt
branches/2.4.2/html/ckedit/plugins/uicolor/lang/bg.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/cs.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/cy.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/da.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/de.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/el.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/en.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/eo.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/et.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/fa.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/fi.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/fr.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/he.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/hr.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/it.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/mk.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/nb.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/nl.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/no.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/pl.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/tr.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/ug.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/uk.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/vi.js
branches/2.4.2/html/ckedit/plugins/uicolor/lang/zh-cn.js
branches/2.4.2/html/ckedit/plugins/uicolor/plugin.js
branches/2.4.2/html/ckedit/plugins/uicolor/uicolor.gif
branches/2.4.2/html/ckedit/plugins/uicolor/yui/
branches/2.4.2/html/ckedit/plugins/uicolor/yui/assets/
branches/2.4.2/html/ckedit/plugins/uicolor/yui/assets/hue_bg.png
branches/2.4.2/html/ckedit/plugins/uicolor/yui/assets/hue_thumb.png
branches/2.4.2/html/ckedit/plugins/uicolor/yui/assets/picker_mask.png
branches/2.4.2/html/ckedit/plugins/uicolor/yui/assets/picker_thumb.png
branches/2.4.2/html/ckedit/plugins/uicolor/yui/assets/yui.css
branches/2.4.2/html/ckedit/plugins/uicolor/yui/yui.js
branches/2.4.2/html/ckedit/plugins/wsc/
branches/2.4.2/html/ckedit/plugins/wsc/dialogs/
branches/2.4.2/html/ckedit/plugins/wsc/dialogs/ciframe.html
branches/2.4.2/html/ckedit/plugins/wsc/dialogs/tmpFrameset.html
branches/2.4.2/html/ckedit/plugins/wsc/dialogs/wsc.css
branches/2.4.2/html/ckedit/plugins/wsc/dialogs/wsc.js
branches/2.4.2/html/ckedit/plugins/xml/
branches/2.4.2/html/ckedit/plugins/xml/plugin.js
branches/2.4.2/html/ckedit/skins/
branches/2.4.2/html/ckedit/skins/kama/
branches/2.4.2/html/ckedit/skins/kama/dialog.css
branches/2.4.2/html/ckedit/skins/kama/editor.css
branches/2.4.2/html/ckedit/skins/kama/icons.png
branches/2.4.2/html/ckedit/skins/kama/icons_rtl.png
branches/2.4.2/html/ckedit/skins/kama/images/
branches/2.4.2/html/ckedit/skins/kama/images/dialog_sides.gif
branches/2.4.2/html/ckedit/skins/kama/images/dialog_sides.png
branches/2.4.2/html/ckedit/skins/kama/images/dialog_sides_rtl.png
branches/2.4.2/html/ckedit/skins/kama/images/mini.gif
branches/2.4.2/html/ckedit/skins/kama/images/noimage.png
branches/2.4.2/html/ckedit/skins/kama/images/sprites.png
branches/2.4.2/html/ckedit/skins/kama/images/sprites_ie6.png
branches/2.4.2/html/ckedit/skins/kama/images/toolbar_start.gif
branches/2.4.2/html/ckedit/skins/kama/skin.js
branches/2.4.2/html/ckedit/skins/kama/templates.css
branches/2.4.2/html/ckedit/skins/office2003/
branches/2.4.2/html/ckedit/skins/office2003/dialog.css
branches/2.4.2/html/ckedit/skins/office2003/editor.css
branches/2.4.2/html/ckedit/skins/office2003/icons.png
branches/2.4.2/html/ckedit/skins/office2003/icons_rtl.png
branches/2.4.2/html/ckedit/skins/office2003/images/
branches/2.4.2/html/ckedit/skins/office2003/images/dialog_sides.gif
branches/2.4.2/html/ckedit/skins/office2003/images/dialog_sides.png
branches/2.4.2/html/ckedit/skins/office2003/images/dialog_sides_rtl.png
branches/2.4.2/html/ckedit/skins/office2003/images/mini.gif
branches/2.4.2/html/ckedit/skins/office2003/images/noimage.png
branches/2.4.2/html/ckedit/skins/office2003/images/sprites.png
branches/2.4.2/html/ckedit/skins/office2003/images/sprites_ie6.png
branches/2.4.2/html/ckedit/skins/office2003/skin.js
branches/2.4.2/html/ckedit/skins/office2003/templates.css
branches/2.4.2/html/ckedit/skins/v2/
branches/2.4.2/html/ckedit/skins/v2/dialog.css
branches/2.4.2/html/ckedit/skins/v2/editor.css
branches/2.4.2/html/ckedit/skins/v2/icons.png
branches/2.4.2/html/ckedit/skins/v2/icons_rtl.png
branches/2.4.2/html/ckedit/skins/v2/images/
branches/2.4.2/html/ckedit/skins/v2/images/dialog_sides.gif
branches/2.4.2/html/ckedit/skins/v2/images/dialog_sides.png
branches/2.4.2/html/ckedit/skins/v2/images/dialog_sides_rtl.png
branches/2.4.2/html/ckedit/skins/v2/images/mini.gif
branches/2.4.2/html/ckedit/skins/v2/images/noimage.png
branches/2.4.2/html/ckedit/skins/v2/images/sprites.png
branches/2.4.2/html/ckedit/skins/v2/images/sprites_ie6.png
branches/2.4.2/html/ckedit/skins/v2/images/toolbar_start.gif
branches/2.4.2/html/ckedit/skins/v2/skin.js
branches/2.4.2/html/ckedit/skins/v2/templates.css
branches/2.4.2/html/ckedit/themes/
branches/2.4.2/html/ckedit/themes/default/
branches/2.4.2/html/ckedit/themes/default/theme.js
branches/2.4.2/html/media/PWeC0Vlh.swf
branches/2.4.2/html/media/audio/4gopYIpB.mp3
branches/2.4.2/html/media/audio/EyHM2BLN.mp3
branches/2.4.2/html/media/dwAkLDMq.swf
branches/2.4.2/html/media/thumb/PWeC0Vlh.jpg
branches/2.4.2/html/media/thumb/dwAkLDMq.jpg
branches/2.4.2/html/media/thumb/ttuLIhl6.jpg
branches/2.4.2/html/media/thumb/w4qIXpi5.jpg
branches/2.4.2/html/media/ttuLIhl6.swf
branches/2.4.2/html/media/w4qIXpi5.swf
branches/2.4.2/upstage/websession.py
Modified: branches/2.4.2/config/audios.xml
===================================================================
--- branches/2.4.2/config/audios.xml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/audios.xml 2012-07-19 10:13:15 UTC (rev 339)
@@ -1,2 +1,2 @@
<audios>
-</audios>
+</audios>
\ No newline at end of file
Modified: branches/2.4.2/config/avatars.xml
===================================================================
--- branches/2.4.2/config/avatars.xml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/avatars.xml 2012-07-19 10:13:15 UTC (rev 339)
@@ -1,2 +1,2 @@
<avatars>
-</avatars>
+</avatars>
\ No newline at end of file
Modified: branches/2.4.2/config/backdrops.xml
===================================================================
--- branches/2.4.2/config/backdrops.xml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/backdrops.xml 2012-07-19 10:13:15 UTC (rev 339)
@@ -1,2 +1,2 @@
<backdrops>
-</backdrops>
+</backdrops>
\ No newline at end of file
Modified: branches/2.4.2/config/players.xml
===================================================================
--- branches/2.4.2/config/players.xml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/players.xml 2012-07-19 10:13:15 UTC (rev 339)
@@ -1,4 +1,14 @@
<players>
-<player date="Mon Nov 08 2010 23:40:41 GMT 1300 (NZDT)" rights="act,admin,su,unlimited" password="0cc175b9c0f1b6a831c399e269772661" email="re...@gm..." name="admin">
+<player name="aaa" rights="act,admin" last_login="Unset" date="Fri Jun 29 2012 21:07:01 GMT 1200 (New Zealand Standard Time)" password="0cc175b9c0f1b6a831c399e269772661" email="Unset!">
</player>
-</players>
+<player name="guest" rights="act" last_login="Saturday, 30. June 2012 11:22PM" date="Sat Jun 30 2012 13:20:47 GMT 0200 (CEST)" password="084e0343a0486ff05530df6c705c8bb4" email="Unset!">
+</player>
+<player name="admin" rights="act,admin,su,unlimited" last_login="Thursday, 19. July 2012 08:52PM" date="Mon Nov 08 2010 23:40:41 GMT 1300 (NZDT)" password="0cc175b9c0f1b6a831c399e269772661" email="re...@gm...">
+</player>
+<player name="dan" rights="act,admin" last_login="Tuesday, 10. July 2012 02:21AM" date="Wed Jun 27 2012 18:04:10 GMT 1200 (New Zealand Standard Time)" password="8277e0910d750195b448797616e091ad" email="te...@gm...">
+</player>
+<player name="vicki" rights="act,admin,su,unlimited" last_login="Thursday, 19. July 2012 08:46PM" date="Thu Jul 19 2012 20:15:22 GMT 1200 (NZST)" password="30ea32f43fd2d02a97770f3dd807d96e" email="vi...@up...">
+</player>
+<player name="test" rights="act" last_login="Thursday, 19. July 2012 08:22PM" date="Tue Jun 26 2012 16:06:58 GMT 1200 (NZST)" password="e358efa489f58062f10dd7316b65649e" email="Unset!">
+</player>
+</players>
\ No newline at end of file
Modified: branches/2.4.2/config/stages.xml
===================================================================
--- branches/2.4.2/config/stages.xml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/stages.xml 2012-07-19 10:13:15 UTC (rev 339)
@@ -1,2 +1,2 @@
<stages>
-</stages>
+</stages>
\ No newline at end of file
Added: branches/2.4.2/config/templates/edit.xhtml
===================================================================
--- branches/2.4.2/config/templates/edit.xhtml (rev 0)
+++ branches/2.4.2/config/templates/edit.xhtml 2012-07-19 10:13:15 UTC (rev 339)
@@ -0,0 +1,29 @@
+<!include edit_head.inc>
+<script type="text/javascript" src="/ckedit/ckeditor.js"></script>
+<form method="POST">
+<textarea id="editor" name="editor">%(editable)s</textarea>
+<div class="submit_buttons">
+<input type="submit" name="action" value="Submit" />
+<button name="action" value="default" > Default </button>
+</div>
+</form>
+<script type="text/javascript">
+//<![CDATA[
+
+function resizeEditor()
+{
+ var newHeight = window.innerHeight-300;
+ CKEDITOR.instances.editor.resize('100%',newHeight);
+}
+ CKEDITOR.replace( 'editor' ,
+ {
+ extraPlugins : 'devtools',
+ on:{
+ instanceReady: function(e) {resizeEditor();}
+ }
+ });
+
+window.onresize = function() { resizeEditor() }
+//]]>
+</script>
+<!include master_b.inc>
Added: branches/2.4.2/config/templates/edit_head.inc
===================================================================
--- branches/2.4.2/config/templates/edit_head.inc (rev 0)
+++ branches/2.4.2/config/templates/edit_head.inc 2012-07-19 10:13:15 UTC (rev 339)
@@ -0,0 +1,189 @@
+<!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>
+<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+
+<link rel="stylesheet" type="text/css" href="/style/main.css" />
+<link rel="shortcut icon" href="/style/favicon.ico" />
+
+<title>UpStage Edit</title>
+
+<style type="text/css">
+.header
+{
+ position: relative;
+ z-index: 2;
+ padding: 30px 0 0 0;
+ background: #690;
+ box-shadow: 0 0 10px #AAA;
+ zoom: 1;
+ border-radius: 5px 5px 0 0;
+}
+
+.header h1
+{
+ margin-left: 25px;
+ color: white;
+ text-shadow: 1px 1px 0 black;
+ font-size: 24px;
+ line-height: 32px;
+ font-weight: bold;
+}
+
+.header h1 a
+{
+ color: white;
+ filter: progid:DXImageTransform.Microsoft.dropshadow(OffX=1, OffY=1, Color=#000000, Positive=true);
+ text-decoration: none;
+}
+
+.header .navigation
+{
+ position: relative;
+ clear: both;
+ border: 1px solid #C1C1C1;
+ border-left: 0;
+ border-right: 0;
+ background: #EFEFEF -moz-linear-gradient(top, #EFEFEF, gainsboro);
+ background: #EFEFEF -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EFEFEF), to(gainsboro));
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);
+ height: 35px;
+}
+
+.header .account
+{
+ position: absolute;
+ z-index: 3;
+ width: 100%;
+ top: 0;
+ right: 0;
+ white-space: nowrap;
+ text-align: right;
+ background: #150;
+ border-bottom: 1px solid #656565;
+ color: white;
+ font-size: 12px;
+ border-radius: 5px 5px 0 0;
+
+}
+
+.header .account p
+{
+ margin: 0 2px 0 0;
+ padding: 5px 20px 5px 0;
+}
+
+.header .navigation ul
+{
+ margin: 0;
+ padding: 0 0 0 20px;
+ list-style: none;
+ border: 1px solid white;
+ border-left: 0;
+ border-right: 0;
+ zoom: 1;
+}
+
+.header .navigation li
+{
+ position: relative;
+ float: left;
+ border: 1px solid white;
+ border-top: 0;
+ border-bottom: 0;
+ margin: 0 -1px 0 0;
+}
+
+.header .navigation a
+{
+ float: left;
+ font-weight: bold;
+ color: #333;
+ font-size: 12px;
+ height: 14px;
+ padding: 8px 18px;
+ white-space: nowrap;
+ text-decoration: none;
+ text-shadow: 0 1px 0 white;
+ zoom: 1;
+}
+
+.header .navigation a:hover
+{
+ background: #eee;
+ border: 1px solid #ccc;
+ text-shadow: 0 1px 3px grey;
+}
+
+input[type="submit"]
+{
+ margin-top: 5px;
+ border: 1px solid #C1C1C1;
+ background: #EFEFEF -moz-linear-gradient(top, #EFEFEF, gainsboro);
+ background: #EFEFEF -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EFEFEF), to(gainsboro));
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);
+ height: 35px;
+ font-weight: bold;
+ color: #333;
+ font-size: 12px;
+ padding: 8px 18px;
+ white-space: nowrap;
+ text-decoration: none;
+ text-shadow: 0 1px 0 white;
+ zoom: 1;
+}
+
+input[type="submit"]:hover
+{
+ background: #eee;
+ border: 1px solid #ccc;
+ text-shadow: 0 1px 3px grey;
+}
+
+button
+{
+ margin-top: 5px;
+ border: 1px solid #C1C1C1;
+ background: #EFEFEF -moz-linear-gradient(top, #EFEFEF, gainsboro);
+ background: #EFEFEF -webkit-gradient(linear, 0% 0%, 0% 100%, from(#EFEFEF), to(gainsboro));
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);
+ height: 35px;
+ font-weight: bold;
+ color: #333;
+ font-size: 12px;
+ padding: 8px 18px;
+ white-space: nowrap;
+ text-decoration: none;
+ text-shadow: 0 1px 0 white;
+ zoom: 1;
+}
+
+button:hover
+{
+ background: #eee;
+ border: 1px solid #ccc;
+ text-shadow: 0 1px 3px grey;
+}
+
+</style>
+
+</head>
+
+<body>
+
+<div class="header">
+ <h1><a href="http://www.upstage.org.nz"> UpStage </a> Edit </h1>
+ <div class="account">
+ <p>
+ UpStage Editor v1
+ </p>
+ </div>
+
+ <div class="navigation">
+ <ul>
+ <li> <a href="/admin/"> Back to Workshop</a> </li>
+ <li> <a href="/admin/edit/home"> Edit Home Page </a> </li>
+ <li> <a href="/admin/edit/workshop"> Edit Workshop Page</a> </li>
+ </ul>
+ </div>
+</div>
Modified: branches/2.4.2/config/templates/editplayer.xhtml
===================================================================
--- branches/2.4.2/config/templates/editplayer.xhtml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/templates/editplayer.xhtml 2012-07-19 10:13:15 UTC (rev 339)
@@ -2,66 +2,88 @@
<!include workshop_nav.inc>
<script type="text/javascript">document.title='Editing Player Details';</script>
-<form name ="nick" action="%(req:path)s">
- <h1>Please select a player to edit:</h1>
- <select name="playerlist" id="playerlist" onclick="javascript:playerSelect();" onkeyup="javascript:playerSelect();">
- %(list_players)s
- </select>
- </form>
+<div class="left_section">
+ <div class="search_section">
+ <form name="search" method="GET">
+ <input type="text" id="search" name="search" value="%(search_string)s" /> <input type="submit" value="Search" />
+ </form>
+ </div>
-<form class="hidden" name="userdetails" id="userdetails" action="%(req:path)s" >
-<input type="hidden" name="playername" id="editplayername" value="" />
-<input type="hidden" name="date" id="editdate" value="" />
-<h1>Editing player details for <b id='dispplayername'></b></h1>
+<!-- End of SEARCH SECTION -->
- <h2>Change permissions</h2>
- <table>
- <tr><th colspan="2">
- This player can:
- </th></tr>
- <tr>
- <td><input type="checkbox" id="editact" name="act" /></td>
- <td><b>Act</b>. (you want this!)</td>
- </tr>
- <tr>
- <td><input type="checkbox" id="editadmin" name="admin" /></td>
- <td><b>Administer</b>. Change stages, avatars etc </td>
- </tr>
- <tr>
- <td><input type="checkbox" id="editsu" name="su" /></td>
- <td><b>Add or Remove Players</b> (including you!). </td>
- </tr>
- <tr>
- <td><input type="checkbox" id="editunlimited" name="unlimited" /></td>
- <td><b>Unlimited Upload Limit</b>. Not restricted by upload limiting</td>
- </tr>
- </table>
+ <div class="right_section">
+ <div class="edit_player" id="edit_player">
+ <form class="hidden" name="userdetails" id="userdetails" action="%(req:path)s" >
+ <input type="hidden" name="playername" id="editplayername" value="" />
+ <input type="hidden" name="date" id="editdate" value="" />
+ <h1>Editing player details for <b id='dispplayername'></b></h1>
+ <h2>Change permissions</h2>
+ <table>
+ <tr><th colspan="2">
+ This player can:
+ </th></tr>
+ <tr>
+ <td><input type="checkbox" id="editact" name="act" /></td>
+ <td><b>Act</b>. (you want this!)</td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" id="editadmin" name="admin" /></td>
+ <td><b>Administer</b>. Change stages, avatars etc </td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" id="editsu" name="su" /></td>
+ <td><b>Add or Remove Players</b> (including you!). </td>
+ </tr>
+ <tr>
+ <td><input type="checkbox" id="editunlimited" name="unlimited" /></td>
+ <td><b>Unlimited Upload Limit</b>. Not restricted by upload limiting</td>
+ </tr>
+ </table>
-<h2>Change password</h2>
+ <h2> Change Email </h2>
-<p>
- <input type="checkbox" name="changepassword" id="changepassword" onclick="switchPasswordStuff(this.checked)" />
- Tick to change the user's password.
-</p>
-
-<p id="passwordpara">
- <table>
+ <table>
<tr>
- <td><b>New password:</b></td>
- <td><input type="password" name="password" id="password" size="16" /></td>
+ <th> Email </th>
+ <td> <input type="text" name="email" id="email"/></td>
</tr>
- <tr>
- <td><b>New password again: </b></td>
- <td><input type="password" name="password2" id="password2" size="16" /></td>
- </tr>
- </table>
-</p>
-<br />
+ </table>
- <input type="button" onclick="javascript:updatePlayer();" value="Update Player"></input>
- <input type="button" onclick="javascript:deletePlayer();" value="Delete Player"></input>
-</form>
+ <h2>Change password</h2>
+ <p>
+ <input type="checkbox" name="changepassword" id="changepassword" onclick="switchPasswordStuff(this.checked)" />
+ Tick to change the user's password.
+ </p>
+
+ <p id="passwordpara">
+ <table>
+ <tr>
+ <td><b>New password:</b></td>
+ <td><input type="password" name="password" id="password" size="16" /></td>
+ </tr>
+ <tr>
+ <td><b>New password again: </b></td>
+ <td><input type="password" name="password2" id="password2" size="16" /></td>
+ </tr>
+ </table>
+ </p>
+ <br />
+
+ <input type="button" onclick="javascript:updatePlayer();" value="Update Player"></input>
+ <input type="button" onclick="javascript:deletePlayer();" value="Delete Player"></input>
+ </form>
+ </div>
+ </div> <!-- end of right section -->
+
+
+
+
+
+ <div class="player_list">
+ %(list_players)s
+ </div>
+</div>
<script type="text/javascript">switchPasswordStuff(false);</script>
<!include master_b.inc>
Modified: branches/2.4.2/config/templates/home.xhtml
===================================================================
--- branches/2.4.2/config/templates/home.xhtml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/templates/home.xhtml 2012-07-19 10:13:15 UTC (rev 339)
@@ -1,30 +1,5 @@
<!include master_a.inc>
<script type="text/javascript">document.title='Upstage - Home';</script>
- <h1>Welcome to UpStage</h1>
- <p>Here you can see live performances by <a href="http://www.avatarbodycollision.org">Avatar Body Collision</a>, a globally dispersed troup of cyberformers.</p>
- <p>Shows available from this Foyer:</p>
- <a href="javascript:navStages()">Current Stages</a>
- <p>This online performance space uses <a href="http://www.upstage.org.nz" target="other">UpStage</a>,
- a web-based venue for live performance. You will need Adobe
- Flash Player to watch the performances. This is a standard
- plug-in for most web browsers, but if you don't have it,
- it's free to download from the <a href="http://www.adobe.com/go/getflashplayer" target="other">Adobe site.</a>
- </p>
- <h1>UpStage Stage List</h1>
- <p>
- The following stages are viewable on this UpStage server:
- </p>
- <table id="playerAudience" class="stage_list">
- <tr>
- <th>Short Name (url)</th>
- <th>Full Name</th>
- <th>Players</th>
- <th>Audience</th>
- </tr>
- %(list)s
- </table>
- <h1>Next Show:</h1>
- [Title & description]
- <a href="#" class="bodyl">go to stage... </a>
- <script type="text/javascript">countPlayerAndAudience();</script>
+<!-- Modified By Daniel Han (28/06/2012) put every content into home_editable.inc so it can be edited by SU -->
+<!include home_editable.inc>
<!include master_b.inc>
Added: branches/2.4.2/config/templates/home_editable.default
===================================================================
--- branches/2.4.2/config/templates/home_editable.default (rev 0)
+++ branches/2.4.2/config/templates/home_editable.default 2012-07-19 10:13:15 UTC (rev 339)
@@ -0,0 +1,21 @@
+ <h1>Welcome to UpStage</h1>
+ <p>Here you can see live performances by <a href="http://www.avatarbodycollision.org">Avatar Body Collision</a>, a globally dispersed troup of cyberformers.</p>
+ <p>Shows available from this Foyer:</p>
+ <a href="javascript:navStages()">Current Stages</a>
+ <p>This online performance space uses <a href="http://www.upstage.org.nz" target="other">UpStage</a>,
+ a web-based venue for live performance. You will need Adobe
+ Flash Player to watch the performances. This is a standard
+ plug-in for most web browsers, but if you don't have it,
+ it's free to download from the <a href="http://www.adobe.com/go/getflashplayer" target="other">Adobe site.</a>
+ </p>
+ <h1>UpStage Stage List</h1>
+ <p>
+ The following stages are viewable on this UpStage server:
+ </p>
+
+ %(list)s
+
+ <h1>Next Show:</h1>
+ [Title & description]
+ <a href="#" class="bodyl">go to stage... </a>
+ <script type="text/javascript">countPlayerAndAudience();</script>
Added: branches/2.4.2/config/templates/home_editable.inc
===================================================================
--- branches/2.4.2/config/templates/home_editable.inc (rev 0)
+++ branches/2.4.2/config/templates/home_editable.inc 2012-07-19 10:13:15 UTC (rev 339)
@@ -0,0 +1,21 @@
+<h1>
+ Welcome to UpStage</h1>
+<p>
+ UpStage is an open source web-based platform for cyberformance - live online performance by remote performers, for online audiences. Everything happens in a web browser, in real time. UpStage is an unfunded, artist-led project and we welcome your involvement - as artists, audience, and developers. Visit the <a href="http://upstage.org.nz/blog">UpStage web site</a> for more information.</p>
+<p>
+ Shows available from this Foyer:</p>
+<p>
+ <a href="javascript:navStages()">Current Stages</a></p>
+<p>
+ Note: you will need Adobe Flash Player to watch the performances. This is a standard plug-in for most web browsers, but if you don't have it, it's free to download from the <a href="http://www.adobe.com/go/getflashplayer" target="other">Adobe site.</a></p>
+<h1>
+ UpStage Stage List</h1>
+Your name is %(username)s
+<p>
+ The following stages are viewable on this UpStage server:</p>
+<p>
+ %(list)s</p>
+<h1>
+ Next Show:</h1>
+<p>
+ [Title & description] <a class="bodyl" href="#">go to stage... </a> <script type="text/javascript">countPlayerAndAudience();</script></p>
Modified: branches/2.4.2/config/templates/master_a.inc
===================================================================
--- branches/2.4.2/config/templates/master_a.inc 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/templates/master_a.inc 2012-07-19 10:13:15 UTC (rev 339)
@@ -23,8 +23,8 @@
<div id="masterpage">
<div id="header">
<div id="logo">
- <!-- Mohammed Al-Timimi (08/06/2011) - Fixed logo link to home page -->
- <a href="javascript:navHome()"><img border="0" src="/style/upstagelogo.jpg" alt="Upstage" /></a>
+ <!-- Daniel Han (26/06/2012) - Fixed logo link to upstage.org.nz -->
+ <a href="http://www.upstage.org.nz"><img border="0" src="/style/upstagelogo.jpg" alt="Upstage" /></a>
</div>
<form name="hidden_form" action="">
<input name="user_name" type ="hidden" value="%(username)s"></input>
@@ -32,7 +32,7 @@
<input name="server_details" type="hidden" value="%(server_details)s"></input>
</form>
<div id="signup">
- <form name="rupert" action="/admin/perspective-init">
+ <form name="rupert" action="/perspective-init">
Login: <input name="username" size="13" />
Password: <input type="password" name="password" size="13" /><br />
Remember me? <input type="checkbox" name="remember" />
@@ -44,6 +44,8 @@
<a href="javascript:navHome()">HOME</a>
<a href="javascript:navWorkshop()">WORKSHOP</a>
<a href="javascript:navStages()">STAGES</a>
+
+
</div>
</div>
<script type="text/javascript">clearLogin();</script>
Modified: branches/2.4.2/config/templates/master_b.inc
===================================================================
--- branches/2.4.2/config/templates/master_b.inc 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/templates/master_b.inc 2012-07-19 10:13:15 UTC (rev 339)
@@ -10,7 +10,7 @@
<br />
<!-- PR (09/11/2010) Thought this was a more usable place to put version info -->
<!-- Mohammed Al-Timimi (9/06/2011) - Moved because it was placed so very badly -->
- <p>UpStage V2.4.1 (08/06/2011)</p>
+ <p>UpStage V2.4.2 (19/07/2012)</p>
</div>
<div id="status" style="display:none;">
</div>
Modified: branches/2.4.2/config/templates/mediaedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaedit.xhtml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/templates/mediaedit.xhtml 2012-07-19 10:13:15 UTC (rev 339)
@@ -70,11 +70,15 @@
</div><!-- Added by Vibhu Patel / Nessa (17/08/2011)-->
<script type="text/javascript">initSlideShow();</script>
</div><!--seperator-->
+
<form name="rupert" action="%(req:path)s"><!--sperator_2-->
<!--sperator_3--><input type="hidden" name="mediaName" value="%(attr:medianame)s"></input><!--sperator_4-->
<!--sperator_5--><input type="hidden" name="mediaType" value="%(attr:mediatype)s"></input><!--sperator_6-->
- <div id="mediadiv"><!--mediaedit_break_1-->
- <hr />
+ <hr />
+ <!--mediaedit_break_1-->
+ <div id="mediadiv">
+
+
<h1>Media info</h1>
<table>
<tr>
@@ -90,7 +94,7 @@
%(editable_info)s
</table>
<table height="350px" style="visibility:hidden;display:none;width:100%" id="static_info">
- <tr><td><h1>Media info</h1></td></tr>
+ <tr><td><h1>Media Details</h1></td></tr>
%(static_info)s
</table>
<br />
@@ -98,8 +102,11 @@
</div>
</td>
</tr>
- </table>%(list_tags)s<hr /><!--mediaedit_break_2-->
+ </table>
+ %(list_tags)s
+ <!--mediaedit_break_2-->
</div>
+ <hr />
<div style="width:100%;clear:both" id="submit"><!--mediaedit_break_3-->
<input type="hidden" name="action" value=""></input>
<br />
Modified: branches/2.4.2/config/templates/mediaupload.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaupload.xhtml 2012-04-26 02:01:53 UTC (rev 338)
+++ branches/2.4.2/config/templates/mediaupload.xhtml 2012-07-19 10:13:15 UTC (rev 339)
@@ -85,16 +85,16 @@
</select><br />
</p>
- <label id="avlbl0">Filename 1: </label><input type="file" name="avcontents0" id="avcontents0" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl1" style="display: none">Filename 2: </label><input type="file" style="display: none" name="avcontents1" id="avcontents1" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl2" style="display: none">Filename 3: </label><input type="file" style="display: none" name="avcontents2" id="avcontents2" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl3" style="display: none">Filename 4: </label><input type="file" style="display: none"name="avcontents3" id="avcontents3" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl4" style="display: none">Filename 5: </label><input type="file" style="display: none" name="avcontents4" id="avcontents4" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl5" style="display: none">Filename 6: </label><input type="file" style="display: none" name="avcontents5" id="avcontents5" accept="image/swf, image/gif, image/jpeg, image/png" /><br />
- <label id="avlbl6" style="display: none">Filename 7: </label><input type="file" style="display: none" name="avcontents6" id="avcontents6" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl7" style="display: none">Filename 8: </label><input type="file" style="display: none" name="avcontents7" id="avcontents7" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl8" style="display: none">Filename 9: </label><input type="file" style="display: none" name="avcontents8" id="avcontents8" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="avlbl9" style="display: none">Filename 10:</label><input type="file" style="display: none" name="avcontents9" id="avcontents9" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl0">Filename 1: </label><input type="file" name="avcontents0" id="avcontents0" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl1" style="display: none">Filename 2: </label><input type="file" style="display: none" name="avcontents1" id="avcontents1" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl2" style="display: none">Filename 3: </label><input type="file" style="display: none" name="avcontents2" id="avcontents2" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl3" style="display: none">Filename 4: </label><input type="file" style="display: none"name="avcontents3" id="avcontents3" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl4" style="display: none">Filename 5: </label><input type="file" style="display: none" name="avcontents4" id="avcontents4" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl5" style="display: none">Filename 6: </label><input type="file" style="display: none" name="avcontents5" id="avcontents5" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png" /><br />
+ <label id="avlbl6" style="display: none">Filename 7: </label><input type="file" style="display: none" name="avcontents6" id="avcontents6" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl7" style="display: none">Filename 8: </label><input type="file" style="display: none" name="avcontents7" id="avcontents7" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl8" style="display: none">Filename 9: </label><input type="file" style="display: none" name="avcontents8" id="avcontents8" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="avlbl9" style="display: none">Filename 10:</label><input type="file" style="display: none" name="avcontents9" id="avcontents9" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
<br/>
</div>
@@ -116,16 +116,16 @@
</select><br />
</p>
- <label id="prlbl0">Filename 1: </label><input type="file" name="prcontents0" id="prcontents0" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl1" style="display: none">Filename 2: </label><input type="file" style="display: none" name="prcontents1" id="prcontents1" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl2" style="display: none">Filename 3: </label><input type="file" style="display: none" name="prcontents2" id="prcontents2" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl3" style="display: none">Filename 4: </label><input type="file" style="display: none"name="prcontents3" id="prcontents3" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl4" style="display: none">Filename 5: </label><input type="file" style="display: none" name="prcontents4" id="prcontents4" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl5" style="display: none">Filename 6: </label><input type="file" style="display: none" name="prcontents5" id="prcontents5" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl6" style="display: none">Filename 7: </label><input type="file" style="display: none" name="prcontents6" id="prcontents6" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl7" style="display: none">Filename 8: </label><input type="file" style="display: none" name="prcontents7" id="prcontents7" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl8" style="display: none">Filename 9: </label><input type="file" style="display: none" name="prcontents8" id="prcontents8" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="prlbl9" style="display: none">Filename 10:</label><input type="file" style="display: none" name="prcontents9" id="prcontents9" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl0">Filename 1: </label><input type="file" name="prcontents0" id="prcontents0" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl1" style="display: none">Filename 2: </label><input type="file" style="display: none" name="prcontents1" id="prcontents1" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl2" style="display: none">Filename 3: </label><input type="file" style="display: none" name="prcontents2" id="prcontents2" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl3" style="display: none">Filename 4: </label><input type="file" style="display: none"name="prcontents3" id="prcontents3" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl4" style="display: none">Filename 5: </label><input type="file" style="display: none" name="prcontents4" id="prcontents4" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl5" style="display: none">Filename 6: </label><input type="file" style="display: none" name="prcontents5" id="prcontents5" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl6" style="display: none">Filename 7: </label><input type="file" style="display: none" name="prcontents6" id="prcontents6" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl7" style="display: none">Filename 8: </label><input type="file" style="display: none" name="prcontents7" id="prcontents7" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl8" style="display: none">Filename 9: </label><input type="file" style="display: none" name="prcontents8" id="prcontents8" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="prlbl9" style="display: none">Filename 10:</label><input type="file" style="display: none" name="prcontents9" id="prcontents9" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
<br/>
@@ -149,16 +149,16 @@
</select><br />
</p>
- <label id="bklbl0">Filename 1: </label><input type="file" name="bkcontents0" id="bkcontents0" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl1" style="display: none">Filename 2: </label><input type="file" style="display: none" name="bkcontents1" id="bkcontents1" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl2" style="display: none">Filename 3: </label><input type="file" style="display: none" name="bkcontents2" id="bkcontents2" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl3" style="display: none">Filename 4: </label><input type="file" style="display: none"name="bkcontents3" id="bkcontents3" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl4" style="display: none">Filename 5: </label><input type="file" style="display: none" name="bkcontents4" id="bkcontents4" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl5" style="display: none">Filename 6: </label><input type="file" style="display: none" name="bkcontents5" id="bkcontents5" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl6" style="display: none">Filename 7: </label><input type="file" style="display: none" name="bkcontents6" id="bkcontents6" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl7" style="display: none">Filename 8: </label><input type="file" style="display: none" name="bkcontents7" id="bkcontents7" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl8" style="display: none">Filename 9: </label><input type="file" style="display: none" name="bkcontents8" id="bkcontents8" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
- <label id="bklbl9" style="display: none">Filename 10:</label><input type="file" style="display: none" name="bkcontents9" id="bkcontents9" accept="image/swf, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl0">Filename 1: </label><input type="file" name="bkcontents0" id="bkcontents0" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl1" style="display: none">Filename 2: </label><input type="file" style="display: none" name="bkcontents1" id="bkcontents1" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl2" style="display: none">Filename 3: </label><input type="file" style="display: none" name="bkcontents2" id="bkcontents2" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl3" style="display: none">Filename 4: </label><input type="file" style="display: none"name="bkcontents3" id="bkcontents3" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl4" style="display: none">Filename 5: </label><input type="file" style="display: none" name="bkcontents4" id="bkcontents4" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl5" style="display: none">Filename 6: </label><input type="file" style="display: none" name="bkcontents5" id="bkcontents5" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl6" style="display: none">Filename 7: </label><input type="file" style="display: none" name="bkcontents6" id="bkcontents6" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl7" style="display: none">Filename 8: </label><input type="file" style="display: none" name="bkcontents7" id="bkcontents7" accept="application/x-shockwave-flash, image/gif, image/jpeg, image/png"/><br />
+ <label id="bklbl8" style="display: none">Filename 9: </label><input type="file" style="display: none" name...
[truncated message content] |
|
From: <aut...@us...> - 2012-08-22 04:54:49
|
Revision: 341
http://upstage.svn.sourceforge.net/upstage/?rev=341&view=rev
Author: aut-upstage
Date: 2012-08-22 04:54:38 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
- Daniel, Gavin
/Admin/StageEdit now shows postback message after the user actions.
Also, creating new stage shows a popup box as well.
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/masterpage.js
branches/2.4.2/html/stageedit.js
branches/2.4.2/html/style/main.css
branches/2.4.2/upstage/pages.py
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-07-31 04:16:23 UTC (rev 340)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-08-22 04:54:38 UTC (rev 341)
@@ -14,17 +14,20 @@
<script type="text/javascript">
document.title='Workshop - Stages';
window.onresize = resizePage;
-
</script>
+<div id="divShade">
+</div>
+<div id="divMessage">
+%(attr:message)s
+</div>
<div id="stageselection">
<h1>Make a new stage, or select one to edit</h1>
<form name ="shaun" action="%(req:path)s">
<select name="shortName">
%(list_stages)s
</select>
- <input type="button" onclick="javascript:stageChooseSubmit();" value="Select"></input>
- %(attr:message)s
+ <input type="button" onclick="stageChooseSubmit();" value="Select"></input>
</form>
</div>
<div id="divForm">
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2012-07-31 04:16:23 UTC (rev 340)
+++ branches/2.4.2/html/masterpage.js 2012-08-22 04:54:38 UTC (rev 341)
@@ -23,6 +23,10 @@
*
* Modified by Daniel (03/07/2012) - Removed usernameUpStage cookie as it is not very safe.
* - using temporary cookies[username,password] to get session state working and remove cookie straight after checking them.
+
+ * Modified by Daniel Gavin (22/08/2012) - Modified postback message to be more visible to users when users save a stage.
+ *
+ *
*/
//Instance type variables
@@ -470,6 +474,7 @@
{
document.getElementById("status").style.display = "none";
document.getElementById("status").innerHTML = "";
+
if(document.title == 'Workshop - Media') //mediadiv
{
var pageHTML = (xmlhttp.responseText);
@@ -531,10 +536,14 @@
}
else
{
+
var temp = (xmlhttp.responseText).split('<!--remove-->');
- document.getElementById("page").innerHTML = temp[1];
+
+ document.getElementById("page").innerHTML = temp[1];
stageEdit();
restoreState();
+
+ showMessageDiv("divMessage");
}
//Call to remove the footer from the response page so that the footer is not duplicated.
//Heath Behrens & Mohammed 07-05-2011
@@ -551,6 +560,33 @@
}
}
+
+function hideDiv(div)
+{
+ document.getElementById(div).style.display = 'none';
+}
+
+function showMessageDiv(div)
+{
+ // 22/08/2012 - Daniel, Gavin
+ /*
+ Added to make the postback message more visible.
+ */
+ var divMessage = document.getElementById(div);
+ if(divMessage.innerHTML.trim() == "")
+ {
+ hideDiv(div);
+ hideDiv("divShade");
+ }
+ else
+ {
+ divMessage.style.display = 'block';
+ divMessage.innerHTML += "<input type='button' onclick=\"hideDiv('divMessage'); hideDiv('divShade');\" value='Close'></input>";
+ document.getElementById("divShade").style.display = 'block';
+ }
+
+}
+
function GetXmlHttpObject()
{
if (window.XMLHttpRequest)
Modified: branches/2.4.2/html/stageedit.js
===================================================================
--- branches/2.4.2/html/stageedit.js 2012-07-31 04:16:23 UTC (rev 340)
+++ branches/2.4.2/html/stageedit.js 2012-08-22 04:54:38 UTC (rev 341)
@@ -46,12 +46,14 @@
}
else
{
- var rm = document.getElementById("stagename");
- rm.parentNode.removeChild(rm);
- rm = document.getElementById("edit");
- rm.parentNode.removeChild(rm);
- rm = document.getElementById("submit");
- rm.parentNode.removeChild(rm);
+
+ var rm = document.getElementById("stagename");
+ rm.parentNode.removeChild(rm);
+ rm = document.getElementById("edit");
+ rm.parentNode.removeChild(rm);
+ //rm = document.getElementById("submit");
+ //rm.parentNode.removeChild(rm);
+
}
}
Modified: branches/2.4.2/html/style/main.css
===================================================================
--- branches/2.4.2/html/style/main.css 2012-07-31 04:16:23 UTC (rev 340)
+++ branches/2.4.2/html/style/main.css 2012-08-22 04:54:38 UTC (rev 341)
@@ -767,3 +767,36 @@
text-align: center;
}
+
+#divMessage
+{
+ margin: 10px;
+ padding: 15px;
+ box-shadow: #AAA 1px 1px 10px;
+ border-radius: 5px;
+ border: #888 2px solid;
+ background-color: #EEE;
+ position: fixed;
+ left: 35%;
+ right: auto;
+ top: 45%;
+ bottom: auto;
+ text-align: center;
+ display: none;
+ z-index: 9999;
+}
+
+#divShade
+{
+ display: none;
+ padding:0px;
+ margin:0px;
+ position: fixed;
+ height: 100%;
+ width: 100%;
+ background-color: #000;
+ opacity: 0.7;
+ top: 0px;
+ left: 0px;
+ z-index: 9998;
+}
\ No newline at end of file
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-07-31 04:16:23 UTC (rev 340)
+++ branches/2.4.2/upstage/pages.py 2012-08-22 04:54:38 UTC (rev 341)
@@ -61,6 +61,10 @@
- Search results are paged.
Modified by: Daniel Han 11/07/2012 - Cleaned up (table structure) html part of EditMedia
+
+Modified by: Daniel, Gavin 22/08/2012 - Changed StageEdit so it shows popup dialog for postback message.
+ - Removed <hr> from the postback message
+ - added <form> on the new_stage postback message.
"""
#standard lib
@@ -642,7 +646,7 @@
"""Save changes and create new state"""
form = request.args
- self.message = '<hr />'
+ self.message = ''
action = request.args.get('action',[''])[0]
stage_link= ''
try:
@@ -673,7 +677,8 @@
log.msg(e)
return errorpage(request, e)
elif 'new_stage' in self.stagename:
- self.message = '<hr /> Full name:<input type="text" name="name" />Short name for url:<input type="text" name="ID" size="12" />(no spaces).<button onclick="javascript:stageChooseSubmit(); return false;">Create Stage</button>'
+ #Modified by: Daniel, Gavin - Made the message to contain a <form> as well so it shows on the popup box.
+ self.message = '<form action="/admin/workshop/stage"> Full name:<input type="text" name="name" />Short name for url:<input type="text" name="ID" size="12" />(no spaces).<button onclick="javascript:stageChooseSubmit(); return false;">Create Stage</button></form>'
elif action=='save':
if self.stage:
self.stage.update_from_form(form, self.player);
@@ -731,8 +736,8 @@
self.stage.remove_al_one(pname)
self.stage.add_al_two(pname)
self.message+='Changed rights. '
- if self.stage:
- self.message+=stage_link
+ #if self.stage:
+ #self.message+=stage_link
return AdminBase.render(self, request)
""" Shaun Narayan (02/16/10) - Handles medrequest.argsia editing.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-24 01:42:43
|
Revision: 342
http://upstage.svn.sourceforge.net/upstage/?rev=342&view=rev
Author: aut-upstage
Date: 2012-08-24 01:42:34 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
- Gavin / Daniel
Updated PostBack messages for Upload Media, Media Edit pages.
note that delete media still does not have a post back message
Modified Paths:
--------------
branches/2.4.2/config/templates/master_a.inc
branches/2.4.2/config/templates/mediaedit.xhtml
branches/2.4.2/config/templates/mediaupload.xhtml
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/masterpage.js
branches/2.4.2/html/mediaupload.js
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/web.py
Added Paths:
-----------
branches/2.4.2/config/templates/success.xhtml
Modified: branches/2.4.2/config/templates/master_a.inc
===================================================================
--- branches/2.4.2/config/templates/master_a.inc 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/config/templates/master_a.inc 2012-08-24 01:42:34 UTC (rev 342)
@@ -19,6 +19,10 @@
</head>
<body>
+ <div id="divShade">
+ </div>
+ <div id="divPopup">
+ </div>
<script type="text/javascript">test_flash()</script>
<div id="masterpage">
<div id="header">
Modified: branches/2.4.2/config/templates/mediaedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaedit.xhtml 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/config/templates/mediaedit.xhtml 2012-08-24 01:42:34 UTC (rev 342)
@@ -9,8 +9,10 @@
Heath Behrens / Vibhu Patel (26/08/2011): Removed parameter from javascript switchTab function call to work with IE
Vibhu Patel (31/08/2011): Modified to include type of filtering option.
Vibhu / Heath (01/08/2011): Made layout changes.
+ Daniel / Gavin (24/08/2012): Made divMessage to make popup postback
-->
<script type="text/javascript">document.title='Workshop - Media';</script>
+
<img id="black" src="/style/black.png" alt="" width="1px" height="1px" style="z-index:1;" />
<div id="zoomimg" style="position:fixed;z-index:4">
</div>
@@ -74,10 +76,12 @@
<form name="rupert" action="%(req:path)s"><!--sperator_2-->
<!--sperator_3--><input type="hidden" name="mediaName" value="%(attr:medianame)s"></input><!--sperator_4-->
<!--sperator_5--><input type="hidden" name="mediaType" value="%(attr:mediatype)s"></input><!--sperator_6-->
- <hr />
+ <hr />
<!--mediaedit_break_1-->
<div id="mediadiv">
-
+ <div id="divMessage">
+ %(attr:postback)s
+ </div>
<h1>Media info</h1>
<table>
@@ -112,8 +116,8 @@
<br />
<table>
<tr>
- <td><input type="button" onclick="javascript:warn(4);" value="Save Changes" style="width:100px;"></input></td>
- <td><input type="button" onclick="javascript:warn(5);" value="Delete Media" style="width:100px;"></input></td>
+ <td><input type="button" onclick="warn(4);" value="Save Changes" style="width:100px;"></input></td>
+ <td><input type="button" onclick="warn(5);" value="Delete Media" style="width:100px;"></input></td>
</tr>
<tr>
<td><input type="checkbox" name="force" value="force" /><b>Delete even if in use.</b></td>
@@ -123,4 +127,4 @@
</div>
<script type="text/javascript">setup();</script>
</form>
-<!include master_b.inc>
+<!include master_b.inc>
\ No newline at end of file
Modified: branches/2.4.2/config/templates/mediaupload.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaupload.xhtml 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/config/templates/mediaupload.xhtml 2012-08-24 01:42:34 UTC (rev 342)
@@ -7,6 +7,7 @@
Heath, Corey, Karena 26/08/2011 - Added tags input so tags can be added to media when uploaded
-->
<script type ="text/javascript">document.title="UpStage Upload Media";</script>
+
<div id="mediaup">
<h1>What type of media are you uploading</h1>
<br />
@@ -239,7 +240,7 @@
<div id="submitbuttons">
<table>
<tr>
- <td><input type="submit" name="saveMedia" value="Upload Media" onclick="checkAllFields(); return shallContinue();"/></td>
+ <td><input type="submit" name="saveMedia" value="Upload Media" onclick="checkAllFields(); return sendPostAction();"/></td>
<td><input type="reset" name="cancelMedia" value="Clear"/></td>
</tr>
</table>
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-08-24 01:42:34 UTC (rev 342)
@@ -16,8 +16,6 @@
window.onresize = resizePage;
</script>
-<div id="divShade">
-</div>
<div id="divMessage">
%(attr:message)s
</div>
Added: branches/2.4.2/config/templates/success.xhtml
===================================================================
--- branches/2.4.2/config/templates/success.xhtml (rev 0)
+++ branches/2.4.2/config/templates/success.xhtml 2012-08-24 01:42:34 UTC (rev 342)
@@ -0,0 +1,7 @@
+<!include master_a.inc>
+<!include workshop_nav.inc>
+<h1>Success</h1>
+<p>
+%(attr:msg)s
+</p>
+<!include master_b.inc>
\ No newline at end of file
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/html/masterpage.js 2012-08-24 01:42:34 UTC (rev 342)
@@ -414,8 +414,62 @@
xmlhttp.send(null);
}
+ function requestPageForm(method,page,actform,onReady)
+ {
+ xmlhttp=GetXmlHttpObject();
+ if (xmlhttp==null)
+ {
+ alert ("Your browser does not support XMLHTTP!");
+ return;
+ }
+ var url=page;
+
+ var formStr = "";
+
+ for (var i = 0; i < actform.elements.length; i++)
+ {
+ var element = actform.elements[i];
+ if(element.name.trim() == "")
+ {
+ // if element has no name
+ continue;
+ }
+ else if((element.type == "radio" || element.type == "checkbox") && !element.checked)
+ {
+ // if element is radio button or checkbox but not checked... then continue..
+ continue;
+ }
+ else if(element.value == "")
+ {
+ continue;
+ }
+ if(formStr.length > 0)
+ formStr += "&";
+ formStr += element.name + "=" + element.value;
+
+ }
+
+ xmlhttp.open(method,url,true);
+ xmlhttp.setRequestHeader("Content-type",actform.enctype);
+ xmlhttp.onreadystatechange=onReady;
+ xmlhttp.send(formStr);
+ }
+ function popupAlert()
+ {
+ if (xmlhttp.readyState==4)
+ {
+ var html = xmlhttp.responseText;
+ divMsg = document.getElementById("divPopup");
+ divShad = document.getElementById("divShade");
+ divMsg.innerHTML = html;
+ divMsg.style.display = 'block';
+ divShad.style.display = 'block';
+
+ }
+ }
+
function checkLogin()
{
if (xmlhttp.readyState==4)
@@ -478,8 +532,15 @@
if(document.title == 'Workshop - Media') //mediadiv
{
var pageHTML = (xmlhttp.responseText);
+
+ //document.getElementById("divPopup").innerHTML = pageHTML;
+ //document.getElementById("divPopup").style.display = "block";
+ //document.getElementById("divShade").style.display = "block";
+
+
try
{
+
// Vibhu Patel (20/08/2011) - Shows message if media was deleted by user.
document.getElementById("mediadiv").innerHTML = '<hr /><br /><h1>Media is deleted. List will be updated shortly.</h1>';
document.forms[2].elements[0].value = '';
@@ -530,9 +591,15 @@
//Vibhu and Heath (01/08/2011) - sets appropiate audio type in drop drown combo box.
pumpkin();
}
+
+ console.log("divMessage: " + document.getElementById("divMessage").innerHTML)
+ if(document.getElementById("divMessage").innerHTML.trim() != "")
+ {
+ showMessageDiv("divMessage");
+ }
}
catch(ex)
- {}
+ { console.log(ex);}
}
else
{
Modified: branches/2.4.2/html/mediaupload.js
===================================================================
--- branches/2.4.2/html/mediaupload.js 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/html/mediaupload.js 2012-08-24 01:42:34 UTC (rev 342)
@@ -18,6 +18,23 @@
allDivs[3]="audioBits";
allDivs[4]="videoBits";
+/*
+* Author: Daniel, Gavin
+* Sends Action using AJAX.
+* Problem is that not many browser supports raw data to be sent using AJAX.
+* May be consider it to be later used.
+*/
+function sendPostAction()
+{
+ /*
+ if(shallContinue())
+ {
+ requestPageForm("POST", document.natasha.action, document.natasha, popupAlert);
+ }
+ return false;
+ */
+ return shallContinue();
+}
/*
* Author: Natasha Pullan
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/upstage/pages.py 2012-08-24 01:42:34 UTC (rev 342)
@@ -65,6 +65,8 @@
Modified by: Daniel, Gavin 22/08/2012 - Changed StageEdit so it shows popup dialog for postback message.
- Removed <hr> from the postback message
- added <form> on the new_stage postback message.
+
+Modified by: Daniel, Gavin 24/08/2012 - added self.postback
"""
#standard lib
@@ -117,7 +119,7 @@
by the result thus obtained.
"""
filename = None
-
+
def render_GET(self, request):
s = get_template(self.filename)
#read in includes before expanding magic bits.
@@ -176,6 +178,7 @@
Template.__init__(self)
self.player = player
self.collection = collection
+ self.message = ''
""" Alan (17/08/09) Refreshes the upload message when entering the page"""
if ((self.player.can_admin()) and (self.filename != None) and
@@ -288,6 +291,30 @@
"""Always return true"""
return True
+
+class AdminSuccess(AdminBase):
+ """error page, in same clothes as AdminBase"""
+ filename = 'success.xhtml'
+ log_message = 'Reporting Success: %s'
+ code = 200
+
+ def __init__(self, msg, code=None):
+ log.msg(self.log_message % msg)
+ #Template.__init__(self)
+ self.msg = str(msg)
+ if code is not None:
+ self.code = code
+
+ def render(self, request):
+ """render from the template, and set the http response code."""
+ request.setResponseCode(self.code, message=str(self.msg))
+ return AdminBase.render(self, request)
+
+ def allows_player(self, x):
+ """Always return true"""
+ return True
+
+
"""
Added by: Daniel Han (29/06/2012)
basically same as CreateDir but it can render it self.
@@ -415,6 +442,16 @@
r = p.render(request)
return r
+def successpage(request, message='success', code=200):
+ """Convenience success writer
+ Makes an success page, and returns a rendering thereof.
+ @param request request that is being handled
+ @param message message to send to AdminSuccess"""
+
+ p = AdminSuccess(message, code)
+ r = p.render(request)
+ return r
+
class NonAdminPage(AdminBase):
"""This is the page that you see if you're player."""
filename = 'nonadmin.xhtml'
@@ -756,6 +793,7 @@
no_media = 'No media selected'
stage = ''
media = ''
+ postback = ''
def __init__(self, player, collection):
AdminBase.__init__(self, player, collection)
@@ -1053,6 +1091,7 @@
def render(self, request):
action = request.args.get('action',[''])[0]
form = request.args
+
try:
self.medianame = request.args.get('mediaName',[''])[0]
self.mediatype = request.args.get('mediaType',[''])[0]
@@ -1072,15 +1111,20 @@
#Save media
if self.mediatype == 'avatar':
self.collection.avatars.update_from_form(form, self.player)
+ self.postback = 'Avatar Saved'
elif self.mediatype == 'prop':
self.collection.props.update_from_form(form, self.player)
+ self.postback = "Prop Saved"
elif self.mediatype == 'backdrop':
self.collection.backdrops.update_from_form(form, self.player)
+ self.postback = "Backdrop Saved"
elif self.mediatype == 'audio':
self.collection.audios.update_from_form(form, self.player)
+ self.postback = "Audio Saved"
if action =='delete':
self.medianame = ''
self.mediatype = ''
+ self.postback = "Media Deleted"
return AdminBase.render(self, request)
class MediaUploadPage(Workshop):
Modified: branches/2.4.2/upstage/web.py
===================================================================
--- branches/2.4.2/upstage/web.py 2012-08-22 04:54:38 UTC (rev 341)
+++ branches/2.4.2/upstage/web.py 2012-08-24 01:42:34 UTC (rev 342)
@@ -46,7 +46,7 @@
from upstage.pages import AdminLoginPage, AdminBase, errorpage, Workshop, HomePage, SignUpPage, Workshop, StageEditPage,\
MediaUploadPage, MediaEditPage, CreateDir, \
NewPlayer, EditPlayer, NewAvatar, NewProp, NewBackdrop, NewAudio, \
- ThingsList, StagePage, UserPage, NonAdminPage, PageEditPage, HomeEditPage, WorkshopEditPage, SessionCheckPage #VideoThing, AudioThing,
+ ThingsList, StagePage, UserPage, NonAdminPage, PageEditPage, HomeEditPage, WorkshopEditPage, SessionCheckPage, successpage #VideoThing, AudioThing,
#twisted
from twisted.python import log
@@ -383,6 +383,7 @@
#natasha convert
# turn form into simple dictionary, dropping multiple values.
reqargs = request.args
+
self.assignedstages = reqargs.get('assigned')
form = dict([(k, v[0]) for k,v in request.args.iteritems()])
# natasha: added prefix value
@@ -506,8 +507,12 @@
self.media_dict = self.mediatypes[self.mediatype]
if self.assignedstages is not None:
self.assign_media_to_stages(self.assignedstages, swf, self.mediatype)
- self.refresh(request, swf)
+
+ #self.refresh(request, swf)
+ request.write(successpage(request, 'Your Media "' + name + '" have uploaded successfully'))
+ request.finish()
+
def assign_media_to_stages(self, assignedstages, medianame, mediatype):
for x in assignedstages:
self.media_dict.set_media_stage(x, medianame) #collection not defined here. MAYBE IMPORT ADD METHOD IN STAGE DICT??
@@ -539,8 +544,8 @@
def failure(self, exitcode, swf, thumbnail, form, request):
"""Nothing much to do but spread the word"""
request.write(errorpage(request, 'SWF creation failed - maybe the image was bad. See img2swf.log for details'))
- request.finish()
-
+ request.finish()
+
def clean_up(self, nothing, tfns):
"""Be rid of temp files"""
try:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-24 03:32:00
|
Revision: 343
http://upstage.svn.sourceforge.net/upstage/?rev=343&view=rev
Author: aut-upstage
Date: 2012-08-24 03:31:54 +0000 (Fri, 24 Aug 2012)
Log Message:
-----------
- Daniel/Gavin
Create Edit Player, Create Player, Edit Page has a post back now.
Modified Paths:
--------------
branches/2.4.2/config/templates/edit.xhtml
branches/2.4.2/config/templates/edit_head.inc
branches/2.4.2/config/templates/error.xhtml
branches/2.4.2/config/templates/home_editable.inc
branches/2.4.2/html/masterpage.js
branches/2.4.2/html/style/main.css
branches/2.4.2/html/user.js
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/player.py
Modified: branches/2.4.2/config/templates/edit.xhtml
===================================================================
--- branches/2.4.2/config/templates/edit.xhtml 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/config/templates/edit.xhtml 2012-08-24 03:31:54 UTC (rev 343)
@@ -1,9 +1,15 @@
<!include edit_head.inc>
<script type="text/javascript" src="/ckedit/ckeditor.js"></script>
+<div id="divShade">
+</div>
+<div id="divPopup">
+%(attr:postback)s
+</div>
+
<form method="POST">
<textarea id="editor" name="editor">%(editable)s</textarea>
<div class="submit_buttons">
-<input type="submit" name="action" value="Submit" />
+<input type="submit" name="action" value="Submit"/>
<button name="action" value="default" > Default </button>
</div>
</form>
@@ -25,5 +31,13 @@
window.onresize = function() { resizeEditor() }
//]]>
+
+
+if(document.getElementById("divPopup").innerHTML.trim() != "")
+{
+ document.getElementById("divPopup").style.display = 'block';
+ document.getElementById("divShade").style.display = 'block';
+ document.getElementById("divPopup").innerHTML += "<input type='button' onclick=\"hideDiv('divPopup'); hideDiv('divShade');\" value='Close'></input>";;
+}
</script>
<!include master_b.inc>
Modified: branches/2.4.2/config/templates/edit_head.inc
===================================================================
--- branches/2.4.2/config/templates/edit_head.inc 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/config/templates/edit_head.inc 2012-08-24 03:31:54 UTC (rev 343)
@@ -3,6 +3,7 @@
<head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
+<script language="javascript" type="text/javascript" src="/masterpage.js"></script>
<link rel="stylesheet" type="text/css" href="/style/main.css" />
<link rel="shortcut icon" href="/style/favicon.ico" />
Modified: branches/2.4.2/config/templates/error.xhtml
===================================================================
--- branches/2.4.2/config/templates/error.xhtml 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/config/templates/error.xhtml 2012-08-24 03:31:54 UTC (rev 343)
@@ -1,5 +1,8 @@
<!include master_a.inc>
+<!-- content_start -->
<h1>Something went wrong</h1>
<p>
%(attr:error)s
-</p><!include master_b.inc>
+</p>
+<!-- content_end -->
+<!include master_b.inc>
Modified: branches/2.4.2/config/templates/home_editable.inc
===================================================================
--- branches/2.4.2/config/templates/home_editable.inc 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/config/templates/home_editable.inc 2012-08-24 03:31:54 UTC (rev 343)
@@ -10,8 +10,9 @@
Note: you will need Adobe Flash Player to watch the performances. This is a standard plug-in for most web browsers, but if you don't have it, it's free to download from the <a href="http://www.adobe.com/go/getflashplayer" target="other">Adobe site.</a></p>
<h1>
UpStage Stage List</h1>
-Your name is %(username)s
<p>
+ Your name is %(username)s</p>
+<p>
The following stages are viewable on this UpStage server:</p>
<p>
%(list)s</p>
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/html/masterpage.js 2012-08-24 03:31:54 UTC (rev 343)
@@ -648,10 +648,9 @@
else
{
divMessage.style.display = 'block';
- divMessage.innerHTML += "<input type='button' onclick=\"hideDiv('divMessage'); hideDiv('divShade');\" value='Close'></input>";
+ divMessage.innerHTML += "<input type='button' onclick=\"hideDiv('"+div+"'); hideDiv('divShade');\" value='Close'></input>";
document.getElementById("divShade").style.display = 'block';
}
-
}
function GetXmlHttpObject()
Modified: branches/2.4.2/html/style/main.css
===================================================================
--- branches/2.4.2/html/style/main.css 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/html/style/main.css 2012-08-24 03:31:54 UTC (rev 343)
@@ -786,6 +786,25 @@
z-index: 9999;
}
+
+#divPopup
+{
+ margin: 10px;
+ padding: 15px;
+ box-shadow: #AAA 1px 1px 10px;
+ border-radius: 5px;
+ border: #888 2px solid;
+ background-color: #EEE;
+ position: fixed;
+ left: 35%;
+ right: auto;
+ top: 45%;
+ bottom: auto;
+ text-align: center;
+ display: none;
+ z-index: 9999;
+}
+
#divShade
{
display: none;
Modified: branches/2.4.2/html/user.js
===================================================================
--- branches/2.4.2/html/user.js 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/html/user.js 2012-08-24 03:31:54 UTC (rev 343)
@@ -7,6 +7,7 @@
* @version 0.1
* Changelog:
* Heath Behrens, Moh - 18-05-2011 - Added a check to see if the password is empty.
+ * Daniel, Gavin 24/08/2012 - Removed alert box on toUser so it only gets postback from the server
*/
/**
@@ -19,6 +20,7 @@
function updateEmail(addy, username)
{
requestPage("POST", '/admin/workshop/user?username='+unescape(username)+'&email='+addy+'&submit=saveemail', toUser);
+ alert("Email changed successfully.");
}
/**
@@ -37,7 +39,7 @@
var hex1 = hex_md5(pass1);
var hex2 = hex_md5(pass2);
requestPage("POST", '/admin/workshop/user?username='+unescape(username)+'&password='+hex1+'&password2='+hex2+'&submit=savepassword', toUser);
- alert("Password changed successfully.")
+ alert("Password changed successfully.");
}
}
@@ -45,8 +47,33 @@
{
if(xmlhttp.readyState==4)
{
- navUserPage();
+ if(xmlhttp.status == 200)
+ {
+ divMsg = document.getElementById("divPopup");
+ divShad = document.getElementById("divShade");
+ divMsg.innerHTML = "Successfully Confirmed!" + "<input type='button' onclick=\"hideDiv('divPopup'); hideDiv('divShade'); navUserPage()\" value='Close'></input>";;
+
+ divMsg.style.display = 'block';
+ divShad.style.display = 'block';
+ }
+ else
+ {
+ var html = xmlhttp.responseText;
+
+ var a = html.split('<!-- content_start -->');
+ var b = a[1].split('<!-- content_end -->');
+ html = b[0];
+
+ divMsg = document.getElementById("divPopup");
+ divShad = document.getElementById("divShade");
+ divMsg.innerHTML = html + "<input type='button' onclick=\"hideDiv('divPopup'); hideDiv('divShade');\" value='Close'></input>";;
+
+ divMsg.style.display = 'block';
+ divShad.style.display = 'block';
+ }
+
}
+
}
function setAdminLinks()
@@ -167,7 +194,6 @@
var hex2 = hex_md5(password2);
request += '&password='+hex1+'&password2='+hex2
- alert("Password changed successfully.")
} else {
alert("Password cannot be empty");
}
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/upstage/pages.py 2012-08-24 03:31:54 UTC (rev 343)
@@ -347,7 +347,7 @@
class HomeEditPage(AdminBase):
filename="edit.xhtml"
-
+ postback = ''
def __init__(self, player, collection={}):
AdminBase.__init__(self, player, collection)
self.player = player
@@ -363,15 +363,13 @@
if content == 'default':
s = get_template('home_editable.default')
- return s
-
+ return s
+
def render_GET(self, request):
- print ("in get")
return AdminBase.render_GET(self, request)
def render_POST(self, request):
"""Save changes and create new state"""
- print "in action"
form = request.args
if 'action' in form:
content = form["action"][0]
@@ -381,6 +379,7 @@
f = open(os.path.join(config.TEMPLATE_DIR, 'home_editable.inc'), 'w')
f.write(content)
f.close()
+ self.postback = "Successfully Saved"
return AdminBase.render_POST(self, request)
@@ -390,7 +389,7 @@
class WorkshopEditPage(AdminBase):
filename="edit.xhtml"
-
+ postback = ''
def __init__(self, player, collection={}):
AdminBase.__init__(self, player, collection)
self.player = player
@@ -422,7 +421,7 @@
f = open(os.path.join(config.TEMPLATE_DIR, 'workshop_editable.inc'), 'w')
f.write(content)
f.close()
-
+ self.postback = "Successfully Saved"
return AdminBase.render_POST(self, request)
class AdminWarning(AdminError):
@@ -1259,13 +1258,12 @@
if 'submit' in form:
try:
self.collection.update_from_form(form, self.player)
+ request.redirect("/admin/workshop/user")
except UpstageError, e:
log.msg(e)
return errorpage(request, "That didn't work! %s" % e)
- request.redirect("/admin/workshop/user")
-
return AdminBase.render(self, request)
class EditPlayer(AdminBase):
Modified: branches/2.4.2/upstage/player.py
===================================================================
--- branches/2.4.2/upstage/player.py 2012-08-24 01:42:34 UTC (rev 342)
+++ branches/2.4.2/upstage/player.py 2012-08-24 03:31:54 UTC (rev 343)
@@ -25,6 +25,8 @@
Modified by: Daniel Han (29-06-2012) - added last_login date
Modified by: Daniel Han (03-07-2012) - Enabled Searching for Players
+
+Modified by: Daniel Han (24/08/2012) - Check if username is available and if not, throws exception
"""
import md5, os
@@ -118,7 +120,7 @@
def set_email(self, raw_email=None):
"""Set email, using plaintext string"""
if raw_email is None:
- raise UpStageError("Empty email address! Please re-enter!")
+ raise UpstageError("Empty email address! Please re-enter!")
self.email = raw_email
def check_password(self, pw):
@@ -285,6 +287,12 @@
user = _value('username')
newpass = _value('password')
newpass2 = _value('password2')
+
+ # if username already exists
+ checkP = self.getPlayer(user)
+ if checkP.name == user:
+ raise UpstageError("User %s already exists" % user)
+
# Nic k R 01/02/10: Added if'else to seperate between password changing and player creation.
if 'date' and 'email' in form:
newdate = _value('date')
@@ -354,7 +362,7 @@
newpass2 = _value('password2')
if newpass != newpass2:
- raise UpStageError('Password did not match!')
+ raise UpstageError('Password did not match!')
if player.can_admin():
self[user].set_password(newpass)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-29 04:22:22
|
Revision: 344
http://upstage.svn.sourceforge.net/upstage/?rev=344&view=rev
Author: aut-upstage
Date: 2012-08-29 04:22:14 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
- Daniel
Fixed authorization bug by relocating home and stages under /admin
Modified Paths:
--------------
branches/2.4.2/html/masterpage.js
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/web.py
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2012-08-24 03:31:54 UTC (rev 343)
+++ branches/2.4.2/html/masterpage.js 2012-08-29 04:22:14 UTC (rev 344)
@@ -26,7 +26,8 @@
* Modified by Daniel Gavin (22/08/2012) - Modified postback message to be more visible to users when users save a stage.
*
- *
+ * Modified by Daniel (29/08/2012) - Added isLoggedIn method and navHome() and navStages() checks if user is logged in.
+ and if so, page is redirected to /admin/home or /admin/stages
*/
//Instance type variables
@@ -134,7 +135,7 @@
}
}
- function temp_getCookie(c_name)
+function temp_getCookie(c_name)
{
var i,x,y,ARRcookies=document.cookie.split(";");
for (i=0;i<ARRcookies.length;i++)
@@ -158,7 +159,7 @@
{
var userInfo = document.hidden_form.user_name.value;
var passInfo = document.hidden_form.server_details.value;
- var value = userInfo+"="+passInfo;
+ var value = userInfo + "=" + passInfo;
//call to set cookie
//setCookie("usernameUpStage", value, 0, 1);
}
@@ -248,9 +249,27 @@
* Navigation functions. Not strictly required now
* but will be for ajax (if implemented).
*/
+
+ /*
+ Daniel Han (29/08/2012) - Checking if user is logged in by checking hidden_form.user_name value.
+ - Don't use this as a final user check.
+ */
+ function isLoggedIn()
+ {
+ try
+ {
+ return document.hidden_form.user_name.value != "_NO_PLAYER_";
+ }catch(err){ return false; }
+ }
+
function navHome()
{
- window.location = '/home';
+ if(isLoggedIn())
+ {
+ window.location = '/admin/home';
+ }
+ else
+ window.location = '/home';
}
function navWorkshop()
@@ -260,7 +279,12 @@
function navStages()
{
- window.location = '/stages';
+ if(isLoggedIn())
+ {
+ window.location = '/admin/stages';
+ }
+ else
+ window.location = '/stages';
}
function navSignup()
@@ -375,9 +399,9 @@
setCookie('username',name,30,0);
setCookie('password',md5val,30,0);
}
- setCookie('tempUser', name, 0, 1);
- setCookie('tempPass', md5val, 0, 1);
- requestPage("GET", "/admin/perspective-init?username="+unescape(name)+"&password="+md5val+"&submit=Login", checkLogin);
+ //setCookie('tempUser', name, 0, 1);
+ //setCookie('tempPass', md5val, 0, 1);
+ requestPage("POST", "/admin/perspective-init?username="+unescape(name)+"&password="+md5val+"&submit=Login", checkLogin);
}
/**
@@ -480,32 +504,43 @@
html += '<p>You will be redirected to the homepage in 3 seconds...</p>'; //
document.getElementById("page").innerHTML = html; // PR - 9/10/2010
window.setTimeout('location.reload(true)', 3000);
- //window.setTimeout(navHome(), 3000); //05/04/2011 navigate to home when login fails
- //deleteCookie('username');
- //deleteCookie('password');
}
else
{
- cookieChecked = true;
- tempPlayer = getCookie('tempUser');
- tempPass = getCookie('tempPass');
- requestPage("POST", "/session?username="+tempPlayer+'&password='+tempPass, checkSessionLogin);
- //navWorkshop();
+ // Modified: Daniel Han (29/08/2012) Checking /admin/id to confirm login.
+ //requestPage("POST", "/admin/id", checkSessionLogin);
+ navWorkshop();
}
}
}
function checkSessionLogin()
{
- if (xmlhttp.readyState==4)
+ if (xmlhttp.status == 200 && xmlhttp.readyState == 4)
{
- if(xmlhttp.responseText =='Success')
- {
- // if sessionLogin is complete, delete temporary username from cookie
- deleteCookie('tempUser');
- deleteCookie('tempPass');
- navWorkshop();
- }
+ // Modified: Daniel Han (29/08/2012) Checking /admin/id to confirm login.
+ // player=admin&canAdmin=True&canAct=True&canSu=True&key=834013b601f517024bd0137c238acc33
+ var text = xmlhttp.responseText;
+ var arr = text.split("&");
+
+ for(var param in arr)
+ {
+ var data = arr[param].split("=");
+ if(data[0] == "player")
+ {
+ if(data[1] == "nice+visitor")
+ {
+ // User is not logged in
+ // Nothing to do here~
+ }
+ else
+ {
+ // User successfully logged in
+ clearLogin();
+ }
+ break;
+ }
+ }
}
}
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-08-24 03:31:54 UTC (rev 343)
+++ branches/2.4.2/upstage/pages.py 2012-08-29 04:22:14 UTC (rev 344)
@@ -127,7 +127,7 @@
fn = m.group(1)
inc = get_template(fn)
s = s.replace(m.group(), inc)
-
+
#XXX could cache at this stage, if necessary.
bits = s.split('%(')
out = [bits[0]]
@@ -152,7 +152,7 @@
fn = m.group(1)
inc = get_template(fn)
s = s.replace(m.group(), inc)
-
+
#XXX could cache at this stage, if necessary.
bits = s.split('%(')
out = [bits[0]]
@@ -169,7 +169,7 @@
out.append(rest)
str = ''.join(out)
return str
-
+
class AdminBase(Template):
"""Base class for these admin pages - many of them
@@ -485,7 +485,7 @@
explicitly put there, will result in the login page"""
#XXX could store onwards path in form
return self
-
+
""" Shaun Narayan (02/16/10)- Although these next three classes dont
currently do anything dynamic, they will be made to in future versions
@@ -508,14 +508,6 @@
html_list += self.collection.html_list(self.text_username(request))
html_list += '</table>'
return html_list
-
- def text_username(self, request):
- session = request.getSession()
- userSession = websession.IUserSession(session)
- if userSession.value is not None:
- return userSession.value.name
- else:
- return '_NO_PLAYER_'
"""
Added by Daniel Han (03/07/2012) - To set the session of player
@@ -1484,15 +1476,7 @@
self.message = str(e) #useful message
return AdminBase.render(self, request)
- def text_username(self, request):
- session = request.getSession()
- userSession = websession.IUserSession(session)
- if userSession.value is not None:
- return userSession.value.name
- else:
- return '_NO_PLAYER_'
-
def text_list(self, request):
#print self.childClass, self.collection
""" Modified by Alan (05.02.08) - Added the ability to group media
Modified: branches/2.4.2/upstage/web.py
===================================================================
--- branches/2.4.2/upstage/web.py 2012-08-24 03:31:54 UTC (rev 343)
+++ branches/2.4.2/upstage/web.py 2012-08-29 04:22:14 UTC (rev 344)
@@ -28,6 +28,8 @@
is uploaded.
Modified by: Daniel Han 26/06/2012 - Modified NonAdmin part inside AdminRealm
Modified by: Daniel Han 29/06/2012 - ADDed SU rights for Admin/Edit access. (inside AdminRealm)
+Modified by: Daniel Han 29/08/2012 - Added /Admin/Home and /Admin/Stages. so when user logged in, home and stages are linked to /Admin/Stages
+ - Also, when user is not logged in, it will show it just as if user is in normal home or stages page.
"""
@@ -135,14 +137,16 @@
'mediaedit' : (MediaEditPage, self.data),
'user' : (UserPage, self.data.players),
'newplayer' : (NewPlayer, self.data.players),
- 'editplayers' : (EditPlayer, self.data.players)}
+ 'editplayers' : (EditPlayer, self.data.players)
+ }
- """ Admin Only - Password Page """
+ """ Admin Only - Password Page """
+
# AC 01.06.08 - Allows admin only to change only their own password.
# Super Admin can change any players details.
# NR 03.04.10 - Deprecated due to all users being given access to the User Page and its
# password changer.
- # Assign the new and edit pages to the website tree
+ # Assign the new and edit pages to the website tree
tree.putChild('workshop', CreateDir(player, workshop_pages))
tree.putChild('save_thing', SwfConversionWrapper(self.data.mediatypes, player))
@@ -156,7 +160,8 @@
if player.can_su():
edit_pages = {'home' : (HomeEditPage, self.data),
'workshop' : (WorkshopEditPage, self.data)}
- tree.putChild('edit', PageEditPage(player, edit_pages))
+ tree.putChild('edit', PageEditPage(player, edit_pages))
+
# player, but not admin.
elif player.can_act():
@@ -167,7 +172,9 @@
else:
tree = AdminLoginPage(player)
tree.putChild('id', SessionID(player, self.data.clients))
-
+
+ tree.putChild('home', HomePage(self.data.stages, player))
+ tree.putChild('stages', ThingsList(player, childClass=StagePage, collection=self.data.stages))
return (IResource, tree, lambda : None)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-29 04:29:03
|
Revision: 345
http://upstage.svn.sourceforge.net/upstage/?rev=345&view=rev
Author: aut-upstage
Date: 2012-08-29 04:28:56 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Gavin/Daniel - Added Scroller and close button for edit player form
Modified Paths:
--------------
branches/2.4.2/config/templates/editplayer.xhtml
branches/2.4.2/html/style/main.css
branches/2.4.2/html/user.js
Modified: branches/2.4.2/config/templates/editplayer.xhtml
===================================================================
--- branches/2.4.2/config/templates/editplayer.xhtml 2012-08-29 04:22:14 UTC (rev 344)
+++ branches/2.4.2/config/templates/editplayer.xhtml 2012-08-29 04:28:56 UTC (rev 345)
@@ -12,12 +12,13 @@
<!-- End of SEARCH SECTION -->
<div class="right_section">
- <div class="edit_player" id="edit_player">
+ <div class="edit_player" id="edit_player">
+
<form class="hidden" name="userdetails" id="userdetails" action="%(req:path)s" >
<input type="hidden" name="playername" id="editplayername" value="" />
<input type="hidden" name="date" id="editdate" value="" />
<h1>Editing player details for <b id='dispplayername'></b></h1>
-
+
<h2>Change permissions</h2>
<table>
<tr><th colspan="2">
@@ -40,6 +41,7 @@
<td><b>Unlimited Upload Limit</b>. Not restricted by upload limiting</td>
</tr>
</table>
+
<h2> Change Email </h2>
@@ -73,7 +75,9 @@
<input type="button" onclick="javascript:updatePlayer();" value="Update Player"></input>
<input type="button" onclick="javascript:deletePlayer();" value="Delete Player"></input>
- </form>
+ <input type="button" onclick= "javascript:closeEdit();" value="Close"></input>
+ </form>
+
</div>
</div> <!-- end of right section -->
Modified: branches/2.4.2/html/style/main.css
===================================================================
--- branches/2.4.2/html/style/main.css 2012-08-29 04:22:14 UTC (rev 344)
+++ branches/2.4.2/html/style/main.css 2012-08-29 04:28:56 UTC (rev 345)
@@ -25,6 +25,7 @@
Modified by: Vibhu & Nessa: Added lines 481 onwards which are used to style the image browser gallery
1.8 27/06/12 Daniel Han From line 557
+1.9 29/08/12 Daniel Han/Gavin Chan line 696 - scroller for edit player form
*/
@@ -689,6 +690,10 @@
position:fixed;
background-color: #fff;
+ left:30%;
+ top:30%;
+ height: 50%;
+ overflow: auto;
box-shadow: #aaa 1px 1px 10px;
border-radius: 5px;
border: #888 2px solid;
@@ -818,4 +823,7 @@
top: 0px;
left: 0px;
z-index: 9998;
-}
\ No newline at end of file
+}
+
+
+
Modified: branches/2.4.2/html/user.js
===================================================================
--- branches/2.4.2/html/user.js 2012-08-29 04:22:14 UTC (rev 344)
+++ branches/2.4.2/html/user.js 2012-08-29 04:28:56 UTC (rev 345)
@@ -213,6 +213,12 @@
}
}
+function closeEdit()
+{
+ document.getElementById("userdetails").style.visibility = "Hidden";
+ document.getElementById("edit_player").style.visibility = "Hidden";
+}
+
function displayError()
{
document.getElementById("message").innerHTML = "Error - please choose a player from the list!";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-29 05:48:55
|
Revision: 348
http://upstage.svn.sourceforge.net/upstage/?rev=348&view=rev
Author: aut-upstage
Date: 2012-08-29 05:48:49 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Gavin/Daniel - Remade exit button for admin edit player form
Modified Paths:
--------------
branches/2.4.2/config/templates/editplayer.xhtml
branches/2.4.2/html/style/main.css
branches/2.4.2/html/user.js
Modified: branches/2.4.2/config/templates/editplayer.xhtml
===================================================================
--- branches/2.4.2/config/templates/editplayer.xhtml 2012-08-29 05:15:10 UTC (rev 347)
+++ branches/2.4.2/config/templates/editplayer.xhtml 2012-08-29 05:48:49 UTC (rev 348)
@@ -17,8 +17,8 @@
<form class="hidden" name="userdetails" id="userdetails" action="%(req:path)s" >
<input type="hidden" name="playername" id="editplayername" value="" />
<input type="hidden" name="date" id="editdate" value="" />
- <h1>Editing player details for <b id='dispplayername'></b></h1>
-
+ <a href="#" id="exitButton" onclick="closeEdit();"> X </a>
+ <h1>Editing player details for <b id='dispplayername'></b></h1>
<h2>Change permissions</h2>
<table>
<tr><th colspan="2">
@@ -75,7 +75,6 @@
<input type="button" onclick="javascript:updatePlayer();" value="Update Player"></input>
<input type="button" onclick="javascript:deletePlayer();" value="Delete Player"></input>
- <input type="button" onclick= "javascript:closeEdit();" value="Close"></input>
</form>
</div>
Modified: branches/2.4.2/html/style/main.css
===================================================================
--- branches/2.4.2/html/style/main.css 2012-08-29 05:15:10 UTC (rev 347)
+++ branches/2.4.2/html/style/main.css 2012-08-29 05:48:49 UTC (rev 348)
@@ -25,7 +25,7 @@
Modified by: Vibhu & Nessa: Added lines 481 onwards which are used to style the image browser gallery
1.8 27/06/12 Daniel Han From line 557
-1.9 29/08/12 Daniel Han/Gavin Chan line 696 - scroller for edit player form
+1.9 29/08/12 Daniel Han/Gavin Chan line 696 - scroller for edit player form & line 828 custom exit button
*/
@@ -825,5 +825,19 @@
z-index: 9998;
}
+#exitButton
+{
+ position: relative;
+ left: 95%;
+ width: 45px;
+ top: auto;
+ bottom: auto;
+ color: #000;
+ font-size: 20px;
+ background: #EEE;
+ border: 1px solid #CCC;
+ text-shadow: 0 1px 3px grey;
+}
+
Modified: branches/2.4.2/html/user.js
===================================================================
--- branches/2.4.2/html/user.js 2012-08-29 05:15:10 UTC (rev 347)
+++ branches/2.4.2/html/user.js 2012-08-29 05:48:49 UTC (rev 348)
@@ -8,6 +8,7 @@
* Changelog:
* Heath Behrens, Moh - 18-05-2011 - Added a check to see if the password is empty.
* Daniel, Gavin 24/08/2012 - Removed alert box on toUser so it only gets postback from the server
+ * Gavin 29/08/2012 - Made event to close the edit player form
*/
/**
@@ -124,7 +125,6 @@
/**
Saves player details according to the given items within the appropriate fields.
-
*/
function savePlayer()
{
@@ -213,9 +213,12 @@
return "";
}
}
-
+/**
+* Event to close the editing player details form
+*/
function closeEdit()
{
+ // Gavin Chan (29/08/2012) Makes the form and components hidden
document.getElementById("userdetails").style.visibility = "Hidden";
document.getElementById("edit_player").style.visibility = "Hidden";
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-30 04:32:22
|
Revision: 350
http://upstage.svn.sourceforge.net/upstage/?rev=350&view=rev
Author: aut-upstage
Date: 2012-08-30 04:32:16 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
Fixed IE8 problem on StageEdit
Modified Paths:
--------------
branches/2.4.2/config/templates/master_a.inc
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/style/main.css
Modified: branches/2.4.2/config/templates/master_a.inc
===================================================================
--- branches/2.4.2/config/templates/master_a.inc 2012-08-30 02:45:07 UTC (rev 349)
+++ branches/2.4.2/config/templates/master_a.inc 2012-08-30 04:32:16 UTC (rev 350)
@@ -1,5 +1,7 @@
<!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">
+<!--[if lte IE 8]> <html class="ie8" xmlns="http://www.w3.org/1999/xhtml"> <![endif]-->
+<!--[if !IE]><!--> <html xmlns="http://www.w3.org/1999/xhtml"> <!--<![endif]-->
+
<head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<title>UpStage</title>
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-08-30 02:45:07 UTC (rev 349)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-08-30 04:32:16 UTC (rev 350)
@@ -136,18 +136,18 @@
<input type="hidden" name="action" value=""></input>
<table>
<tr>
- <td style="width:10%"><input type="button" onclick="javascript:warn(0);" value="Save"></input></td>
+ <td style="width:10%"><input type="button" onclick="warn(0);" value="Save"></input></td>
<td style="width:40%">Save your stage.</td>
- <td style="width:10%"><input type="button" onclick="javascript:warn(1);" value="Cancel"></input></td>
+ <td style="width:10%"><input type="button" onclick="warn(1);" value="Revert Changes"></input></td>
<td style="width:40%">Get rid of any changes you've made.</td>
</tr>
<tr>
<td> </td>
</tr>
<tr>
- <td style="width:10%"><input type="button" onclick="javascript:warn(2);" value="Delete"></input></td>
+ <td style="width:10%"><input type="button" onclick="warn(2);" value="Delete"></input></td>
<td style="width:40%">Delete the stage.</td>
- <td style="width:10%"><input type="button" onclick="javascript:warn(3);" value="Reset"></input></td>
+ <td style="width:10%"><input type="button" onclick="warn(3);" value="Set to Default"></input></td>
<td style="width:40%">Reset the stage to its original configuration.</td>
</tr>
<tr>
Modified: branches/2.4.2/html/style/main.css
===================================================================
--- branches/2.4.2/html/style/main.css 2012-08-30 02:45:07 UTC (rev 349)
+++ branches/2.4.2/html/style/main.css 2012-08-30 04:32:16 UTC (rev 350)
@@ -819,7 +819,9 @@
height: 100%;
width: 100%;
background-color: #000;
+
opacity: 0.7;
+
top: 0px;
left: 0px;
z-index: 9998;
@@ -839,5 +841,57 @@
text-shadow: 0 1px 3px grey;
}
+.ie8 #divMessage
+{
+ margin: 10px;
+ padding: 15px;
+ box-shadow: #AAA 1px 1px 10px;
+ border-radius: 5px;
+ border: #888 2px solid;
+ background-color: #EEE;
+ position: absolute;
+ left: 35%;
+ right: auto;
+ top: 45%;
+ bottom: auto;
+ text-align: center;
+ display: none;
+ z-index: 9999;
+}
+.ie8 #divPopup
+{
+ margin: 10px;
+ padding: 15px;
+ box-shadow: #AAA 1px 1px 10px;
+ border-radius: 5px;
+ border: #888 2px solid;
+ background-color: #EEE;
+ position: absolute;
+ left: 35%;
+ right: auto;
+ top: 45%;
+ bottom: auto;
+ text-align: center;
+ display: none;
+ z-index: 9999;
+}
+.ie8 #divShade
+{
+ display: none;
+ padding:0px;
+ margin:0px;
+ position: absolute;
+ height: 100%;
+ width: 100%;
+ background-color: #000;
+
+ /* Opacity for IE browsers */
+ -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
+ filter: alpha(opacity=70);
+
+ top: 0px;
+ left: 0px;
+ z-index: 9998;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-30 05:00:37
|
Revision: 351
http://upstage.svn.sourceforge.net/upstage/?rev=351&view=rev
Author: aut-upstage
Date: 2012-08-30 05:00:31 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
- Daniel
Set to Default bug, and button name changes.
Modified Paths:
--------------
branches/2.4.2/html/masterpage.js
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/stage.py
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2012-08-30 04:32:16 UTC (rev 350)
+++ branches/2.4.2/html/masterpage.js 2012-08-30 05:00:31 UTC (rev 351)
@@ -44,8 +44,8 @@
var signup_html = '<a href="javascript:navSignup();">Dont have an account? Find out how to get involved.</a>';
var warningMessages = ['This will save the stage, losing any previous settings. Do you wish to proceed?',
'You will loose any chages you have made. Do you wish to proceed?',
+ 'This will delete the selected stage. Do you wish to proceed?',
'Warning: This will cause the stage to reload for everyone currently on it, and you will loose the chat log. Do you wish to proceed?',
- 'This will delete the selected stage. Do you wish to proceed?',
'Any changes you have made will be saved, overwriting prevoius settings. Do you wish to proceed?',
'The selected media item will be permanantly deleted. Do you wish to proceed?']
var actions = ['save', 'cancel', 'delete', 'reset', 'save', 'delete']; //Dont really need these, just makes server code more readable.
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-08-30 04:32:16 UTC (rev 350)
+++ branches/2.4.2/upstage/pages.py 2012-08-30 05:00:31 UTC (rev 351)
@@ -719,8 +719,8 @@
elif action=='reset':
if self.stage:
- self.stage.reset()
- self.message+='Stage reset! '
+ self.stage.set_default()
+ self.message+='Stage has set to default! '
elif action=='delete':
self.collection.stages.delete_stage(self.stagename, self.player);
Modified: branches/2.4.2/upstage/stage.py
===================================================================
--- branches/2.4.2/upstage/stage.py 2012-08-30 04:32:16 UTC (rev 350)
+++ branches/2.4.2/upstage/stage.py 2012-08-30 05:00:31 UTC (rev 351)
@@ -103,6 +103,16 @@
self.avatars = ThingCollection(Avatar, self.owner.mediatypes['avatar']) # avatar objects here.
# PQ & EB: 17.9.07
self.audios = ThingCollection(Audio, self.owner.mediatypes['audio']) # audio objects here.
+
+ def set_default(self):
+ self.wake()
+ self.clear()
+ self.splash_message = 'Welcome to UpStage'
+ self.backgroundPropBgColour = '0xFFFFFF'
+ self.chatBgColour = '0xFFFFFF'
+ self.toolsBgColour = '0xFFFFFF'
+ self.pageBgColour = '0xFFFFFF'
+ self.debugMessages = 'normal'#(12/11/08)Aaron added to displays debug messages or not 'Normal' or 'DEBUG'
def reset(self):
@@ -114,8 +124,10 @@
self.chat = [] # chat strings build up here.
self.broadcast('RELOAD') #so no-one is left with the old version.
self.current_bg = None
+
if not os.path.exists(self.config_file):
self.setup()
+
self.load()
def soft_reset(self):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-08-30 05:38:34
|
Revision: 352
http://upstage.svn.sourceforge.net/upstage/?rev=352&view=rev
Author: aut-upstage
Date: 2012-08-30 05:38:28 +0000 (Thu, 30 Aug 2012)
Log Message:
-----------
- Daniel
Normal Player Change Password Bug Fix
Modified Paths:
--------------
branches/2.4.2/html/user.js
branches/2.4.2/upstage/player.py
Modified: branches/2.4.2/html/user.js
===================================================================
--- branches/2.4.2/html/user.js 2012-08-30 05:00:31 UTC (rev 351)
+++ branches/2.4.2/html/user.js 2012-08-30 05:38:28 UTC (rev 352)
@@ -21,7 +21,7 @@
function updateEmail(addy, username)
{
requestPage("POST", '/admin/workshop/user?username='+unescape(username)+'&email='+addy+'&submit=saveemail', toUser);
- alert("Email changed successfully.");
+ //alert("Email changed successfully.");
}
/**
@@ -40,7 +40,7 @@
var hex1 = hex_md5(pass1);
var hex2 = hex_md5(pass2);
requestPage("POST", '/admin/workshop/user?username='+unescape(username)+'&password='+hex1+'&password2='+hex2+'&submit=savepassword', toUser);
- alert("Password changed successfully.");
+ //alert("Password changed successfully.");
}
}
Modified: branches/2.4.2/upstage/player.py
===================================================================
--- branches/2.4.2/upstage/player.py 2012-08-30 05:00:31 UTC (rev 351)
+++ branches/2.4.2/upstage/player.py 2012-08-30 05:38:28 UTC (rev 352)
@@ -414,6 +414,7 @@
if(check):
rights = player.rights
user = player.name
+ email = player.email
else:
user = _value('username')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-10 05:18:48
|
Revision: 360
http://upstage.svn.sourceforge.net/upstage/?rev=360&view=rev
Author: aut-upstage
Date: 2012-09-10 05:18:42 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
- Daniel
Fixed Users ability to double click the submit button on Media Upload
Modified Paths:
--------------
branches/2.4.2/config/templates/mediaupload.xhtml
branches/2.4.2/html/mediaupload.js
Modified: branches/2.4.2/config/templates/mediaupload.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaupload.xhtml 2012-09-10 05:01:00 UTC (rev 359)
+++ branches/2.4.2/config/templates/mediaupload.xhtml 2012-09-10 05:18:42 UTC (rev 360)
@@ -19,7 +19,7 @@
</div>
<br />
-<form name="natasha" method="post" enctype="multipart/form-data" action=""> <!-- action=req:path so you can decide what to do with it?? method="post" enctype="multipart/form-data" action="/admin/save_thing" action="%(req:path)s" -->
+<form name="natasha" method="post" enctype="multipart/form-data" action="" onsubmit="disableSubmit()"> <!-- action=req:path so you can decide what to do with it?? method="post" enctype="multipart/form-data" action="/admin/save_thing" action="%(req:path)s" -->
<input type="hidden" name="uploader" size="16" value="%(user)s" />
<input type="hidden" name="is_su" size="16" value="%(can_su)s" />
<input type="hidden" name="dateTime" size="16" value="%(datetime)s" />
@@ -240,7 +240,7 @@
<div id="submitbuttons">
<table>
<tr>
- <td><input type="submit" name="saveMedia" value="Upload Media" onclick="checkAllFields(); return sendPostAction();"/></td>
+ <td><input id="btnSubmit" type="submit" name="saveMedia" value="Upload Media" onclick="checkAllFields(); return sendPostAction();"/></td>
<td><input type="reset" name="cancelMedia" value="Clear"/></td>
</tr>
</table>
Modified: branches/2.4.2/html/mediaupload.js
===================================================================
--- branches/2.4.2/html/mediaupload.js 2012-09-10 05:01:00 UTC (rev 359)
+++ branches/2.4.2/html/mediaupload.js 2012-09-10 05:18:42 UTC (rev 360)
@@ -6,7 +6,9 @@
Heath Behrens (28/07/2011) - Modified line 465 to now access the last element in the array.
part of fix for dots in filename.
Vibhu Patel (28/07/2011) - Made changes to layout namely switch assigned and unassigned stages
- boxes.
+ boxes.
+
+ Daniel Han (10/09/2012) - If PostAction should continue, Button click will be disabled to prevent users from double clicking.
*/
// global variables
@@ -23,6 +25,7 @@
* Sends Action using AJAX.
* Problem is that not many browser supports raw data to be sent using AJAX.
* May be consider it to be later used.
+*
*/
function sendPostAction()
{
@@ -33,9 +36,15 @@
}
return false;
*/
+
return shallContinue();
}
+function disableSubmit()
+{
+ document.getElementById("btnSubmit").disabled = 'disabled';
+}
+
/*
* Author: Natasha Pullan
* Sets the action of the webpage when a media type is selected
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-11 00:02:06
|
Revision: 361
http://upstage.svn.sourceforge.net/upstage/?rev=361&view=rev
Author: aut-upstage
Date: 2012-09-11 00:02:00 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
- Daniel
More Editable pages are added
> stages, non-admin (guest player access)
Modified Paths:
--------------
branches/2.4.2/config/templates/edit_head.inc
branches/2.4.2/config/templates/nonadmin.xhtml
branches/2.4.2/config/templates/stagelist.xhtml
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/web.py
Added Paths:
-----------
branches/2.4.2/config/templates/nonadmin_editable.default
branches/2.4.2/config/templates/nonadmin_editable.inc
branches/2.4.2/config/templates/stages_editable.default
branches/2.4.2/config/templates/stages_editable.inc
Modified: branches/2.4.2/config/templates/edit_head.inc
===================================================================
--- branches/2.4.2/config/templates/edit_head.inc 2012-09-10 05:18:42 UTC (rev 360)
+++ branches/2.4.2/config/templates/edit_head.inc 2012-09-11 00:02:00 UTC (rev 361)
@@ -185,6 +185,8 @@
<li> <a href="/admin/"> Back to Workshop</a> </li>
<li> <a href="/admin/edit/home"> Edit Home Page </a> </li>
<li> <a href="/admin/edit/workshop"> Edit Workshop Page</a> </li>
+ <li> <a href="/admin/edit/nonadmin"> Edit Non-Admin(Guest Player) Page </a> </li>
+ <li> <a href="/admin/edit/stages"> Edit Stages Page</a> </li>
</ul>
</div>
</div>
Modified: branches/2.4.2/config/templates/nonadmin.xhtml
===================================================================
--- branches/2.4.2/config/templates/nonadmin.xhtml 2012-09-10 05:18:42 UTC (rev 360)
+++ branches/2.4.2/config/templates/nonadmin.xhtml 2012-09-11 00:02:00 UTC (rev 361)
@@ -1,10 +1,8 @@
<!include no_menu_master_a.inc>
-<p class="error">
- Welcome to UpStage. You have logged in with Guest Player status. <br />
- Below are the stages that you are able to access as a Player - click on the stage name to enter the stage.
-</p>
+<!include nonadmin_editable.inc>
+
<br />
- %(list)s
- <script type="text/javascript">countPlayerAndAudience();</script>
+%(list)s
+<script type="text/javascript">countPlayerAndAudience();</script>
<!include master_b.inc>
Added: branches/2.4.2/config/templates/nonadmin_editable.default
===================================================================
--- branches/2.4.2/config/templates/nonadmin_editable.default (rev 0)
+++ branches/2.4.2/config/templates/nonadmin_editable.default 2012-09-11 00:02:00 UTC (rev 361)
@@ -0,0 +1,4 @@
+<p>
+ Welcome to UpStage. You have logged in with Guest Player status. <br />
+ Below are the stages that you are able to access as a Player - click on the stage name to enter the stage.
+</p>
\ No newline at end of file
Added: branches/2.4.2/config/templates/nonadmin_editable.inc
===================================================================
--- branches/2.4.2/config/templates/nonadmin_editable.inc (rev 0)
+++ branches/2.4.2/config/templates/nonadmin_editable.inc 2012-09-11 00:02:00 UTC (rev 361)
@@ -0,0 +1,4 @@
+<p>
+ Welcome to UpStage. You have logged in with Guest Player status.<br />
+ Below are the stages that you are able to access as a Player - click on the stage name to enter the stages.
+</p>
Modified: branches/2.4.2/config/templates/stagelist.xhtml
===================================================================
--- branches/2.4.2/config/templates/stagelist.xhtml 2012-09-10 05:18:42 UTC (rev 360)
+++ branches/2.4.2/config/templates/stagelist.xhtml 2012-09-11 00:02:00 UTC (rev 361)
@@ -1,9 +1,6 @@
<!include master_a.inc>
<script type="text/javascript">document.title='Upstage - Stage List';</script>
- <h1>UpStage Stage List</h1>
- <p>
- The following stages are viewable on this UpStage server:
- </p>
+<!include stages_editable.inc>
%(list)s
<script type="text/javascript">countPlayerAndAudience();</script>
<!include master_b.inc>
Added: branches/2.4.2/config/templates/stages_editable.default
===================================================================
--- branches/2.4.2/config/templates/stages_editable.default (rev 0)
+++ branches/2.4.2/config/templates/stages_editable.default 2012-09-11 00:02:00 UTC (rev 361)
@@ -0,0 +1,4 @@
+<h1>UpStage Stage List</h1>
+<p>
+ The following stages are viewable on this UpStage server:
+</p>
\ No newline at end of file
Added: branches/2.4.2/config/templates/stages_editable.inc
===================================================================
--- branches/2.4.2/config/templates/stages_editable.inc (rev 0)
+++ branches/2.4.2/config/templates/stages_editable.inc 2012-09-11 00:02:00 UTC (rev 361)
@@ -0,0 +1,4 @@
+<h1>
+ UpStage Stage List</h1>
+<p>
+ The following stages are viewable on this UpStage server:</p>
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-09-10 05:18:42 UTC (rev 360)
+++ branches/2.4.2/upstage/pages.py 2012-09-11 00:02:00 UTC (rev 361)
@@ -70,6 +70,8 @@
Modified by: Daniel 29/08/2012 - Fixed Non Su accessing Create Stage error
- current_stage = self.collection.stages.getStage(k) line added
+
+Modified by: Daniel 11/09/2012 - Added Non-Admin Page, Stages Edit mode. (editing page for guest-player)
"""
#standard lib
@@ -428,6 +430,93 @@
self.postback = "Successfully Saved"
return AdminBase.render_POST(self, request)
+
+"""
+Added by: Daniel Han (11/09/2012)
+"""
+class StagesEditPage(AdminBase):
+
+ filename="edit.xhtml"
+ postback = ''
+ def __init__(self, player, collection={}):
+ AdminBase.__init__(self, player, collection)
+ self.player = player
+ self.collection = collection
+
+ def text_editable(self, request):
+ s = get_template('stages_editable.inc')
+ form = request.args
+
+ if 'action' in form:
+ content = form.get('action',[''])[0]
+
+ if content == 'Default':
+ s = get_template('stages_editable.default')
+
+ return s
+
+ def render_GET(self, request):
+ return AdminBase.render_GET(self, request)
+
+ def render_POST(self, request):
+ """Save changes and create new state"""
+ form = request.args
+ if 'action' in form:
+ content = form["action"][0]
+ if content == 'Submit':
+ if 'editor' in form:
+ content = form["editor"][0]
+ f = open(os.path.join(config.TEMPLATE_DIR, 'stages_editable.inc'), 'w')
+ f.write(content)
+ f.close()
+ self.postback = "Successfully Saved"
+
+ return AdminBase.render_POST(self, request)
+
+
+
+"""
+Added by: Daniel Han (11/09/2012)
+"""
+class NonAdminEditPage(AdminBase):
+
+ filename="edit.xhtml"
+ postback = ''
+ def __init__(self, player, collection={}):
+ AdminBase.__init__(self, player, collection)
+ self.player = player
+ self.collection = collection
+
+ def text_editable(self, request):
+ s = get_template('nonadmin_editable.inc')
+ form = request.args
+
+ if 'action' in form:
+ content = form.get('action',[''])[0]
+
+ if content == 'Default':
+ s = get_template('nonadmin_editable.default')
+
+ return s
+
+ def render_GET(self, request):
+ return AdminBase.render_GET(self, request)
+
+ def render_POST(self, request):
+ """Save changes and create new state"""
+ form = request.args
+ if 'action' in form:
+ content = form["action"][0]
+ if content == 'Submit':
+ if 'editor' in form:
+ content = form["editor"][0]
+ f = open(os.path.join(config.TEMPLATE_DIR, 'nonadmin_editable.inc'), 'w')
+ f.write(content)
+ f.close()
+ self.postback = "Successfully Saved"
+
+ return AdminBase.render_POST(self, request)
+
class AdminWarning(AdminError):
"""A wrapper for errors (warnings)"""
templateFile = 'warning.xhtml'
Modified: branches/2.4.2/upstage/web.py
===================================================================
--- branches/2.4.2/upstage/web.py 2012-09-10 05:18:42 UTC (rev 360)
+++ branches/2.4.2/upstage/web.py 2012-09-11 00:02:00 UTC (rev 361)
@@ -30,6 +30,7 @@
Modified by: Daniel Han 29/06/2012 - ADDed SU rights for Admin/Edit access. (inside AdminRealm)
Modified by: Daniel Han 29/08/2012 - Added /Admin/Home and /Admin/Stages. so when user logged in, home and stages are linked to /Admin/Stages
- Also, when user is not logged in, it will show it just as if user is in normal home or stages page.
+Modified by: Daniel Han 11/09/2012 - Added Edit/NonAdmin and Edit/Stages
"""
@@ -48,7 +49,8 @@
from upstage.pages import AdminLoginPage, AdminBase, errorpage, Workshop, HomePage, SignUpPage, Workshop, StageEditPage,\
MediaUploadPage, MediaEditPage, CreateDir, \
NewPlayer, EditPlayer, NewAvatar, NewProp, NewBackdrop, NewAudio, \
- ThingsList, StagePage, UserPage, NonAdminPage, PageEditPage, HomeEditPage, WorkshopEditPage, SessionCheckPage, successpage #VideoThing, AudioThing,
+ ThingsList, StagePage, UserPage, NonAdminPage, PageEditPage, HomeEditPage, WorkshopEditPage, SessionCheckPage, successpage,\
+ NonAdminEditPage, StagesEditPage #VideoThing, AudioThing,
#twisted
from twisted.python import log
@@ -159,7 +161,9 @@
if player.can_su():
edit_pages = {'home' : (HomeEditPage, self.data),
- 'workshop' : (WorkshopEditPage, self.data)}
+ 'workshop' : (WorkshopEditPage, self.data),
+ 'nonadmin' : (NonAdminEditPage, self.data),
+ 'stages' : (StagesEditPage, self.data)}
tree.putChild('edit', PageEditPage(player, edit_pages))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-13 01:50:45
|
Revision: 381
http://upstage.svn.sourceforge.net/upstage/?rev=381&view=rev
Author: aut-upstage
Date: 2012-09-13 01:50:39 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Gavin - Fixed the Stage name and edit and the media edit where "#" and "&" were invaild inputs
Edited and created functions in mediaedit and stageedit javascript and added id as references in pages.py, mediaedit and stageedit html to validate and remove the "#" and "&" tags
Modified Paths:
--------------
branches/2.4.2/config/templates/mediaedit.xhtml
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/mediaedit.js
branches/2.4.2/html/stageedit.js
branches/2.4.2/upstage/pages.py
Modified: branches/2.4.2/config/templates/mediaedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-13 01:47:20 UTC (rev 380)
+++ branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-13 01:50:39 UTC (rev 381)
@@ -116,7 +116,7 @@
<br />
<table>
<tr>
- <td><input type="button" onclick="warn(4);" value="Save Changes" style="width:100px;"></input></td>
+ <td><input type="button" onclick="saveMedia();" value="Save Changes" style="width:100px;"></input></td>
<td><input type="button" onclick="warn(5);" value="Delete Media" style="width:100px;"></input></td>
</tr>
<tr>
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-09-13 01:47:20 UTC (rev 380)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-09-13 01:50:39 UTC (rev 381)
@@ -36,7 +36,7 @@
<table>
<tr>
<td>Full Name:</td>
- <td><input type="text" name="longName" value="%(name)s" size="20" /></td>
+ <td><input type="text" name="longName" id = "longName" value="%(name)s" size="20" /></td>
</tr>
<tr>
<td>Short name for URL:</td>
@@ -137,7 +137,7 @@
<input type="hidden" name="action" value=""></input>
<table>
<tr>
- <td style="width:10%"><input type="button" onclick="warn(0);" value="Save"></input></td>
+ <td style="width:10%"><input type="button" onclick="saveStage();" value="Save"></input></td>
<td style="width:40%">Save your stage.</td>
<td style="width:10%"><input type="button" onclick="warn(1);" value="Revert Changes"></input></td>
<td style="width:40%">Get rid of any changes you've made.</td>
Modified: branches/2.4.2/html/mediaedit.js
===================================================================
--- branches/2.4.2/html/mediaedit.js 2012-09-13 01:47:20 UTC (rev 380)
+++ branches/2.4.2/html/mediaedit.js 2012-09-13 01:50:39 UTC (rev 381)
@@ -27,6 +27,7 @@
* 1.3 Vibhu, Corey and Karena (31/08/2011) - Added function to allow to change audio type.
* 1.4 Vibhu (31/08/2011) - Modified getMedia function to send type of audio media is, whether music or sfx.
1.5 Heath / Vibhu (01/09/2011) - added functions searchTags to search through media by tag.
+ 1.6 Gavin (12/09/2012) - changed the save media into a function that allows invaild characters that are found to be removed in the tag name
*/
//General instance style variables
var mediaSelected = false;
@@ -787,3 +788,23 @@
}
}
}
+ /**
+ * Added by Gavin 12/09/2012
+ * Save the changes made to the media and also remove invaild characters "&","#" in the tag name
+ @return - none
+ */
+ function saveMedia()
+ {
+ var tagName = "";
+ var tagReplace = "";
+ tagName = document.getElementById('tagName').value;
+ if(tagName.match('&') || tagName.match('#') )
+ {
+ tagReplace = tagName.replace(/&/g,"");
+ tagReplace = tagReplace.replace(/#/g,"");
+ document.getElementById('tagName').value = tagReplace;
+ }
+
+ warn(4);
+ }
+
Modified: branches/2.4.2/html/stageedit.js
===================================================================
--- branches/2.4.2/html/stageedit.js 2012-09-13 01:47:20 UTC (rev 380)
+++ branches/2.4.2/html/stageedit.js 2012-09-13 01:50:39 UTC (rev 381)
@@ -14,6 +14,11 @@
* Modified by Daniel Han 27/06/2012 - Changes to ColorPicker to have an ID so it can be styled. (Easy to change size)
- Changes to removal of proptd id and change it to colProp which I have reduced the number of rows and columns.
- Added Resize Event handler
+
+ * Modified by Gavin Chan 12/09/2012 - Modified StageChooseSubmit() method to trim the name values and
+ add a validator for the "#" key that removes "#" when the user enters it in the stage name
+
+ - Created a function saveStage() that is called when the user edits the stage page and confirms, it trims the stage name value and add a alert for the "#" key
*/
//Instance based variables
@@ -210,11 +215,44 @@
*/
function stageChooseSubmit()
{
+ try
+ {
+ document.getElementById('name').value = trim(document.getElementById('name').value);
+ document.getElementById('urlname').value = trim(document.getElementById('urlname').value);
+ if(document.getElementById('name').value.match('#'))
+ {
+ document.getElementById('name').value = document.getElementById('name').value.replace(/#/g,"");
+ }
+ }
+ catch(ex)
+ {}
document.getElementById("status").innerHTML = 'Sending to server, please wait...';
document.getElementById("status").style.display = "inline";
requestPage("POST", buildRequest(1), fillPage);//'/admin/workshop/stage?shortName='+document.shaun.shortName.value, fillPage);
}
+
/**
+ * Saves the stage edited by the user
+ * @return - none
+ */
+ function saveStage()
+ {
+ try
+ {
+ document.getElementById('longName').value = trim(document.getElementById('longName').value);
+ if(document.getElementById('longName').value.match('#'))
+ {
+ document.getElementById('longName').value = document.getElementById('longName').value.replace(/#/g,"");
+ }
+ warn(0);
+
+ }
+ catch(ex)
+ {}
+
+ }
+
+/**
* Save the state of form elements so that changed are not lost while editing
* (Will change to only request certain bits of info from server as opposed to whole page).
* @return none
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-09-13 01:47:20 UTC (rev 380)
+++ branches/2.4.2/upstage/pages.py 2012-09-13 01:50:39 UTC (rev 381)
@@ -801,7 +801,7 @@
return errorpage(request, e)
elif 'new_stage' in self.stagename:
#Modified by: Daniel, Gavin - Made the message to contain a <form> as well so it shows on the popup box.
- self.message = '<form action="/admin/workshop/stage"> Full name:<input type="text" name="name" />Short name for url:<input type="text" name="ID" size="12" />(no spaces).<button onclick="javascript:stageChooseSubmit(); return false;">Create Stage</button></form>'
+ self.message = '<form action="/admin/workshop/stage"> Full name:<input type="text" name="name" id="name" />Short name for url:<input type="text" name="ID" id="urlname" size="12" />(no spaces).<button onclick="javascript:stageChooseSubmit(); return false;">Create Stage</button></form>'
elif action=='save':
if self.stage:
self.stage.update_from_form(form, self.player);
@@ -1161,7 +1161,7 @@
html_editable_info += ''.join('<tr><td>%s</td></tr>' % self.no_media)
#Added by Vibhu, Nessa, Craig 24/08/2011 - Displays tags within mediaedit.xhtml
- mediaTags_html = '<tr><td><b>Add Tags:</b></td><td colspan="%s"><input type="text" name="tags" class="mediafield" /></td></tr>' % colspan
+ mediaTags_html = '<tr><td><b>Add Tags:</b></td><td colspan="%s"><input type="text" name="tags" class="mediafield" id="tagName" /></td></tr>' % colspan
html_editable_info += mediaTags_html
return html_editable_info
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-13 03:07:53
|
Revision: 382
http://upstage.svn.sourceforge.net/upstage/?rev=382&view=rev
Author: aut-upstage
Date: 2012-09-13 03:07:46 +0000 (Thu, 13 Sep 2012)
Log Message:
-----------
Gavin
- Included validators to remove "#" and "&" in the media name value and change the tag validators mediaedit.js
- Added validators to remove "#" and "&" in the media name and tag values when the user uploads media in mediaupload.js
- Added a name id reference in the media name value in pages.py
Modified Paths:
--------------
branches/2.4.2/html/mediaedit.js
branches/2.4.2/html/mediaupload.js
branches/2.4.2/upstage/pages.py
Modified: branches/2.4.2/html/mediaedit.js
===================================================================
--- branches/2.4.2/html/mediaedit.js 2012-09-13 01:50:39 UTC (rev 381)
+++ branches/2.4.2/html/mediaedit.js 2012-09-13 03:07:46 UTC (rev 382)
@@ -27,7 +27,7 @@
* 1.3 Vibhu, Corey and Karena (31/08/2011) - Added function to allow to change audio type.
* 1.4 Vibhu (31/08/2011) - Modified getMedia function to send type of audio media is, whether music or sfx.
1.5 Heath / Vibhu (01/09/2011) - added functions searchTags to search through media by tag.
- 1.6 Gavin (12/09/2012) - changed the save media into a function that allows invaild characters that are found to be removed in the tag name
+ 1.6 Gavin (13/09/2012) - changed the save media into a function that allows invaild characters that are found to be removed in the media and tag name.
*/
//General instance style variables
var mediaSelected = false;
@@ -790,21 +790,30 @@
}
/**
* Added by Gavin 12/09/2012
- * Save the changes made to the media and also remove invaild characters "&","#" in the tag name
+ * Save the changes made to the media and also remove invaild characters "&","#" in the media and tag * name
@return - none
*/
function saveMedia()
{
+ var mediaName ="";
var tagName = "";
- var tagReplace = "";
+
+ mediaName = document.getElementById('name').value;
tagName = document.getElementById('tagName').value;
+
+ if(mediaName.match('&') || mediaName.match('#') )
+ {
+ mediaName = mediaName.replace(/&/g,"");
+ mediaName = mediaName.replace(/#/g,"");
+ document.getElementById('name').value = mediaName;
+ }
+
if(tagName.match('&') || tagName.match('#') )
{
- tagReplace = tagName.replace(/&/g,"");
- tagReplace = tagReplace.replace(/#/g,"");
- document.getElementById('tagName').value = tagReplace;
+ tagName = tagName.replace(/&/g,"");
+ tagName = tagName.replace(/#/g,"");
+ document.getElementById('tagName').value = tagName;
}
-
warn(4);
}
Modified: branches/2.4.2/html/mediaupload.js
===================================================================
--- branches/2.4.2/html/mediaupload.js 2012-09-13 01:50:39 UTC (rev 381)
+++ branches/2.4.2/html/mediaupload.js 2012-09-13 03:07:46 UTC (rev 382)
@@ -9,6 +9,8 @@
boxes.
Daniel Han (10/09/2012) - If PostAction should continue, Button click will be disabled to prevent users from double clicking.
+
+ Gavin Chan (13/09/2012) - Added validators in checkAllFields() to remove "#" and "&" when it is inputted in the media name and tag.
*/
// global variables
@@ -366,6 +368,7 @@
/*
* Author: Natasha Pullan
+ * @Edited: Gavin Chan - added validators to remove "&" and "#" in names and tags
* Checks all the fields, making sure none are left blank
*/
function checkAllFields()
@@ -373,6 +376,7 @@
var filled = false;
var type = getRadioValue();
var name = document.getElementById('name').value;
+ var tag = document.getElementById('tags').value;
var file;
if(type == null)
{
@@ -388,10 +392,23 @@
setAction(false);
setContinue(false);
}
+ else if(name.match('#') || name.match('&'))
+ {
+ name = name.replace(/&/g,"");
+ name = name.replace(/#/g,"");
+ document.getElementById('name').value = name;
+ }
else
{
filled = true;
}
+
+ if(tag.match('#') || tag.match('&'))
+ {
+ tag = tag.replace(/&/g,"");
+ tag = tag.replace(/#/g,"");
+ document.getElementById('tags').value = tag;
+ }
if(filled)
{
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-09-13 01:50:39 UTC (rev 381)
+++ branches/2.4.2/upstage/pages.py 2012-09-13 03:07:46 UTC (rev 382)
@@ -1111,7 +1111,7 @@
self.selectedMedia = self.collection.avatars.get(self.medianame)
selectList_html = self.get_stage_info(self.mediatype, self.medianame)
html_editable_info = '<tr><td><b>Name:</b></td>'
- html_editable_info += '<td><input name="name" type="text" value="%s" class="mediafield"/></td></tr>' % self.selectedMedia.name
+ html_editable_info += '<td><input name="name" type="text" value="%s" class="mediafield" id = "name"/></td></tr>' % self.selectedMedia.name
html_editable_info += '<tr><td><b>Voice:</b></td><td><select name="voice" class="mediafield"><option value="">--select one--</option> %s </select></td></tr> \
<tr><td><input type="button" name="test" value="Test Voice"onclick="redirect_submit(\'/admin/test.mp3\'); return false" /></td>\
<td><input type="text" name="text" value="This is what i will say if you ask for a test" class="mediafield" /></td> \
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-15 11:58:30
|
Revision: 392
http://upstage.svn.sourceforge.net/upstage/?rev=392&view=rev
Author: aut-upstage
Date: 2012-09-15 11:58:23 +0000 (Sat, 15 Sep 2012)
Log Message:
-----------
- Daniel
2.4.2 Fix on Bullet points not showing up.
2.4.2 Russian Texts on editables.
Modified Paths:
--------------
branches/2.4.2/config/templates/edit.xhtml
branches/2.4.2/html/style/main.css
Modified: branches/2.4.2/config/templates/edit.xhtml
===================================================================
--- branches/2.4.2/config/templates/edit.xhtml 2012-09-15 11:29:27 UTC (rev 391)
+++ branches/2.4.2/config/templates/edit.xhtml 2012-09-15 11:58:23 UTC (rev 392)
@@ -23,7 +23,6 @@
}
CKEDITOR.replace( 'editor' ,
{
- extraPlugins : 'devtools',
on:{
instanceReady: function(e) {resizeEditor();}
}
Modified: branches/2.4.2/html/style/main.css
===================================================================
--- branches/2.4.2/html/style/main.css 2012-09-15 11:29:27 UTC (rev 391)
+++ branches/2.4.2/html/style/main.css 2012-09-15 11:58:23 UTC (rev 392)
@@ -26,6 +26,8 @@
1.8 27/06/12 Daniel Han From line 557
1.9 29/08/12 Daniel Han/Gavin Chan line 696 - scroller for edit player form & line 828 custom exit button
+
+ 15/09/12 Daniel Han - Added #workshopnav infront of all ul/li
*/
@@ -302,28 +304,28 @@
z-index:1;
}
/*Shaun Narayan (02/04/10) - Workshop nav*/
-ul
+#workshopnav ul
{
list-style-type:none;
padding:0px;
margin:0px;
}
-li
+#workshopnav li
{
display:inline;
}
-li a:link
+#workshopnav li a:link
{
text-decoration:none;
padding-right:8px;
}
-li a:active
+#workshopnav li a:active
{
color:#FFFFFF;
background-color:#000000;
text-align:center;
}
-li a:hover
+#workshopnav li a:hover
{
background-color:#7A991A;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-16 08:05:34
|
Revision: 395
http://upstage.svn.sourceforge.net/upstage/?rev=395&view=rev
Author: aut-upstage
Date: 2012-09-16 08:05:28 +0000 (Sun, 16 Sep 2012)
Log Message:
-----------
Daniel/Gavin
- Convert the audio player to test audio into jwplayer to allow every browser to test their voice audio in media edit and media upload without redirecting
- Fix audio test for IE 8 & 9
Modified Paths:
--------------
branches/2.4.2/config/templates/master_a.inc
branches/2.4.2/config/templates/mediaupload.xhtml
branches/2.4.2/html/mediaedit.js
branches/2.4.2/html/mediaupload.js
Added Paths:
-----------
branches/2.4.2/html/jwplayer.js
branches/2.4.2/html/player.swf
Modified: branches/2.4.2/config/templates/master_a.inc
===================================================================
--- branches/2.4.2/config/templates/master_a.inc 2012-09-16 02:04:04 UTC (rev 394)
+++ branches/2.4.2/config/templates/master_a.inc 2012-09-16 08:05:28 UTC (rev 395)
@@ -17,6 +17,7 @@
<script language="javascript" type="text/javascript" src="/user.js"></script>
<script language="javascript" type="text/javascript" src="/md5.js" ></script>
<script language="javascript" type="text/javascript" src="/image-slideshow.js"></script>
+<script language="javascript" type="text/javascript" src="/jwplayer.js"></script>
</head>
Modified: branches/2.4.2/config/templates/mediaupload.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaupload.xhtml 2012-09-16 02:04:04 UTC (rev 394)
+++ branches/2.4.2/config/templates/mediaupload.xhtml 2012-09-16 08:05:28 UTC (rev 395)
@@ -41,8 +41,8 @@
<hr />
<div id="muLeftContent" style="display: none;">
<div id=leftHeading></div>
-<div id=voicediv></div>
+
<div id="avatarBits" style="display: none;">
<!-- <div id="avatarBits" style="display: none:">-->
<!--<form name="voiceform" method="post"> <!-- target="popup" onsubmit="testVoice(popup);" >
@@ -65,11 +65,16 @@
</select>
</p>
<p>
- <input type="text" name="text" id="text" maxlength="40" value="This is a text to voice test"/>
- <button onclick="voiceTest(); return shallContinue();">Test voice</button>
+ <input type="text" name="text" id="text" maxlength="40" value="This is a text to voice test"/>
+ <input type="button" onclick="voiceTest(); return false;" value="Test Voice" />
+
+ <tr>
+ <td colspan="2">
+ <div id="voicediv"></div>
+ </td>
+ </tr>
</p>
-
-
+
<p>
<label id="numframe">Number of frames: </label>
<select name="avframecount" size="1" id="avframecount" onchange="displayFields('avframecount', 'av');">
Added: branches/2.4.2/html/jwplayer.js
===================================================================
--- branches/2.4.2/html/jwplayer.js (rev 0)
+++ branches/2.4.2/html/jwplayer.js 2012-09-16 08:05:28 UTC (rev 395)
@@ -0,0 +1 @@
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-17 03:06:26
|
Revision: 397
http://upstage.svn.sourceforge.net/upstage/?rev=397&view=rev
Author: aut-upstage
Date: 2012-09-17 03:06:20 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Daniel/Ben/Scott/Gavin
- Converted the audio player from editing audio/sound effect into jwplayer
Modified Paths:
--------------
branches/2.4.2/config/templates/mediaedit.xhtml
branches/2.4.2/html/mediaedit.js
branches/2.4.2/upstage/pages.py
Modified: branches/2.4.2/config/templates/mediaedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-16 08:34:55 UTC (rev 396)
+++ branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-17 03:06:20 UTC (rev 397)
@@ -86,14 +86,14 @@
<h1>Media info</h1>
<table>
<tr>
- <td>
- <div id="mediaimagediv" style="width:45%; margin-top: 20px; border: 2px; z-index:0">
+ <td style="display: %(attr:mediaDisplay)s">
+ <div id="mediaimagediv" style="z-index:0;">
<!include swf.inc>
</div>
</td>
<td width="20px"></td>
<td>
- <div id="mediainformationdiv" style="width:45%;dispaly:block;">
+ <div id="mediainformationdiv" style="width:45%;display:block;">
<table height="100px" style="width:100%" id="editable_info">
%(editable_info)s
</table>
Modified: branches/2.4.2/html/mediaedit.js
===================================================================
--- branches/2.4.2/html/mediaedit.js 2012-09-16 08:34:55 UTC (rev 396)
+++ branches/2.4.2/html/mediaedit.js 2012-09-17 03:06:20 UTC (rev 397)
@@ -632,13 +632,17 @@
function redirect_submit(action)
{
actionlocation = action + '?voice='+ document.rupert.voice.value + '&text=' + document.rupert.text.value;
- // document.getElementById("speech").innerHTML="<embed src='"+actionlocation+"' type='audio/mpeg' autostart=true loop=false height='70'>";
- jwplayer("speech").setup({
+ playmp3(actionlocation, "speech");
+}
+
+function playmp3(action, player)
+{
+ jwplayer(player).setup({
flashplayer: "/player.swf",
- file: actionlocation,
+ file: action,
height: 70,
});
- jwplayer("speech").play();
+ jwplayer(player).play();
}
/**
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-09-16 08:34:55 UTC (rev 396)
+++ branches/2.4.2/upstage/pages.py 2012-09-17 03:06:20 UTC (rev 397)
@@ -881,6 +881,7 @@
stage = ''
media = ''
postback = ''
+ mediaDisplay = 'block'
def __init__(self, player, collection):
AdminBase.__init__(self, player, collection)
@@ -1139,8 +1140,8 @@
#Modified by: Heath Behrens - switched the values in %( , ) because the first one should be type.
html_editable_info = '<tr><td><b>Name:</b></td> <td colspan="2"><input name="name" type="text" value="%s" class="mediafield" /></td></tr>' % self.selectedMedia.name
# Heath / Vibhu (01/09/2011) - Added code to embedd a media player within the media edit page
- html_editable_info += '<tr><td><b>Audio Type:</b></td><td><input id="audio_type" name="audio_type" type="hidden" readonly="readonly" value="%s" /></td><td><select id="audioTypeSelect" onclick="javascript:changeAudioType();" onchange="javascript:changeAudioType();" onkeypress="javascript:changeAudioType();" class="mediafield"><option value="music">Music</option><option value="sfx">Sound Effects</option><select></td></tr>\
- <tr><td colspan="3"><embed type="audio/mpeg" src="/media/audio/%s" width="300" height="70" autostart="false" loop="false"></embed></td></tr>' %(self.selectedMedia.medium, self.medianame)
+ html_editable_info += '<tr><td><b>Audio Type:</b></td><td><input id="audio_type" name="audio_type" type="hidden" readonly="readonly" value="%s" /></td><td><select id="audioTypeSelect" onclick="javascript:changeAudioType();" onchange="javascript:changeAudioType();" onkeypress="javascript:changeAudioType();" class="mediafield"><option value="music">Music</option><option value="sfx">Sound Effects</option><select></td></tr><tr><td><input type="button" value="Test Audio" onclick="playmp3(\'/media/audio/%s\', \'audioplayer\');"/></td></tr>\
+ <tr><td colspan="3"><div id="audioplayer"></div> </td></tr>' %(self.selectedMedia.medium, self.medianame)
html_editable_info += '<tr> \
<td colspan="3"> \
<table> %s </table> \
@@ -1188,8 +1189,10 @@
self.audio_type = request.args.get('audio_type',[''])[0]
if self.audio_type == 'music':
self.url = '/media/thumb/music.jpg'
+ self.mediaDisplay = 'none'
elif self.audio_type == 'sfx':
self.url = '/media/thumb/sfx.jpg'
+ self.mediaDisplay = 'none'
self.audio_type = ''
log.msg("URL = %s" % self.url)
except:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-17 03:49:24
|
Revision: 398
http://upstage.svn.sourceforge.net/upstage/?rev=398&view=rev
Author: aut-upstage
Date: 2012-09-17 03:49:16 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
- Daniel 2.4.2
Background colour now on fullpage
Modified Paths:
--------------
branches/2.4.2/client/UpstageClient.as2proj
branches/2.4.2/client/src/application.xml
branches/2.4.2/client/src/model/ModelAvatars.as
branches/2.4.2/client/src/model/ModelChat.as
branches/2.4.2/client/src/thing/Audio.as
branches/2.4.2/client/src/thing/Avatar.as
branches/2.4.2/client/src/thing/BackDrop.as
branches/2.4.2/client/src/thing/Prop.as
branches/2.4.2/client/src/thing/Thing.as
branches/2.4.2/client/src/util/ButtonMc.as
branches/2.4.2/client/src/util/ColourPalette.as
branches/2.4.2/client/src/util/ColourPicker.as
branches/2.4.2/client/src/util/Icon.as
branches/2.4.2/client/src/util/LayerPicker.as
branches/2.4.2/client/src/util/LayerPickerSet.as
branches/2.4.2/client/src/util/PictureButton.as
branches/2.4.2/client/src/util/ScrollButton.as
branches/2.4.2/client/src/util/SizeSlider.as
branches/2.4.2/client/src/util/Slider.as
branches/2.4.2/client/src/util/UiButton.as
branches/2.4.2/client/src/view/ActorButtons.as
branches/2.4.2/client/src/view/AuScrollBar.as
branches/2.4.2/client/src/view/AuScrollBarItem.as
branches/2.4.2/client/src/view/AudioSlot.as
branches/2.4.2/client/src/view/AvScrollBar.as
branches/2.4.2/client/src/view/AvScrollBarItem.as
branches/2.4.2/client/src/view/DrawTools.as
branches/2.4.2/client/src/view/ItemGroup.as
branches/2.4.2/client/src/view/SplashScreen.as
branches/2.4.2/config/templates/stage.xhtml
branches/2.4.2/html/swf/classes.swf
branches/2.4.2/html/swf/client.swf
branches/2.4.2/upstage/pages.py
Modified: branches/2.4.2/client/UpstageClient.as2proj
===================================================================
--- branches/2.4.2/client/UpstageClient.as2proj 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/UpstageClient.as2proj 2012-09-17 03:49:16 UTC (rev 398)
@@ -5,13 +5,13 @@
<movie outputType="Application" />
<movie input="" />
<movie path="bin\classes.swf" />
- <movie fps="30" />
- <movie width="800" />
- <movie height="500" />
+ <movie fps="5" />
+ <movie width="320" />
+ <movie height="200" />
<movie version="9" />
<movie minorVersion="0" />
<movie platform="Flash Player" />
- <movie background="#FFFFFF" />
+ <movie background="#000000" />
<movie preferredSDK="Mtasc 1.14;1.14;" />
</output>
<!-- Other classes to be compiled into your SWF -->
@@ -23,11 +23,11 @@
<option verbose="False" />
<option strict="False" />
<option infer="False" />
- <option useMain="True" />
+ <option useMain="False" />
<option useMX="False" />
<option warnUnusedImports="False" />
- <option traceMode="FlashConnectExtended" />
- <option traceFunction="" />
+ <option traceMode="CustomFunction" />
+ <option traceFunction="App.debug" />
<option libraryPrefix="" />
<option excludeFile="" />
<option groupClasses="False" />
@@ -37,6 +37,7 @@
<!-- Class files to compile (other referenced classes will automatically be included) -->
<compileTargets>
<compile path="src\App.as" />
+ <compile path="src\Client.as" />
</compileTargets>
<!-- Assets to embed into the output SWF -->
<library>
@@ -49,7 +50,8 @@
<!-- Executed before build -->
<preBuildCommand />
<!-- Executed after build -->
- <postBuildCommand alwaysRun="False" />
+ <postBuildCommand alwaysRun="True">"$(ToolsDir)\swfmill\swfmill.exe" simple "$(ProjectDir)\src\application.xml" "$(OutputDir)\client.swf"
+"$(ProjectDir)\copyoutput.bat"</postBuildCommand>
<!-- Other project options -->
<options>
<option showHiddenPaths="True" />
Modified: branches/2.4.2/client/src/application.xml
===================================================================
--- branches/2.4.2/client/src/application.xml 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/application.xml 2012-09-17 03:49:16 UTC (rev 398)
@@ -29,14 +29,13 @@
////////////////////////////////////////////////////////////////////////////////
-->
-<movie width="320" height="200" framerate="5">
- <background color="#ffffff"/>
+<movie width="320" height="200" framerate="25">
<!--
The Application classes have been compiled into the classes.swf file,
which we import as an asset.
-->
- <clip import="classes.swf" />
+ <clip import="bin/classes.swf" />
<frame>
@@ -51,7 +50,7 @@
Place an instance of the Application form on Stage to instantiate
it and provide the Natural Entry Point.
-->
- <place id="App" name="app" x="0" y="0" depth="10" />
+ <place id="App" name="app" x="0" y="0" depth="0" />
<!-- BH, WW 22-Aug-2006 Embed fonts
@@ -63,14 +62,14 @@
Note that Vera.ttf contains only non bold font
(bold shows nothing)
-->
- <font id="Bitstream Vera Bold" import="../../client/src/util/VeraBd.ttf"
+ <font id="Bitstream Vera Bold" import="src/util/VeraBd.ttf"
glyphs="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>
	 "& !"#$%&'(
)*+,-./:;<=>?@
[\]^_`{|}~0123456789áÁàÀâÂ
åÅãÃäÄæÆçÇéÉèÈêÊëËíÍììÌîÎïÏñÑóÓòÒôÔøØõÕöÖßúÚùÙûÛüÜÿ´" />
- <font id="Bitstream Vera Sans" import="../../client/src/util/Vera.ttf"
+ <font id="Bitstream Vera Sans" import="src/util/Vera.ttf"
glyphs="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ<>
	 "& !"#$%&'(
)*+,-./:;<=>?@
Modified: branches/2.4.2/client/src/model/ModelAvatars.as
===================================================================
--- branches/2.4.2/client/src/model/ModelAvatars.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/model/ModelAvatars.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -17,16 +17,16 @@
*/
import Client;
-//import upstage.client.util.Construct;
+//import .util.Construct;
import Sender;
import thing.Avatar;
import thing.Prop;
import view.ActorButtons;
import view.AvScrollBar;
-//import upstage.client.util.Construct; - Alan (23.01.08) - Import not used warning.
+//import .util.Construct; - Alan (23.01.08) - Import not used warning.
import view.ItemGroup;
import view.DrawTools;
-//import upstage.client.view.AudioTools; // PQ: Added 22.9.07
+//import .view.AudioTools; // PQ: Added 22.9.07
import view.AuScrollBar;
import model.ModelSounds;
import model.TransportInterface;
Modified: branches/2.4.2/client/src/model/ModelChat.as
===================================================================
--- branches/2.4.2/client/src/model/ModelChat.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/model/ModelChat.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -16,9 +16,9 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-//import upstage.client.Client;
+//import .Client;
import Sender;
-//import upstage.client.util.Construct;
+//import .util.Construct;
import view.ChatField;
import model.TransportInterface;
import Transport;
Modified: branches/2.4.2/client/src/thing/Audio.as
===================================================================
--- branches/2.4.2/client/src/thing/Audio.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/thing/Audio.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -16,8 +16,8 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-//import upstage.client.thing.Thing; - Alan (23.01.08) Import not used warning.
-//import upstage.client.util.Icon; - Alan (23.01.08) Import not used warning.
+//import .thing.Thing; - Alan (23.01.08) Import not used warning.
+//import .util.Icon; - Alan (23.01.08) Import not used warning.
import Client;
import view.AuScrollBarItem;
import view.AuScrollBar;
@@ -41,7 +41,7 @@
var icon : AuScrollBarItem;
var iconLayer : Number;
- private static var symbolName:String = "__Packages.upstage.client.thing.Audio";
+ private static var symbolName:String = "__Packages.thing.Audio";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, Audio);
public static var transportSetFunctionName:String = 'SET_AUDIO';
Modified: branches/2.4.2/client/src/thing/Avatar.as
===================================================================
--- branches/2.4.2/client/src/thing/Avatar.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/thing/Avatar.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -69,7 +69,7 @@
private var frameNumber :Number;
- private static var symbolName:String = "__Packages.upstage.client.thing.Avatar";
+ private static var symbolName:String = "__Packages.thing.Avatar";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, Avatar);
Modified: branches/2.4.2/client/src/thing/BackDrop.as
===================================================================
--- branches/2.4.2/client/src/thing/BackDrop.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/thing/BackDrop.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -36,7 +36,7 @@
private var frameNumber :Number;
- private static var symbolName:String = "__Packages.upstage.client.thing.BackDrop";
+ private static var symbolName:String = "__Packages.thing.BackDrop";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, BackDrop);
public static var transportSetFunctionName:String = 'SET_BACKDROP';
Modified: branches/2.4.2/client/src/thing/Prop.as
===================================================================
--- branches/2.4.2/client/src/thing/Prop.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/thing/Prop.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -32,7 +32,7 @@
class thing.Prop extends Thing
{
- private static var symbolName:String = "__Packages.upstage.client.thing.Prop";
+ private static var symbolName:String = "__Packages.thing.Prop";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, Prop);
public static var transportSetFunctionName:String = 'SET_PROP';
Modified: branches/2.4.2/client/src/thing/Thing.as
===================================================================
--- branches/2.4.2/client/src/thing/Thing.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/thing/Thing.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -54,7 +54,7 @@
private var layerOffset :Number;
private var baseName :String;
- private static var symbolName:String = "__Packages.upstage.client.thing.Thing";
+ private static var symbolName:String = "__Packages.thing.Thing";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, Thing);
static var LAYER: Number = Client.L_PROPS_IMG;
Modified: branches/2.4.2/client/src/util/ButtonMc.as
===================================================================
--- branches/2.4.2/client/src/util/ButtonMc.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/ButtonMc.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-//import upstage.client.util.Construct;
+//import .util.Construct;
import Client;
class util.ButtonMc extends MovieClip
@@ -37,7 +37,7 @@
static var _nextButtonLayer: Number = Client.L_UI_BUTTONS;
private var scale :Number;
- public static var symbolName :String = '__Packages.upstage.client.util.ButtonMc';
+ public static var symbolName :String = '__Packages.util.ButtonMc';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, ButtonMc);
Modified: branches/2.4.2/client/src/util/ColourPalette.as
===================================================================
--- branches/2.4.2/client/src/util/ColourPalette.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/ColourPalette.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -41,7 +41,7 @@
private var width :Number;
private var height :Number;
- public static var symbolName :String = '__Packages.upstage.client.util.ColourPalette';
+ public static var symbolName :String = '__Packages.util.ColourPalette';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, ColourPalette);
static public function factory(parent :MovieClip, layer:Number,
Modified: branches/2.4.2/client/src/util/ColourPicker.as
===================================================================
--- branches/2.4.2/client/src/util/ColourPicker.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/ColourPicker.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -44,7 +44,7 @@
private var borderColour :Number = Client.SLIDER_BORDER;
- public static var symbolName :String = '__Packages.upstage.client.util.ColourPicker';
+ public static var symbolName :String = '__Packages.util.ColourPicker';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, ColourPicker);
static public function factory(parent :MovieClip, layer:Number,
Modified: branches/2.4.2/client/src/util/Icon.as
===================================================================
--- branches/2.4.2/client/src/util/Icon.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/Icon.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -33,7 +33,7 @@
var baseLayer :Number;
- public static var symbolName :String = '__Packages.upstage.client.util.Icon';
+ public static var symbolName :String = '__Packages.util.Icon';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, Icon);
/**
Modified: branches/2.4.2/client/src/util/LayerPicker.as
===================================================================
--- branches/2.4.2/client/src/util/LayerPicker.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/LayerPicker.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -38,7 +38,7 @@
private var ti :Object;
public var activeLayer :Number;
- public static var symbolName :String = '__Packages.upstage.client.util.LayerPicker';
+ public static var symbolName :String = '__Packages.util.LayerPicker';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, LayerPicker);
static public function factory(parent :MovieClip, layer:Number,
Modified: branches/2.4.2/client/src/util/LayerPickerSet.as
===================================================================
--- branches/2.4.2/client/src/util/LayerPickerSet.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/LayerPickerSet.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -43,7 +43,7 @@
private var taken :MovieClip;
- public static var symbolName :String = '__Packages.upstage.client.util.LayerPickerSet';
+ public static var symbolName :String = '__Packages.util.LayerPickerSet';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, LayerPickerSet);
static var eyePoints:Array = [{line:0x0000ff, fill:0x330077, points:Client.DRAWING_EYE_1},
Modified: branches/2.4.2/client/src/util/PictureButton.as
===================================================================
--- branches/2.4.2/client/src/util/PictureButton.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/PictureButton.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -28,7 +28,7 @@
{
public var value :Number;
- private static var symbolName:String = "__Packages.upstage.client.util.PictureButton";
+ private static var symbolName:String = "__Packages.util.PictureButton";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, PictureButton);
/* factory returns the button */
Modified: branches/2.4.2/client/src/util/ScrollButton.as
===================================================================
--- branches/2.4.2/client/src/util/ScrollButton.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/ScrollButton.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -30,7 +30,7 @@
{
private static var buttonPoints :Array = Client.SCROLL_BUTTON_POINTS;
- private static var symbolName:String = "__Packages.upstage.client.util.ScrollButton";
+ private static var symbolName:String = "__Packages.util.ScrollButton";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, ScrollButton);
//drawer is used by ButtonMc to draw the box.
public static var drawer:Function = Construct.polygon;
Modified: branches/2.4.2/client/src/util/SizeSlider.as
===================================================================
--- branches/2.4.2/client/src/util/SizeSlider.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/SizeSlider.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-//import upstage.client.util.Construct;
+//import .util.Construct;
import Client;
import util.Slider;
import util.Construct;
@@ -37,7 +37,7 @@
private var listener :Function;
- public static var symbolName :String = '__Packages.upstage.client.util.SizeSlider';
+ public static var symbolName :String = '__Packages.util.SizeSlider';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, SizeSlider);
Modified: branches/2.4.2/client/src/util/Slider.as
===================================================================
--- branches/2.4.2/client/src/util/Slider.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/Slider.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-//import upstage.client.util.Construct;
+//import .util.Construct;
import Client;
import util.ButtonMc;
import util.Construct;
@@ -55,7 +55,7 @@
public var _onMouseRelease: Function;
- public static var symbolName :String = '__Packages.upstage.client.util.Slider';
+ public static var symbolName :String = '__Packages.util.Slider';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, Slider);
/**
Modified: branches/2.4.2/client/src/util/UiButton.as
===================================================================
--- branches/2.4.2/client/src/util/UiButton.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/util/UiButton.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -34,7 +34,7 @@
private var tf :TextField;
private var textLayer :Number;
- private static var symbolName:String = "__Packages.upstage.client.util.UiButton";
+ private static var symbolName:String = "__Packages.util.UiButton";
private static var symbolLinked:Boolean = Object.registerClass(symbolName, UiButton);
/* points for standard ui button */
Modified: branches/2.4.2/client/src/view/ActorButtons.as
===================================================================
--- branches/2.4.2/client/src/view/ActorButtons.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/ActorButtons.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -43,7 +43,7 @@
private var audioBtn :UiButton; // PQ: 22.9.07
public static var symbolName :String =
- '__Packages.upstage.client.view.ActorButtons';
+ '__Packages.view.ActorButtons';
private static var symbolLinked :Boolean =
Object.registerClass(symbolName, ActorButtons);
Modified: branches/2.4.2/client/src/view/AuScrollBar.as
===================================================================
--- branches/2.4.2/client/src/view/AuScrollBar.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/AuScrollBar.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -63,7 +63,7 @@
private var audioSlot2 : MovieClip;
private var audioSlot3 : MovieClip;
- public static var symbolName :String = '__Packages.upstage.client.view.AuScrollBar';
+ public static var symbolName :String = '__Packages.view.AuScrollBar';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, AuScrollBar);
Modified: branches/2.4.2/client/src/view/AuScrollBarItem.as
===================================================================
--- branches/2.4.2/client/src/view/AuScrollBarItem.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/AuScrollBarItem.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -58,7 +58,7 @@
public var ID :Number; // Of avatar
public var available :Boolean; // Is the avatar currently available
- public static var symbolName :String = '__Packages.upstage.client.view.AuScrollBarItem';
+ public static var symbolName :String = '__Packages.view.AuScrollBarItem';
private static var symbolLinknameed :Boolean = Object.registerClass(symbolName, AuScrollBarItem);
static public function create(audio: Audio, scrollbar :MovieClip) :AuScrollBarItem
Modified: branches/2.4.2/client/src/view/AudioSlot.as
===================================================================
--- branches/2.4.2/client/src/view/AudioSlot.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/AudioSlot.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-//import upstage.client.model.TransportInterface; - Alan (23.01.08) - Import not used warning.
+//import .model.TransportInterface; - Alan (23.01.08) - Import not used warning.
import util.UiButton;
import util.Construct;
import Client;
@@ -55,7 +55,7 @@
var bPlay :Boolean; // AC: Added 15.05.08
public static var symbolName :String =
- '__Packages.upstage.client.view.AudioSlot';
+ '__Packages.view.AudioSlot';
private static var symbolLinked :Boolean =
Object.registerClass(symbolName, AudioSlot);
Modified: branches/2.4.2/client/src/view/AvScrollBar.as
===================================================================
--- branches/2.4.2/client/src/view/AvScrollBar.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/AvScrollBar.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -75,7 +75,7 @@
var tfBg:Number = Client.UI_BACKGROUND; //Vibhu 31/08/2011 - Background color
- public static var symbolName :String = '__Packages.upstage.client.view.AvScrollBar';
+ public static var symbolName :String = '__Packages.view.AvScrollBar';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, AvScrollBar);
Modified: branches/2.4.2/client/src/view/AvScrollBarItem.as
===================================================================
--- branches/2.4.2/client/src/view/AvScrollBarItem.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/AvScrollBarItem.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -53,7 +53,7 @@
var ID :Number; // Of avatar
var available :Boolean; // Is the avatar currently available
- public static var symbolName :String = '__Packages.upstage.client.view.AvScrollBarItem';
+ public static var symbolName :String = '__Packages.view.AvScrollBarItem';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, AvScrollBarItem);
static public function create(av: Avatar, scrollbar :MovieClip,
Modified: branches/2.4.2/client/src/view/DrawTools.as
===================================================================
--- branches/2.4.2/client/src/view/DrawTools.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/DrawTools.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -16,7 +16,7 @@
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-//import upstage.client.model.TransportInterface;
+//import .model.TransportInterface;
import util.UiButton;
import util.Slider;
import util.SizeSlider;
@@ -52,7 +52,7 @@
private var traceIndex :Number;
private var traceInterval :Number = 0;
- public static var symbolName :String = '__Packages.upstage.client.view.DrawTools';
+ public static var symbolName :String = '__Packages.view.DrawTools';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, DrawTools);
Modified: branches/2.4.2/client/src/view/ItemGroup.as
===================================================================
--- branches/2.4.2/client/src/view/ItemGroup.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/ItemGroup.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -75,7 +75,7 @@
private var textLayer:Number;
- public static var symbolName :String = '__Packages.upstage.client.view.ItemGroup';
+ public static var symbolName :String = '__Packages.view.ItemGroup';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, ItemGroup);
/**
Modified: branches/2.4.2/client/src/view/SplashScreen.as
===================================================================
--- branches/2.4.2/client/src/view/SplashScreen.as 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/client/src/view/SplashScreen.as 2012-09-17 03:49:16 UTC (rev 398)
@@ -61,7 +61,7 @@
'browser window, or log in as a different user.';
- public static var symbolName :String = '__Packages.upstage.client.view.SplashScreen';
+ public static var symbolName :String = '__Packages.view.SplashScreen';
private static var symbolLinked :Boolean = Object.registerClass(symbolName, SplashScreen);
Modified: branches/2.4.2/config/templates/stage.xhtml
===================================================================
--- branches/2.4.2/config/templates/stage.xhtml 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/config/templates/stage.xhtml 2012-09-17 03:49:16 UTC (rev 398)
@@ -7,25 +7,25 @@
<body class="full">
<div class="stagePopUp">
- Stage Message
+ %(stage_message)s
</div>
-<object width="100%%" height="100%%" scale="showAll"
- classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
- >
- <param name="allowScriptAccess" value="sameDomain" />
- <param name="movie" value="/swf/client.swf?%(vars)s" />
- <param name="quality" value="high" />
- <param name="bgcolor" value="#ffffff" />
- <param name="wmode" value="opaque" />
- <embed src="/swf/client.swf?%(vars)s"
- width="100%%" height="100%%" scale="showAll"
- type="application/x-shockwave-flash"
- allowScriptAccess="sameDomain"
- pluginspage="http://www.macromedia.com/go/getflashplayer"
- wmode="opaque"
- />
-</object>
-
+<div style="background-color:%(bgcolor)s">
+ <object width="100%%" height="100%%" scale="showAll"
+ classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
+ codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
+ >
+ <param name="allowScriptAccess" value="sameDomain" />
+ <param name="movie" value="/swf/client.swf?%(vars)s" />
+ <param name="quality" value="high" />
+ <param name="wmode" value="transparent" />
+ <embed src="/swf/client.swf?%(vars)s"
+ width="100%%" height="100%%" scale="showAll"
+ type="application/x-shockwave-flash"
+ allowScriptAccess="sameDomain"
+ pluginspage="http://www.macromedia.com/go/getflashplayer"
+ wmode="transparent"
+ />
+ </object>
+</div>
</body>
</html>
Modified: branches/2.4.2/html/swf/classes.swf
===================================================================
(Binary files differ)
Modified: branches/2.4.2/html/swf/client.swf
===================================================================
(Binary files differ)
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-09-17 03:06:20 UTC (rev 397)
+++ branches/2.4.2/upstage/pages.py 2012-09-17 03:49:16 UTC (rev 398)
@@ -1664,7 +1664,11 @@
#Shaun Narayan (02/16/10) - Removed reference to URLEncode to build the URL as it input ampersands without escaping.
vars = 'stageID=%s&policyport=%d&mode=%s&swfport=%d' %(stage.ID, config.POLICY_FILE_PORT, mode, config.SWF_PORT)
- self.html = html % {'stagename': stage.name, 'vars': vars}
+ self.html = html % {'stagename': stage.name,
+ 'vars': vars,
+ 'bgcolor': stage.pageBgColour.replace('0x','#'),
+ 'stage_message': stage.splash_message
+ }
self.player = player
self.stage = stage
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-17 04:20:18
|
Revision: 399
http://upstage.svn.sourceforge.net/upstage/?rev=399&view=rev
Author: aut-upstage
Date: 2012-09-17 04:20:12 +0000 (Mon, 17 Sep 2012)
Log Message:
-----------
Gavin
- Added radio button images to style folder.
- Changed the image of the stage edit background colour from ticks and crosses to the radio button images.
- Moved the debug message to the top of the background colour.
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/stageedit.js
Added Paths:
-----------
branches/2.4.2/html/style/radioNonSelect.jpg
branches/2.4.2/html/style/radioselect.jpg
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-09-17 03:49:16 UTC (rev 398)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-09-17 04:20:12 UTC (rev 399)
@@ -49,13 +49,19 @@
<input type="hidden" name="displayaccess" value="%(display_access)s"></input>
<div id="editStageColor">
+ <h1>Debug Message</h1>
+ <input type="checkbox" id="debug" name="debug" onclick="if (this.checked) {debugChecked()}else{debugUnChecked()}"/>
+ Print debug messages on the backdrop?
+ <br /> <br />
<h1>Background Color</h1>
<table style="padding:5px">
<tr>
- <th style="width:72px"> <a href='javascript:selectColoring("Prop");'><img id="propIm" alt="" src="/style/tick.jpg" width="20" height="20" /> Props </a> </th>
- <th style="width:72px"> <a href='javascript:selectColoring("Chat");'><img id="chatIm" alt="" src="/style/cross.jpg" width="20" height="20" /> Chat </a> </th>
- <th style="width:72px"> <a href='javascript:selectColoring("Tools");'><img id="toolsIm" alt="" src="/style/cross.jpg" width="20" height="20" /> Toolbar </a> </th>
- <th style="width:72px"> <a href='javascript:selectColoring("Page");'><img id="pageIm" alt="" src="/style/cross.jpg" width="20" height="20" /> Page </a> </th>
+ <th style="width:80px"> <a href='javascript:selectColoring("Prop");'><img id="propIm" alt="" src="/style/radioSelect.jpg" width="15" height="15" /> Props & Backdrops </a> </th>
+ <th style="width:80px"> <a href='javascript:selectColoring("Chat");'><img id="chatIm" alt="" src="/style/radioNonSelect.jpg" width="15" height="15" /> Chat Window </a>
+ </th>
+ <th style="width:80px"> <a href='javascript:selectColoring("Tools");'><img id="toolsIm" alt="" src="/style/radioNonSelect.jpg" width="15" height="15" /> Tool Palette </a>
+ </th>
+ <th style="width:80px"> <a href='javascript:selectColoring("Page");'><img id="pageIm" alt="" src="/style/radioNonSelect.jpg" width="15" height="15" /> Stage Background </a> </th>
</tr>
<tr>
<td id="colProp" style="border:black 1px solid;"> <input type="hidden" name="colourNumProp" id="colourNumProp" maxlength="8" size="8" class="bgPropBgColour" value="" /> </td>
@@ -122,8 +128,6 @@
</tr>
<tr>
<td>
- <input type="checkbox" id="debug" name="debug" onclick="if (this.checked) {debugChecked()}else{debugUnChecked()}"/>
- Print debug messages on the backdrop?
<input type="hidden" name="debugTextMsg" id="debugTextMsg" class="debugMsg" value="%(debugMessages)s" />
<input type="hidden" name="colors" id="colorvals" value="%(colours)s"></input>
</td>
Modified: branches/2.4.2/html/stageedit.js
===================================================================
--- branches/2.4.2/html/stageedit.js 2012-09-17 03:49:16 UTC (rev 398)
+++ branches/2.4.2/html/stageedit.js 2012-09-17 04:20:12 UTC (rev 399)
@@ -153,33 +153,32 @@
// 09/08/2011 Vibhu Patel - Changed from radio buttons to images.
if(select == "Prop")
{
- document.getElementById("propIm").src = "/style/tick.jpg";
- document.getElementById("chatIm").src = "/style/cross.jpg";
- document.getElementById("toolsIm").src = "/style/cross.jpg";
- document.getElementById("pageIm").src = "/style/cross.jpg";
+ document.getElementById("propIm").src = "/style/radioSelect.jpg";
+ document.getElementById("chatIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("toolsIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("pageIm").src = "/style/radioNonSelect.jpg";
}
if(select == "Chat")
{
- document.getElementById("propIm").src = "/style/cross.jpg";
- document.getElementById("chatIm").src = "/style/tick.jpg";
- document.getElementById("toolsIm").src = "/style/cross.jpg";
- document.getElementById("pageIm").src = "/style/cross.jpg";
+ document.getElementById("propIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("chatIm").src = "/style/radioSelect.jpg";
+ document.getElementById("toolsIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("pageIm").src = "/style/radioNonSelect.jpg";
}
if(select == "Tools")
{
- document.getElementById("propIm").src = "/style/cross.jpg";
- document.getElementById("chatIm").src = "/style/cross.jpg";
- document.getElementById("toolsIm").src = "/style/tick.jpg";
- document.getElementById("pageIm").src = "/style/cross.jpg";
+ document.getElementById("propIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("chatIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("toolsIm").src = "/style/radioSelect.jpg";
+ document.getElementById("pageIm").src = "/style/radioNonSelect.jpg";
}
if(select == "Page")
{
- document.getElementById("propIm").src = "/style/cross.jpg";
- document.getElementById("chatIm").src = "/style/cross.jpg";
- document.getElementById("toolsIm").src = "/style/cross.jpg";
- document.getElementById("pageIm").src = "/style/tick.jpg";
+ document.getElementById("propIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("chatIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("toolsIm").src = "/style/radioNonSelect.jpg";
+ document.getElementById("pageIm").src = "/style/radioSelect.jpg";
}
-
selector = select;
clearAllColors();
document.getElementById(select.toLowerCase()+"td").bgColor='#FFFFFF';
Added: branches/2.4.2/html/style/radioNonSelect.jpg
===================================================================
(Binary files differ)
Property changes on: branches/2.4.2/html/style/radioNonSelect.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: branches/2.4.2/html/style/radioselect.jpg
===================================================================
(Binary files differ)
Property changes on: branches/2.4.2/html/style/radioselect.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-18 01:33:22
|
Revision: 407
http://upstage.svn.sourceforge.net/upstage/?rev=407&view=rev
Author: aut-upstage
Date: 2012-09-18 01:33:16 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Renamed Radio select button so it works with upstage.org.nz 8083
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/html/stageedit.js
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-09-18 01:25:29 UTC (rev 406)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-09-18 01:33:16 UTC (rev 407)
@@ -56,7 +56,7 @@
<h1>Background Color</h1>
<table style="padding:5px">
<tr>
- <th style="width:80px"> <a href='javascript:selectColoring("Prop");'><img id="propIm" alt="" src="/style/radioSelect.jpg" width="15" height="15" /> Props & Backdrops </a> </th>
+ <th style="width:80px"> <a href='javascript:selectColoring("Prop");'><img id="propIm" alt="" src="/style/radioselect.jpg" width="15" height="15" /> Props & Backdrops </a> </th>
<th style="width:80px"> <a href='javascript:selectColoring("Chat");'><img id="chatIm" alt="" src="/style/radioNonSelect.jpg" width="15" height="15" /> Chat Window </a>
</th>
<th style="width:80px"> <a href='javascript:selectColoring("Tools");'><img id="toolsIm" alt="" src="/style/radioNonSelect.jpg" width="15" height="15" /> Tool Palette </a>
Modified: branches/2.4.2/html/stageedit.js
===================================================================
--- branches/2.4.2/html/stageedit.js 2012-09-18 01:25:29 UTC (rev 406)
+++ branches/2.4.2/html/stageedit.js 2012-09-18 01:33:16 UTC (rev 407)
@@ -153,7 +153,7 @@
// 09/08/2011 Vibhu Patel - Changed from radio buttons to images.
if(select == "Prop")
{
- document.getElementById("propIm").src = "/style/radioSelect.jpg";
+ document.getElementById("propIm").src = "/style/radioselect.jpg";
document.getElementById("chatIm").src = "/style/radioNonSelect.jpg";
document.getElementById("toolsIm").src = "/style/radioNonSelect.jpg";
document.getElementById("pageIm").src = "/style/radioNonSelect.jpg";
@@ -161,7 +161,7 @@
if(select == "Chat")
{
document.getElementById("propIm").src = "/style/radioNonSelect.jpg";
- document.getElementById("chatIm").src = "/style/radioSelect.jpg";
+ document.getElementById("chatIm").src = "/style/radioselect.jpg";
document.getElementById("toolsIm").src = "/style/radioNonSelect.jpg";
document.getElementById("pageIm").src = "/style/radioNonSelect.jpg";
}
@@ -169,7 +169,7 @@
{
document.getElementById("propIm").src = "/style/radioNonSelect.jpg";
document.getElementById("chatIm").src = "/style/radioNonSelect.jpg";
- document.getElementById("toolsIm").src = "/style/radioSelect.jpg";
+ document.getElementById("toolsIm").src = "/style/radioselect.jpg";
document.getElementById("pageIm").src = "/style/radioNonSelect.jpg";
}
if(select == "Page")
@@ -177,7 +177,7 @@
document.getElementById("propIm").src = "/style/radioNonSelect.jpg";
document.getElementById("chatIm").src = "/style/radioNonSelect.jpg";
document.getElementById("toolsIm").src = "/style/radioNonSelect.jpg";
- document.getElementById("pageIm").src = "/style/radioSelect.jpg";
+ document.getElementById("pageIm").src = "/style/radioselect.jpg";
}
selector = select;
clearAllColors();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-18 01:48:29
|
Revision: 408
http://upstage.svn.sourceforge.net/upstage/?rev=408&view=rev
Author: aut-upstage
Date: 2012-09-18 01:48:18 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Removed searchByFilter() method
Removed type 1 and type 2 filtering.
Removed help button.
Relocated Search by Tags & input box
- Scott & Gavin
Modified Paths:
--------------
branches/2.4.2/config/templates/mediaedit.xhtml
branches/2.4.2/html/mediaedit.js
Modified: branches/2.4.2/config/templates/mediaedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-18 01:33:16 UTC (rev 407)
+++ branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-18 01:48:18 UTC (rev 408)
@@ -23,28 +23,7 @@
<b>Display:</b>
</div>
<div style="float:right;margin-top:-30px;">
- <table>
- <tr>
- <td>
- <input type="text" id="serachText" style="width:100%;" />
- </td>
- <td>
- <button type="button" onclick="javascript:searchTags();return false;"><b>Search by TAGS</b></button>
- </td>
- </tr>
- <tr>
- <td>
- <label><b>Type of filtering: </b></label>
- <select id="typeofFiltering" onchange="javascript:applyFilters();">
- <option value="Type 1">Type 1</option>
- <option value="Type 2">Type 2</option>
- </select>
- </td>
- <td>
- <button type="button" onclick="javascript:getFilteringInfo(); return false;" style="width:100%;"><b>Help</b></button>
- </td>
- </tr>
- </table>
+
</div>
<input type="hidden" name="stages" value="%(list_stages)s"></input>
<input type="hidden" name="users" value="%(list_users)s"></input>
@@ -52,7 +31,11 @@
<span id="filters">
</span>
<br />
- <input type="button" onclick="javascript:addFilter();" value="Add Filter"></input>
+ <input type="button" onclick="javascript:addFilter();" value="Add Filter"></input>
+ <br />
+ <button type="button" onclick="javascript:searchTags();return false;"><b>Search by TAGS</b></button>
+ <input type="text" id="serachText" style="width:20%;" />
+ <br />
</form>
</div>
%(attr:message)s
Modified: branches/2.4.2/html/mediaedit.js
===================================================================
--- branches/2.4.2/html/mediaedit.js 2012-09-18 01:33:16 UTC (rev 407)
+++ branches/2.4.2/html/mediaedit.js 2012-09-18 01:48:18 UTC (rev 408)
@@ -28,7 +28,8 @@
* 1.4 Vibhu (31/08/2011) - Modified getMedia function to send type of audio media is, whether music or sfx.
* 1.5 Heath / Vibhu (01/09/2011) - added functions searchTags to search through media by tag.
* 1.6 Gavin (13/09/2012) - changed the save media into a function that allows invaild characters that are found to be removed in the media and tag name.
- * 1.7 Daniel / Gavin (16/09/12) - Converted the audio player in test voice into jwplayer in which allow multiple browsers such as IE to test the voice audio.
+ * 1.7 Daniel / Gavin (16/09/12) - Converted the audio player in test voice into jwplayer in which allow multiple browsers such as IE to test the voice audio. \
+ * 1.8 Scott Riddell / Gavin Chan (18/09/2012 - Removed the getFilteringInfo() function, as we removed the type1 and type2 filters from the webpage
*/
//General instance style variables
var mediaSelected = false;
@@ -247,21 +248,6 @@
}
}
-/**
- * Vibhu (31/08/2011) - Show information about particular filtering type.
- */
-function getFilteringInfo()
-{
- var selected = document.getElementById("typeofFiltering").value;
- if(selected == 'Type 1')
- {
- alert('Excludes media that do not exclusively match each filter. For Example, Filters: Type = avatar User = bob Displays all avatars uploaded by "bob" ignoring all other media types');
- }
- else if(selected == 'Type 2')
- {
- alert('Include all media that match the filter parameters. For Example, Filters: Type = avatar User = bob Displays all items matching each case. Therefore all avatars and all media uploaded by "bob" would be included.');
- }
-}
/**
* Vibhu, Heath and Nessa (19/08/2011)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-18 01:51:40
|
Revision: 409
http://upstage.svn.sourceforge.net/upstage/?rev=409&view=rev
Author: aut-upstage
Date: 2012-09-18 01:51:31 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
- Daniel Han 2.4.2
Added parameter whether the save stage should refresh the stage or not.
Modified Paths:
--------------
branches/2.4.2/html/masterpage.js
branches/2.4.2/html/stageedit.js
branches/2.4.2/upstage/pages.py
branches/2.4.2/upstage/stage.py
Modified: branches/2.4.2/html/masterpage.js
===================================================================
--- branches/2.4.2/html/masterpage.js 2012-09-18 01:48:18 UTC (rev 408)
+++ branches/2.4.2/html/masterpage.js 2012-09-18 01:51:31 UTC (rev 409)
@@ -42,13 +42,15 @@
var signup = '<a href="javascript:navSignup()">Request an Account</a> or ';
var loginLinks= '<a href="javascript:login()">Sign In</a>';
var signup_html = '<a href="javascript:navSignup();">Dont have an account? Find out how to get involved.</a>';
-var warningMessages = ['This will save the stage, losing any previous settings. Do you wish to proceed?',
+var warningMessages = ['This will save the stage, losing any previous settings and Reload the stage. Do you wish to proceed?',
'You will loose any chages you have made. Do you wish to proceed?',
'This will delete the selected stage. Do you wish to proceed?',
'Warning: This will cause the stage to reload for everyone currently on it, and you will loose the chat log. Do you wish to proceed?',
'Any changes you have made will be saved, overwriting prevoius settings. Do you wish to proceed?',
- 'The selected media item will be permanantly deleted. Do you wish to proceed?']
-var actions = ['save', 'cancel', 'delete', 'reset', 'save', 'delete']; //Dont really need these, just makes server code more readable.
+ 'The selected media item will be permanantly deleted. Do you wish to proceed?',
+ 'This will save the stage, losing any previous settings without reloading the stage. Do you wish to proceed?'
+ ]
+var actions = ['save', 'cancel', 'delete', 'reset', 'save', 'delete', 'saveonly']; //Dont really need these, just makes server code more readable.
/**
* Initialization.
Modified: branches/2.4.2/html/stageedit.js
===================================================================
--- branches/2.4.2/html/stageedit.js 2012-09-18 01:48:18 UTC (rev 408)
+++ branches/2.4.2/html/stageedit.js 2012-09-18 01:51:31 UTC (rev 409)
@@ -19,8 +19,12 @@
add a validator for the "#" key that removes "#" when the user enters it in the stage name
- Created a function saveStage() that is called when the user edits the stage page and confirms, it trims the stage name value and add a alert for the "#" key
- */
+
+ Modified by Daniel Han 18/09/2012 - added stateNum parameter on saveStage for refresh stage or not.
+
+*/
+
//Instance based variables
var selector;
var nocolor;
@@ -232,9 +236,10 @@
/**
* Saves the stage edited by the user
+ * Modified by: Daniel Han (18/09/2012) - added stateNum parameter for refresh stage or not.
* @return - none
*/
- function saveStage()
+ function saveStage(stateNum)
{
try
{
@@ -243,7 +248,7 @@
{
document.getElementById('longName').value = document.getElementById('longName').value.replace(/#/g,"");
}
- warn(0);
+ warn(stateNum);
}
catch(ex)
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-09-18 01:48:18 UTC (rev 408)
+++ branches/2.4.2/upstage/pages.py 2012-09-18 01:51:31 UTC (rev 409)
@@ -73,6 +73,7 @@
Modified by: Daniel 11/09/2012 - Added Non-Admin Page, Stages Edit mode. (editing page for guest-player)
Modified by: Daniel 17/09/2012 - Added bgcolor and stage_message on stage page to display.
+Modified by: Daniel 18/09/2012 - Added Save only on EditStage
"""
#standard lib
@@ -807,7 +808,13 @@
if self.stage:
self.stage.update_from_form(form, self.player);
self.message+='Stage saved! '
-
+
+ #added by Daniel (18/09/2012): Save only
+ elif action=='saveonly':
+ if self.stage:
+ self.stage.update_from_form(form, self.player, {}, False);
+ self.message+='Stage saved! '
+
elif action=='reset':
if self.stage:
self.stage.set_default()
Modified: branches/2.4.2/upstage/stage.py
===================================================================
--- branches/2.4.2/upstage/stage.py 2012-09-18 01:48:18 UTC (rev 408)
+++ branches/2.4.2/upstage/stage.py 2012-09-18 01:51:31 UTC (rev 409)
@@ -33,6 +33,7 @@
functions edited are load() and save()
Modified by: Daniel Han 11/09/2012 - Added Stage Access Checking.
+Modified by: Daniel 18/09/2012 - Added Save only without refreshing.
"""
#std lib
@@ -426,7 +427,7 @@
self.broadcast('SHOW_BACKDROP', ID=bg.ID)
- def update_from_form(self, form, player, uploaders={}):
+ def update_from_form(self, form, player, uploaders={}, refresh_stage = True):
"""Put ticked thingies into stage, remove unticked"""
log.msg("Stage update from form called.")
if not player.can_admin():
@@ -493,8 +494,9 @@
if name not in collection.media:
collection.add_mediafile(k)
-
- self.soft_reset()
+ if refresh_stage == True:
+ self.soft_reset()
+
self.save()
"""
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-18 02:18:59
|
Revision: 411
http://upstage.svn.sourceforge.net/upstage/?rev=411&view=rev
Author: aut-upstage
Date: 2012-09-18 02:18:52 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
- Daniel 2.4.2
Added Stage loading screen and styles. (this was thought to be on 2.4.3 but merged to 2.4.2 as the team's decision.
Modified Paths:
--------------
branches/2.4.2/client/src/Client.as
branches/2.4.2/client/src/Transport.as
branches/2.4.2/client/src/application.xml
branches/2.4.2/config/templates/stage.xhtml
branches/2.4.2/html/style/main.css
branches/2.4.2/html/swf/classes.swf
branches/2.4.2/html/swf/client.swf
Modified: branches/2.4.2/client/src/Client.as
===================================================================
--- branches/2.4.2/client/src/Client.as 2012-09-18 01:59:47 UTC (rev 410)
+++ branches/2.4.2/client/src/Client.as 2012-09-18 02:18:52 UTC (rev 411)
@@ -32,7 +32,7 @@
// AC (27.05.08) - Port for receiving policy files.
public static var POLICY_PORT :Number = 3000;
public static var SCREEN_WIDTH :Number = 320;
- public static var SCREEN_HEIGHT :Number = 240;
+ public static var SCREEN_HEIGHT :Number = 200;
//----------- sizes --------------------------//
public static var AVATAR_MAX_WIDTH :Number = 100;
@@ -243,7 +243,7 @@
public static var UI_BUTTON_HEIGHT :Number = 8;
public static var UI_BUTTON_SPACE_W :Number = 16;
public static var UI_BUTTON_SPACE_H :Number = 9;
- public static var UI_BUTTON_TEXT_SCALE :Number = 0.9;
+ public static var UI_BUTTON_TEXT_SCALE :Number = 0.7;
//LK added 15/10/07 for audience applause button
public static var APPLA_UI_BUTTON_POINTS :Array = [01,02, 01,01, 02,01,
Modified: branches/2.4.2/client/src/Transport.as
===================================================================
--- branches/2.4.2/client/src/Transport.as 2012-09-18 01:59:47 UTC (rev 410)
+++ branches/2.4.2/client/src/Transport.as 2012-09-18 02:18:52 UTC (rev 411)
@@ -18,6 +18,7 @@
import Auth;
import Client;
+import flash.external.ExternalInterface;
import Sender;
import util.Construct;
import model.ModelChat;
@@ -913,6 +914,7 @@
this.modelSplashScreen.GET_CONFIRM_LOADED();
this.modelChat.GET_CONFIRM_LOADED();
trace('Server Confirmed ready');
+ ExternalInterface.call("stage_loaded()");
}
Modified: branches/2.4.2/client/src/application.xml
===================================================================
--- branches/2.4.2/client/src/application.xml 2012-09-18 01:59:47 UTC (rev 410)
+++ branches/2.4.2/client/src/application.xml 2012-09-18 02:18:52 UTC (rev 411)
@@ -29,7 +29,7 @@
////////////////////////////////////////////////////////////////////////////////
-->
-<movie width="320" height="200" framerate="25">
+<movie width="320" height="200" framerate="25" version="9">
<!--
The Application classes have been compiled into the classes.swf file,
Modified: branches/2.4.2/config/templates/stage.xhtml
===================================================================
--- branches/2.4.2/config/templates/stage.xhtml 2012-09-18 01:59:47 UTC (rev 410)
+++ branches/2.4.2/config/templates/stage.xhtml 2012-09-18 02:18:52 UTC (rev 411)
@@ -3,16 +3,31 @@
<title>%(stagename)s</title>
<link rel="stylesheet" type="text/css" href="/style/main.css" />
+<script language="javascript" type="text/javascript" src="/stage.js"></script>
+
</head>
-<body class="full">
-<div class="stagePopUp">
- %(stage_message)s
+<body class="full" onload="onStageLoad()">
+<div id="stagePopUp">
+ <div class="loadingBox">
+ <h2> %(stagename)s </h2>
+
+ <p style="font-size: 12px">
+ %(stage_message)s
+ </p>
+
+
+ <img src="/style/loading.gif" />
+ <p>
+ Loading...
+ </p>
+ </div>
+
</div>
<div style="background-color:%(bgcolor)s">
<object width="100%%" height="100%%" scale="showAll"
classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000"
- codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,0,0"
+ codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0"
>
<param name="allowScriptAccess" value="sameDomain" />
<param name="movie" value="/swf/client.swf?%(vars)s" />
Modified: branches/2.4.2/html/style/main.css
===================================================================
--- branches/2.4.2/html/style/main.css 2012-09-18 01:59:47 UTC (rev 410)
+++ branches/2.4.2/html/style/main.css 2012-09-18 02:18:52 UTC (rev 411)
@@ -27,7 +27,8 @@
1.8 27/06/12 Daniel Han From line 557
1.9 29/08/12 Daniel Han/Gavin Chan line 696 - scroller for edit player form & line 828 custom exit button
- 15/09/12 Daniel Han - Added #workshopnav infront of all ul/li
+ 15/09/12 Daniel Han - Added #workshopnav infront of all ul/li
+ 18/09/12 Daniel Han - Added Stage loading style.
*/
@@ -713,18 +714,7 @@
background-color: #EEE;
}
-.stagePopUp
-{
- display: none;
- padding: 15px;
- box-shadow: #AAA 1px 1px 10px;
- border-radius: 5px;
- border: #888 2px solid;
- top: 655px;
- background-color: #EEE;
-}
-
.edit_player input[type="button"]:hover {
background: #EEE;
border: 1px solid #CCC;
@@ -897,3 +887,35 @@
left: 0px;
z-index: 9998;
}
+
+#stagePopUp
+{
+ display: block;
+ padding:0px;
+ margin:0px;
+ position: fixed;
+ height: 100%;
+ width: 100%;
+ background-color: #6a9;
+
+ top: 0px;
+ left: 0px;
+ z-index: 9998;
+}
+
+
+.loadingBox
+{
+ position: absolute;
+ margin-left: 50%;
+ left: -150px;
+ background-color: #fff;
+ color: #000;
+ border-radius: 20px;
+ border: #eee 2px solid;
+ width: 300px;
+ text-align: center;
+ margin-top: 40%;
+ padding: 20px;
+ box-shadow: #333 1px 1px 10px;
+}
Modified: branches/2.4.2/html/swf/classes.swf
===================================================================
(Binary files differ)
Modified: branches/2.4.2/html/swf/client.swf
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-18 02:34:06
|
Revision: 412
http://upstage.svn.sourceforge.net/upstage/?rev=412&view=rev
Author: aut-upstage
Date: 2012-09-18 02:34:00 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
Added a link "Go directly to stage"
Scott, Gavin, Dan
Modified Paths:
--------------
branches/2.4.2/config/templates/stageedit.xhtml
branches/2.4.2/upstage/pages.py
Modified: branches/2.4.2/config/templates/stageedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/stageedit.xhtml 2012-09-18 02:18:52 UTC (rev 411)
+++ branches/2.4.2/config/templates/stageedit.xhtml 2012-09-18 02:34:00 UTC (rev 412)
@@ -42,6 +42,9 @@
<td>Short name for URL:</td>
<td><input type="text" name="shortName" value="%(ID)s" size="20" readonly="readonly"/>(Used for URL)</td>
</tr>
+ <tr>
+ <td colspan="2"> %(attr:stage_link)s </td>
+ </tr>
</table>
</div>
<!-- -->
Modified: branches/2.4.2/upstage/pages.py
===================================================================
--- branches/2.4.2/upstage/pages.py 2012-09-18 02:18:52 UTC (rev 411)
+++ branches/2.4.2/upstage/pages.py 2012-09-18 02:34:00 UTC (rev 412)
@@ -667,7 +667,8 @@
message = None
stage = None
no_stage = 'No stage selected'
-
+ stage_link = ''
+
def __init__(self, player, collection):
AdminBase.__init__(self, player, collection)
self.player = player
@@ -773,11 +774,11 @@
form = request.args
self.message = ''
action = request.args.get('action',[''])[0]
- stage_link= ''
+ self.stage_link= ''
try:
self.stagename = request.args.get('shortName',[''])[0]
self.stage = self.collection.stages.get(self.stagename)
- stage_link="<a href=\"../../../stages/%s\">Go directly to stage. </a>" %self.stage.ID
+ self.stage_link="<a href=\"../../../stages/%s\">Go directly to stage. </a>" %self.stage.ID
except:
self.message+='No stage selected. '
if 'ID' in form:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <aut...@us...> - 2012-09-18 02:41:48
|
Revision: 413
http://upstage.svn.sourceforge.net/upstage/?rev=413&view=rev
Author: aut-upstage
Date: 2012-09-18 02:41:42 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
made the searchTagEnterKey feature in the view/edit media. -CF
Modified Paths:
--------------
branches/2.4.2/config/templates/mediaedit.xhtml
branches/2.4.2/html/mediaedit.js
Modified: branches/2.4.2/config/templates/mediaedit.xhtml
===================================================================
--- branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-18 02:34:00 UTC (rev 412)
+++ branches/2.4.2/config/templates/mediaedit.xhtml 2012-09-18 02:41:42 UTC (rev 413)
@@ -10,6 +10,7 @@
Vibhu Patel (31/08/2011): Modified to include type of filtering option.
Vibhu / Heath (01/08/2011): Made layout changes.
Daniel / Gavin (24/08/2012): Made divMessage to make popup postback
+ Craig Farrell (18/09/2012) : made search text by pressing enter
-->
<script type="text/javascript">document.title='Workshop - Media';</script>
@@ -32,12 +33,12 @@
</span>
<br />
<input type="button" onclick="javascript:addFilter();" value="Add Filter"></input>
- <br />
- <button type="button" onclick="javascript:searchTags();return false;"><b>Search by TAGS</b></button>
- <input type="text" id="serachText" style="width:20%;" />
- <br />
</form>
</div>
+<div>
+ <button type="button" id="searchButton" onclick="javascript:searchTags();return false;"><b>Search by TAGS</b></button>
+ <input type="text" id="serachText" style="width:20%;" onkeyup="searchTagsEnterKey(event);"/>
+</div>
%(attr:message)s
<hr />
<div id="dhtmlgoodies_slideshow">
Modified: branches/2.4.2/html/mediaedit.js
===================================================================
--- branches/2.4.2/html/mediaedit.js 2012-09-18 02:34:00 UTC (rev 412)
+++ branches/2.4.2/html/mediaedit.js 2012-09-18 02:41:42 UTC (rev 413)
@@ -30,6 +30,7 @@
* 1.6 Gavin (13/09/2012) - changed the save media into a function that allows invaild characters that are found to be removed in the media and tag name.
* 1.7 Daniel / Gavin (16/09/12) - Converted the audio player in test voice into jwplayer in which allow multiple browsers such as IE to test the voice audio. \
* 1.8 Scott Riddell / Gavin Chan (18/09/2012 - Removed the getFilteringInfo() function, as we removed the type1 and type2 filters from the webpage
+ 1.9 Craig Farrell (13/09/2012) - added searchTagEnterKey, so when you press enter in text box it will activate search button.
*/
//General instance style variables
var mediaSelected = false;
@@ -751,6 +752,26 @@
applySearch(); //apply the search
}
}
+
+ /**
+ added by Craig Farrell 13/09/12
+ - checks if enter key was pressed while in search textbox
+ */
+ function searchTagsEnterKey(opEvent)
+ {
+ if (window.event)
+ {
+ opEvent = window.event;
+ }
+ var key = opEvent.keyCode;
+ var eKey = 13;
+ if(key == eKey)
+ {
+ document.getElementById('searchButton').click();
+ }
+
+ //document.getElementById('searchButton').click();
+ }
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X