fe / YOHOOD · Commits

Go to a project

Authored by lore-w
Commit a4d00fac93f4ca79aff6f5252a40dd9a817b9a2a 1 parent 698fe422

yohood

Inline Side-by-side
Showing 3 changed files with 32 additions and 44 deletions
... ... @@ -2,20 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="004f2bf1-d628-4e2a-816a-91fca073fff3" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/website/config/Defines.class.php" afterPath="$PROJECT_DIR$/website/config/Defines.class.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/res/sass/style/_submit.scss" afterPath="$PROJECT_DIR$/res/sass/style/_submit.scss" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/website/config/core/db.test.config.php" afterPath="$PROJECT_DIR$/website/config/core/db.test.config.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/encodings.xml" afterPath="$PROJECT_DIR$/.idea/encodings.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/website/view/script/onlinereg/exhibitor.php" afterPath="$PROJECT_DIR$/website/view/script/onlinereg/exhibitor.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/res/css/index.css.map" afterPath="$PROJECT_DIR$/res/css/index.css.map" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/res/css/index.css" afterPath="$PROJECT_DIR$/res/css/index.css" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/website/view/script/onlinereg/media.php" afterPath="$PROJECT_DIR$/website/view/script/onlinereg/media.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/modules.xml" afterPath="$PROJECT_DIR$/.idea/modules.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/website/view/script/onlinereg/sponsor.php" afterPath="$PROJECT_DIR$/website/view/script/onlinereg/sponsor.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/yohood.iml" afterPath="$PROJECT_DIR$/.idea/yohood.iml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/res/js/yohood.js" afterPath="$PROJECT_DIR$/res/js/yohood.js" />
</list>
<ignored path="yohood.iws" />
... ... @@ -44,8 +31,8 @@
<file leaf-file-name="exhibitor.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/exhibitor.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.40625" vertical-offset="2078" max-vertical-offset="3358">
<caret line="109" column="22" selection-start-line="109" selection-start-column="22" selection-end-line="109" selection-end-column="22" />
<state vertical-scroll-proportion="-11.96875" vertical-offset="2078" max-vertical-offset="3358">
<caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
<folding>
<element signature="e#4582#4604#0#HTML" expanded="true" />
</folding>
... ... @@ -56,8 +43,8 @@
<file leaf-file-name="sponsor.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/sponsor.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-21.21875" vertical-offset="1644" max-vertical-offset="2530">
<caret line="101" column="23" selection-start-line="101" selection-start-column="23" selection-end-line="101" selection-end-column="23" />
<state vertical-scroll-proportion="-8.28125" vertical-offset="1644" max-vertical-offset="2530">
<caret line="83" column="18" selection-start-line="83" selection-start-column="18" selection-end-line="83" selection-end-column="18" />
<folding />
</state>
</provider>
... ... @@ -66,10 +53,10 @@
<file leaf-file-name="yohood.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/res/js/yohood.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.54254144" vertical-offset="26833" max-vertical-offset="28520">
<caret line="1188" column="53" selection-start-line="1188" selection-start-column="53" selection-end-line="1188" selection-end-column="53" />
<state vertical-scroll-proportion="0.69502765" vertical-offset="17932" max-vertical-offset="28520">
<caret line="807" column="34" selection-start-line="807" selection-start-column="34" selection-end-line="807" selection-end-column="34" />
<folding>
<marker date="1458900891405" expanded="false" signature="10509:10523" placeholder="..." />
<marker date="1458901360881" expanded="false" signature="10509:10523" placeholder="..." />
</folding>
</state>
</provider>
... ... @@ -110,15 +97,16 @@
<list>
<option value="$PROJECT_DIR$/website/view/script/onlinereg/sponsor.php" />
<option value="$PROJECT_DIR$/website/view/script/onlinereg/media.php" />
<option value="$PROJECT_DIR$/website/view/script/onlinereg/exhibitor.php" />
<option value="$PROJECT_DIR$/res/sass/style/_submit.scss" />
<option value="$PROJECT_DIR$/res/js/yohood.js" />
<option value="$PROJECT_DIR$/website/view/script/onlinereg/exhibitor.php" />
</list>
</option>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="564" />
<option name="x" value="-8" />
<option name="y" value="-8" />
<option name="width" value="1936" />
<option name="height" value="1056" />
</component>
... ... @@ -431,7 +419,7 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="564" y="0" width="1936" height="1056" extended-state="0" />
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -820,46 +808,46 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/sponsor.php">
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/media.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-21.21875" vertical-offset="1644" max-vertical-offset="2530">
<caret line="101" column="23" selection-start-line="101" selection-start-column="23" selection-end-line="101" selection-end-column="23" />
<state vertical-scroll-proportion="-12.21875" vertical-offset="621" max-vertical-offset="2415">
<caret line="44" column="91" selection-start-line="44" selection-start-column="91" selection-end-line="44" selection-end-column="91" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/media.php">
<entry file="file://$PROJECT_DIR$/res/sass/style/_submit.scss">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-12.21875" vertical-offset="621" max-vertical-offset="2415">
<caret line="44" column="91" selection-start-line="44" selection-start-column="91" selection-end-line="44" selection-end-column="91" />
<state vertical-scroll-proportion="-17.0" vertical-offset="5183" max-vertical-offset="12052">
<caret line="249" column="36" selection-start-line="249" selection-start-column="36" selection-end-line="249" selection-end-column="36" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/exhibitor.php">
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/sponsor.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.40625" vertical-offset="2078" max-vertical-offset="3358">
<caret line="109" column="22" selection-start-line="109" selection-start-column="22" selection-end-line="109" selection-end-column="22" />
<folding>
<element signature="e#4582#4604#0#HTML" expanded="true" />
</folding>
<state vertical-scroll-proportion="-8.28125" vertical-offset="1644" max-vertical-offset="2530">
<caret line="83" column="18" selection-start-line="83" selection-start-column="18" selection-end-line="83" selection-end-column="18" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/res/sass/style/_submit.scss">
<entry file="file://$PROJECT_DIR$/website/view/script/onlinereg/exhibitor.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.0" vertical-offset="5183" max-vertical-offset="12052">
<caret line="249" column="36" selection-start-line="249" selection-start-column="36" selection-end-line="249" selection-end-column="36" />
<folding />
<state vertical-scroll-proportion="-11.96875" vertical-offset="2078" max-vertical-offset="3358">
<caret line="107" column="31" selection-start-line="107" selection-start-column="31" selection-end-line="107" selection-end-column="31" />
<folding>
<element signature="e#4582#4604#0#HTML" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/res/js/yohood.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.54254144" vertical-offset="26833" max-vertical-offset="28520">
<caret line="1188" column="53" selection-start-line="1188" selection-start-column="53" selection-end-line="1188" selection-end-column="53" />
<state vertical-scroll-proportion="0.69502765" vertical-offset="17932" max-vertical-offset="28520">
<caret line="807" column="34" selection-start-line="807" selection-start-column="34" selection-end-line="807" selection-end-column="34" />
<folding>
<marker date="1458900891405" expanded="false" signature="10509:10523" placeholder="..." />
<marker date="1458901360881" expanded="false" signature="10509:10523" placeholder="..." />
</folding>
</state>
</provider>
... ...
... ... @@ -788,7 +788,7 @@ define('yohood', function(require, exports) {
$("#upload-file").uploadify({
height: 30,
multi: false,
fileTypeExts: '*.gif; *.jpg; *.png; *.pdf; *.rar; *.doc; *.xlsx',
fileTypeExts: '*.gif; *.jpg; *.png; *.pdf; *.rar; *.doc; *.xlsx; *.ppt',
buttonText: '上传文件',
swf: '/../uploadify.swf',
uploader: '/onlinereg/uploadfile',
... ...
... ... @@ -103,7 +103,7 @@
<div class="form-leading"><span>品牌资料上传：</span></div>
<div class="form-control">
<input type="file" name="upload-file" id="upload-file"/>
<span class="upload-tips">ppt/ptf/zip,大小不超过10M</span>
<span class="upload-tips">ppt/pdf/zip,大小不超过10M</span>
<div class="has-upload" style="display: none;">
<span></span>
</div>
... ...