From 6fb7d65a2cd113ee7967a3ea817b04be096a4685 Mon Sep 17 00:00:00 2001
From: liuyue <2586703@qq.com>
Date: Fri, 25 Mar 2016 10:37:44 +0800
Subject: [PATCH] 网销图片，样式修正
---
client/gulpfile.js | 73 ++++++++++++++++++++++++++++++++++++++-----------------------------------
client/js/common/util.js | 195 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------
client/js/goods/netsale-edit.js | 61 +++++++++++++++++++++++++++++++++++++++++++------------------
client/js/goods/netsale.js | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------
client/js/goods/partials/add-info.js | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
client/js/goods/partials/basic-info.js | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------
client/js/goods/partials/brand-relation.js | 18 ++++++++++++++----
client/js/goods/partials/editor_recommend.js | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------
client/js/goods/partials/goods-params.js | 7 +++----
client/js/goods/partials/netsale-ty.js | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------
client/sass/index.scss | 6 +++++-
client/sass/module/_base.scss | 22 ++++++++++++++++++++++
client/sass/module/_edit.scss | 137 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------
client/webpack.config.js | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
public/images/100x100.png | Bin 0 -> 563 bytes
public/images/100x120.png | Bin 0 -> 660 bytes
public/images/anchor.gif | Bin 0 -> 184 bytes
public/images/arrow.png | Bin 0 -> 1173 bytes
public/images/arrow_down.png | Bin 0 -> 1610 bytes
public/images/arrow_up.png | Bin 0 -> 1649 bytes
public/images/button-bg.gif | Bin 0 -> 1114 bytes
public/images/calendar-arrow.png | Bin 0 -> 2962 bytes
public/images/cancelbutton.gif | Bin 0 -> 1227 bytes
public/images/caret.png | Bin 0 -> 293 bytes
public/images/charts.png | Bin 0 -> 518 bytes
public/images/close-white.png | Bin 0 -> 2973 bytes
public/images/close.png | Bin 0 -> 1042 bytes
public/images/colorpicker/colorpicker_background.png | Bin 0 -> 3917 bytes
public/images/colorpicker/colorpicker_hex.png | Bin 0 -> 2976 bytes
public/images/colorpicker/colorpicker_hsb_b.png | Bin 0 -> 3158 bytes
public/images/colorpicker/colorpicker_hsb_h.png | Bin 0 -> 2984 bytes
public/images/colorpicker/colorpicker_hsb_s.png | Bin 0 -> 3307 bytes
public/images/colorpicker/colorpicker_indic.gif | Bin 0 -> 76 bytes
public/images/colorpicker/colorpicker_overlay.png | Bin 0 -> 10355 bytes
public/images/colorpicker/colorpicker_rgb_b.png | Bin 0 -> 3158 bytes
public/images/colorpicker/colorpicker_rgb_g.png | Bin 0 -> 3228 bytes
public/images/colorpicker/colorpicker_rgb_r.png | Bin 0 -> 3147 bytes
public/images/colorpicker/colorpicker_select.gif | Bin 0 -> 78 bytes
public/images/colorpicker/colorpicker_submit.png | Bin 0 -> 984 bytes
public/images/colorpicker/select2.png | Bin 0 -> 3061 bytes
public/images/copy.png | Bin 0 -> 4319 bytes
public/images/cursor_h.gif | Bin 0 -> 253 bytes
public/images/cursor_h.png | Bin 0 -> 175 bytes
public/images/cursor_v.gif | Bin 0 -> 370 bytes
public/images/cursor_v.png | Bin 0 -> 177 bytes
public/images/datatables/sort_asc.png | Bin 0 -> 2928 bytes
public/images/datatables/sort_desc.png | Bin 0 -> 2933 bytes
public/images/dialog-title-bg.png | Bin 0 -> 938 bytes
public/images/droparrows.png | Bin 0 -> 1110 bytes
public/images/dropdown-arrow.png | Bin 0 -> 2944 bytes
public/images/filescan.png | Bin 0 -> 4282 bytes
public/images/highlighted.gif | Bin 0 -> 111 bytes
public/images/icons-all.gif | Bin 0 -> 3750 bytes
public/images/icons.gif | Bin 0 -> 20371 bytes
public/images/icons.png | Bin 0 -> 41374 bytes
public/images/imglabel.png | Bin 0 -> 2973 bytes
public/images/loaderror.png | Bin 0 -> 3209 bytes
public/images/loaders/loader1.gif | Bin 0 -> 595 bytes
public/images/loaders/loader10.gif | Bin 0 -> 3531 bytes
public/images/loaders/loader11.gif | Bin 0 -> 19867 bytes
public/images/loaders/loader12.gif | Bin 0 -> 6215 bytes
public/images/loaders/loader13.gif | Bin 0 -> 7270 bytes
public/images/loaders/loader14.gif | Bin 0 -> 12413 bytes
public/images/loaders/loader15.gif | Bin 0 -> 3189 bytes
public/images/loaders/loader16.gif | Bin 0 -> 4588 bytes
public/images/loaders/loader17.gif | Bin 0 -> 11477 bytes
public/images/loaders/loader18.gif | Bin 0 -> 9579 bytes
public/images/loaders/loader19.gif | Bin 0 -> 2660 bytes
public/images/loaders/loader2.gif | Bin 0 -> 1683 bytes
public/images/loaders/loader20.gif | Bin 0 -> 10439 bytes
public/images/loaders/loader21.gif | Bin 0 -> 3063 bytes
public/images/loaders/loader22.gif | Bin 0 -> 6350 bytes
public/images/loaders/loader23.gif | Bin 0 -> 14494 bytes
public/images/loaders/loader24.gif | Bin 0 -> 14230 bytes
public/images/loaders/loader25.gif | Bin 0 -> 7062 bytes
public/images/loaders/loader26.gif | Bin 0 -> 2431 bytes
public/images/loaders/loader27.gif | Bin 0 -> 1627 bytes
public/images/loaders/loader28.gif | Bin 0 -> 4960 bytes
public/images/loaders/loader29.gif | Bin 0 -> 4774 bytes
public/images/loaders/loader3.gif | Bin 0 -> 1349 bytes
public/images/loaders/loader30.gif | Bin 0 -> 8502 bytes
public/images/loaders/loader4.gif | Bin 0 -> 1333 bytes
public/images/loaders/loader5.gif | Bin 0 -> 2378 bytes
public/images/loaders/loader6.gif | Bin 0 -> 2263 bytes
public/images/loaders/loader7.gif | Bin 0 -> 8787 bytes
public/images/loaders/loader8.gif | Bin 0 -> 1112 bytes
public/images/loaders/loader9.gif | Bin 0 -> 3548 bytes
public/images/localimage.png | Bin 0 -> 6979 bytes
public/images/lock.gif | Bin 0 -> 1062 bytes
public/images/logo-primary.png | Bin 0 -> 2220 bytes
public/images/logo.png | Bin 0 -> 2182 bytes
public/images/music.png | Bin 0 -> 23106 bytes
public/images/neweditor-tab-bg.png | Bin 0 -> 216 bytes
public/images/ok.gif | Bin 0 -> 866 bytes
public/images/pagebreak.gif | Bin 0 -> 54 bytes
public/images/photos/media-audio.png | Bin 0 -> 10780 bytes
public/images/photos/media-doc.png | Bin 0 -> 5848 bytes
public/images/photos/media1.jpg | Bin 0 -> 93170 bytes
public/images/photos/media2.png | Bin 0 -> 343593 bytes
public/images/photos/media3.png | Bin 0 -> 278152 bytes
public/images/photos/media4.png | Bin 0 -> 213615 bytes
public/images/photos/media5.png | Bin 0 -> 237176 bytes
public/images/photos/media6.png | Bin 0 -> 297327 bytes
public/images/photos/media7.png | Bin 0 -> 369403 bytes
public/images/photos/profile-big.jpg | Bin 0 -> 259379 bytes
public/images/photos/profile.png | Bin 0 -> 9311 bytes
public/images/photos/user1.png | Bin 0 -> 17694 bytes
public/images/photos/user2.png | Bin 0 -> 18310 bytes
public/images/photos/user3.png | Bin 0 -> 17036 bytes
public/images/photos/user4.png | Bin 0 -> 18211 bytes
public/images/photos/user5.png | Bin 0 -> 17012 bytes
public/images/pop-bg.png | Bin 0 -> 1003 bytes
public/images/prettyphoto/dark_rounded/btnNext.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_rounded/btnPrevious.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_rounded/contentPattern.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_rounded/loader.gif.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_rounded/sprite.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_square/btnNext.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_square/btnPrevious.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_square/loader.gif.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/dark_square/sprite.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/default_thumb.png | Bin 0 -> 1537 bytes
public/images/prettyphoto/facebook/btnNext.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/btnPrevious.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/contentPatternBottom.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/contentPatternLeft.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/contentPatternRight.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/contentPatternTop.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/default_thumbnail.gif.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/loader.gif.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/facebook/sprite.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/light_rounded/btnNext.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/light_rounded/btnPrevious.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/light_rounded/loader.gif.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/light_rounded/sprite.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/light_square/btnNext.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/light_square/btnPrevious.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/light_square/sprite.png.html | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
public/images/prettyphoto/loader.gif | Bin 0 -> 6331 bytes
public/images/prettyphoto/sprite.png | Bin 0 -> 6682 bytes
public/images/prettyphoto/sprite_next.png | Bin 0 -> 1358 bytes
public/images/prettyphoto/sprite_prev.png | Bin 0 -> 1376 bytes
public/images/prettyphoto/sprite_x.png | Bin 0 -> 1097 bytes
public/images/prettyphoto/sprite_y.png | Bin 0 -> 1162 bytes
public/images/scale.png | Bin 0 -> 167 bytes
public/images/screen.png | Bin 0 -> 3172 bytes
public/images/select2-spinner.gif | Bin 0 -> 1849 bytes
public/images/select2.png | Bin 0 -> 613 bytes
public/images/select2x2.png | Bin 0 -> 845 bytes
public/images/sortable.png | Bin 0 -> 2851 bytes
public/images/spacer.gif | Bin 0 -> 43 bytes
public/images/sparator_v.png | Bin 0 -> 122 bytes
public/images/table-cell-align.png | Bin 0 -> 1847 bytes
public/images/tangram-colorpicker.png | Bin 0 -> 17355 bytes
public/images/themeforest.png | Bin 0 -> 3706 bytes
public/images/toolbar_bg.png | Bin 0 -> 170 bytes
public/images/unhighlighted.gif | Bin 0 -> 111 bytes
public/images/upload.png | Bin 0 -> 6608 bytes
public/images/upload1.png | Bin 0 -> 848 bytes
public/images/upload2.png | Bin 0 -> 1910 bytes
public/images/uploadfile.png | Bin 0 -> 7477 bytes
public/images/videologo.gif | Bin 0 -> 1604 bytes
public/images/word.gif | Bin 0 -> 1019 bytes
public/images/wordpaste.png | Bin 0 -> 6467 bytes
server/config/common.js | 4 ++--
server/views/pages/goods/netsale-edit.html | 39 +++++++++++++++++++++------------------
server/views/pages/goods/netsale.html | 33 +++++++++++++++++++++++++--------
server/views/partials/netsale/add-info.html | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------
server/views/partials/netsale/basic-info.html | 40 ++++++++++++++++++++++++++++++----------
server/views/partials/netsale/brand-relation.html | 8 +++++---
server/views/partials/netsale/close-match.html | 18 +++++++++---------
server/views/partials/netsale/fenmian.html | 139 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------
server/views/partials/netsale/goods-description.html | 1 +
server/views/partials/netsale/goods-params.html | 30 ++++++++++++++++++++----------
server/views/partials/netsale/goods-sort.html | 11 +++++------
server/views/partials/netsale/search-key.html | 2 +-
server/views/partials/netsale/size-info.html | 20 +++++++++-----------
177 files changed, 3494 insertions(+), 662 deletions(-)
create mode 100644 client/sass/module/_base.scss
create mode 100644 public/images/100x100.png
create mode 100644 public/images/100x120.png
create mode 100644 public/images/anchor.gif
create mode 100644 public/images/arrow.png
create mode 100644 public/images/arrow_down.png
create mode 100644 public/images/arrow_up.png
create mode 100644 public/images/button-bg.gif
create mode 100644 public/images/calendar-arrow.png
create mode 100644 public/images/cancelbutton.gif
create mode 100644 public/images/caret.png
create mode 100644 public/images/charts.png
create mode 100644 public/images/close-white.png
create mode 100644 public/images/close.png
create mode 100644 public/images/colorpicker/colorpicker_background.png
create mode 100644 public/images/colorpicker/colorpicker_hex.png
create mode 100644 public/images/colorpicker/colorpicker_hsb_b.png
create mode 100644 public/images/colorpicker/colorpicker_hsb_h.png
create mode 100644 public/images/colorpicker/colorpicker_hsb_s.png
create mode 100644 public/images/colorpicker/colorpicker_indic.gif
create mode 100644 public/images/colorpicker/colorpicker_overlay.png
create mode 100644 public/images/colorpicker/colorpicker_rgb_b.png
create mode 100644 public/images/colorpicker/colorpicker_rgb_g.png
create mode 100644 public/images/colorpicker/colorpicker_rgb_r.png
create mode 100644 public/images/colorpicker/colorpicker_select.gif
create mode 100644 public/images/colorpicker/colorpicker_submit.png
create mode 100644 public/images/colorpicker/select2.png
create mode 100644 public/images/copy.png
create mode 100644 public/images/cursor_h.gif
create mode 100644 public/images/cursor_h.png
create mode 100644 public/images/cursor_v.gif
create mode 100644 public/images/cursor_v.png
create mode 100644 public/images/datatables/sort_asc.png
create mode 100644 public/images/datatables/sort_desc.png
create mode 100644 public/images/dialog-title-bg.png
create mode 100644 public/images/droparrows.png
create mode 100644 public/images/dropdown-arrow.png
create mode 100644 public/images/filescan.png
create mode 100644 public/images/highlighted.gif
create mode 100644 public/images/icons-all.gif
create mode 100644 public/images/icons.gif
create mode 100644 public/images/icons.png
create mode 100644 public/images/imglabel.png
create mode 100644 public/images/loaderror.png
create mode 100644 public/images/loaders/loader1.gif
create mode 100644 public/images/loaders/loader10.gif
create mode 100644 public/images/loaders/loader11.gif
create mode 100644 public/images/loaders/loader12.gif
create mode 100644 public/images/loaders/loader13.gif
create mode 100644 public/images/loaders/loader14.gif
create mode 100644 public/images/loaders/loader15.gif
create mode 100644 public/images/loaders/loader16.gif
create mode 100644 public/images/loaders/loader17.gif
create mode 100644 public/images/loaders/loader18.gif
create mode 100644 public/images/loaders/loader19.gif
create mode 100644 public/images/loaders/loader2.gif
create mode 100644 public/images/loaders/loader20.gif
create mode 100644 public/images/loaders/loader21.gif
create mode 100644 public/images/loaders/loader22.gif
create mode 100644 public/images/loaders/loader23.gif
create mode 100644 public/images/loaders/loader24.gif
create mode 100644 public/images/loaders/loader25.gif
create mode 100644 public/images/loaders/loader26.gif
create mode 100644 public/images/loaders/loader27.gif
create mode 100644 public/images/loaders/loader28.gif
create mode 100644 public/images/loaders/loader29.gif
create mode 100644 public/images/loaders/loader3.gif
create mode 100644 public/images/loaders/loader30.gif
create mode 100644 public/images/loaders/loader4.gif
create mode 100644 public/images/loaders/loader5.gif
create mode 100644 public/images/loaders/loader6.gif
create mode 100644 public/images/loaders/loader7.gif
create mode 100644 public/images/loaders/loader8.gif
create mode 100644 public/images/loaders/loader9.gif
create mode 100644 public/images/localimage.png
create mode 100644 public/images/lock.gif
create mode 100644 public/images/logo-primary.png
create mode 100644 public/images/logo.png
create mode 100644 public/images/music.png
create mode 100644 public/images/neweditor-tab-bg.png
create mode 100644 public/images/ok.gif
create mode 100644 public/images/pagebreak.gif
create mode 100644 public/images/photos/media-audio.png
create mode 100644 public/images/photos/media-doc.png
create mode 100644 public/images/photos/media1.jpg
create mode 100644 public/images/photos/media2.png
create mode 100644 public/images/photos/media3.png
create mode 100644 public/images/photos/media4.png
create mode 100644 public/images/photos/media5.png
create mode 100644 public/images/photos/media6.png
create mode 100644 public/images/photos/media7.png
create mode 100644 public/images/photos/profile-big.jpg
create mode 100644 public/images/photos/profile.png
create mode 100644 public/images/photos/user1.png
create mode 100644 public/images/photos/user2.png
create mode 100644 public/images/photos/user3.png
create mode 100644 public/images/photos/user4.png
create mode 100644 public/images/photos/user5.png
create mode 100644 public/images/pop-bg.png
create mode 100644 public/images/prettyphoto/dark_rounded/btnNext.png.html
create mode 100644 public/images/prettyphoto/dark_rounded/btnPrevious.png.html
create mode 100644 public/images/prettyphoto/dark_rounded/contentPattern.png.html
create mode 100644 public/images/prettyphoto/dark_rounded/loader.gif.html
create mode 100644 public/images/prettyphoto/dark_rounded/sprite.png.html
create mode 100644 public/images/prettyphoto/dark_square/btnNext.png.html
create mode 100644 public/images/prettyphoto/dark_square/btnPrevious.png.html
create mode 100644 public/images/prettyphoto/dark_square/loader.gif.html
create mode 100644 public/images/prettyphoto/dark_square/sprite.png.html
create mode 100644 public/images/prettyphoto/default_thumb.png
create mode 100644 public/images/prettyphoto/facebook/btnNext.png.html
create mode 100644 public/images/prettyphoto/facebook/btnPrevious.png.html
create mode 100644 public/images/prettyphoto/facebook/contentPatternBottom.png.html
create mode 100644 public/images/prettyphoto/facebook/contentPatternLeft.png.html
create mode 100644 public/images/prettyphoto/facebook/contentPatternRight.png.html
create mode 100644 public/images/prettyphoto/facebook/contentPatternTop.png.html
create mode 100644 public/images/prettyphoto/facebook/default_thumbnail.gif.html
create mode 100644 public/images/prettyphoto/facebook/loader.gif.html
create mode 100644 public/images/prettyphoto/facebook/sprite.png.html
create mode 100644 public/images/prettyphoto/light_rounded/btnNext.png.html
create mode 100644 public/images/prettyphoto/light_rounded/btnPrevious.png.html
create mode 100644 public/images/prettyphoto/light_rounded/loader.gif.html
create mode 100644 public/images/prettyphoto/light_rounded/sprite.png.html
create mode 100644 public/images/prettyphoto/light_square/btnNext.png.html
create mode 100644 public/images/prettyphoto/light_square/btnPrevious.png.html
create mode 100644 public/images/prettyphoto/light_square/sprite.png.html
create mode 100644 public/images/prettyphoto/loader.gif
create mode 100644 public/images/prettyphoto/sprite.png
create mode 100644 public/images/prettyphoto/sprite_next.png
create mode 100644 public/images/prettyphoto/sprite_prev.png
create mode 100644 public/images/prettyphoto/sprite_x.png
create mode 100644 public/images/prettyphoto/sprite_y.png
create mode 100644 public/images/scale.png
create mode 100644 public/images/screen.png
create mode 100644 public/images/select2-spinner.gif
create mode 100644 public/images/select2.png
create mode 100644 public/images/select2x2.png
create mode 100644 public/images/sortable.png
create mode 100644 public/images/spacer.gif
create mode 100644 public/images/sparator_v.png
create mode 100644 public/images/table-cell-align.png
create mode 100644 public/images/tangram-colorpicker.png
create mode 100644 public/images/themeforest.png
create mode 100644 public/images/toolbar_bg.png
create mode 100644 public/images/unhighlighted.gif
create mode 100644 public/images/upload.png
create mode 100644 public/images/upload1.png
create mode 100644 public/images/upload2.png
create mode 100644 public/images/uploadfile.png
create mode 100644 public/images/videologo.gif
create mode 100644 public/images/word.gif
create mode 100644 public/images/wordpaste.png
diff --git a/client/gulpfile.js b/client/gulpfile.js
index 7bb1764..412aeca 100644
--- a/client/gulpfile.js
+++ b/client/gulpfile.js
@@ -1,8 +1,8 @@
-var gulp=require('gulp'),
- fs=require('fs'),
+var gulp = require('gulp'),
+ fs = require('fs'),
ftp = require('gulp-ftp'),
gutil = require('gulp-util'),
- path=require('path'),
+ path = require('path'),
plumber = require('gulp-plumber'),
sass = require('gulp-sass'),
concat = require('gulp-concat'),
@@ -10,9 +10,9 @@ var gulp=require('gulp'),
// md5 = require("gulp-md5"),
autoprefixer = require('gulp-autoprefixer'),
server = require('gulp-develop-server'),
- minifycss = require('gulp-minify-css'),
+ minifycss = require('gulp-minify-css'),
webpack = require('webpack');
-var crypto=require("crypto");
+var crypto = require("crypto");
var rename = require("gulp-rename");
var clean = require('gulp-clean');
@@ -22,7 +22,6 @@ var env = process.env.NODE_ENV || 'development';
-
var config = JSON.parse(fs.readFileSync('./package.json').toString());
var assets_dir = 'dist/' + config.name + '/assets';
var public_dir = '../public';
@@ -35,7 +34,7 @@ var dist_dir = {
};
var cdn_domain = 'http://cdn.yoho.cn/';
-var md5="";//+crypto.createHash('md5').update(new Date().toString()).digest('hex');;
+var md5 = ""; //+crypto.createHash('md5').update(new Date().toString()).digest('hex');;
var ftpConfig = {
host: '218.94.75.58',
@@ -44,43 +43,47 @@ var ftpConfig = {
};
-gulp.task('default',["sass","js"]);
+gulp.task('default', ["sass", "js"]);
-gulp.task('start',["default","default-watch","server"]);
+gulp.task('start', ["default", "default-watch", "server"]);
-gulp.task('build',["clean"],function(){
- gulp.start(["buildjs","assets","static-config"]);
-});//"static-config"
+gulp.task('build', ["clean"], function() {
+ gulp.start(["buildjs", "assets", "static-config"]);
+}); //"static-config"
//预编译css
gulp.task('sass', function() {
- gulp.src(['sass/index.scss','sass/login.scss'])
+ gulp.src('sass/index.scss')
.pipe(plumber())
- .pipe(sass({outputStyle: 'compressed'}).on('error', sass.logError))
+ .pipe(sass({
+ outputStyle: 'compressed'
+ }).on('error', sass.logError))
.pipe(minifycss())
.pipe(autoprefixer({
browsers: ['last 5 versions'],
cascade: false
}))
- .pipe(gulp.dest(path.join(public_dir,"dist")));
+ .pipe(gulp.dest(path.join(public_dir, "dist")));
});
//预编译js
-gulp.task('js',function(cb){
- wconfig.output.path=path.join(public_dir,"dist");
+gulp.task('js', function(cb) {
+ wconfig.output.path = path.join(public_dir, "dist");
webpack(wconfig, cb);
});
//监控css和js
-gulp.task("default-watch",function(){
+gulp.task("default-watch", function() {
gulp.watch('sass/**/*.scss', ['sass']);
gulp.watch('js/**/*.js', ['js']);
});
-gulp.task("clean",function(){
- return gulp.src(dist_dir.js+"/", {read: false})
- .pipe(clean());
+gulp.task("clean", function() {
+ return gulp.src(dist_dir.js + "/", {
+ read: false
+ })
+ .pipe(clean());
});
//发布js文件
-gulp.task("buildjs",["js"],function(){
- gulp.src(path.join(public_dir,"dist") + '/*.js')
+gulp.task("buildjs", ["js"], function() {
+ gulp.src(path.join(public_dir, "dist") + '/*.js')
.pipe(uglify())
// .pipe(rename({
// suffix:md5
@@ -94,10 +97,10 @@ gulp.task('assets', function() {
gulp.src(public_dir + '/fonts/*')
.pipe(gulp.dest(dist_dir.font));
- gulp.src(path.join(public_dir,"dist") + '/*.css')
+ gulp.src(path.join(public_dir, "dist") + '/*.css')
.pipe(minifycss())
.pipe(gulp.dest(dist_dir.css));
-
+
// var str=fs.readFileSync(public_dir + '/css/all.css','utf-8');
// attr=str.replace(/(\ｎ|\r)*/g,'').replace(/(\n)+@import url\(\'/g,function(name){
// return public_dir + '/css/';
@@ -109,19 +112,19 @@ gulp.task('assets', function() {
});
//配置静态资源文件
-gulp.task("static-config",function(){
+gulp.task("static-config", function() {
// var files = fs.readdirSync('./dist/libs');
- var staticConfig={
- test:{
- path:'/dist'
+ var staticConfig = {
+ test: {
+ path: '/dist'
},
preview: {
path: cdn_domain + config.name + '/' + config.version,
- md5:md5
+ md5: md5
},
production: {
path: cdn_domain + config.name + '/' + config.version,
- md5:md5
+ md5: md5
}
}
fs.writeFileSync('../server/staticConfig.js', "exports.staticDir = " + JSON.stringify(staticConfig));
@@ -142,8 +145,8 @@ gulp.task('server', function() {
});
gulp.watch([
server_dir + '/app.js',
- server_dir+"/{interface,adapter,config,mid,stub,util}/**/*.js",
- server_dir+"/views/**/*.html"], server.restart);
-
-});
+ server_dir + "/{interface,adapter,config,mid,stub,util}/**/*.js",
+ server_dir + "/views/**/*.html"
+ ], server.restart);
+});
\ No newline at end of file
diff --git a/client/js/common/util.js b/client/js/common/util.js
index 0aab4f1..105cce4 100644
--- a/client/js/common/util.js
+++ b/client/js/common/util.js
@@ -41,7 +41,7 @@ var util = {
success: function(res) {
res = res.data;
if (res.code != 200) {
- util.__tip(res.message, "danger");
+ util.__tip(res.message, "warning");
} else {
return callback.bind(this, res)();
}
@@ -96,7 +96,6 @@ var util = {
},
__template2: function(str, source) {
// console.log(str);
- var result = "";
var script = [];
script.push('var each=function(obj,fn){');
script.push(' var that=this;');
@@ -112,65 +111,81 @@ var util = {
script.push(' }');
script.push(' return;');
script.push(' }');
- script.push('}');
- result = script.join('') + ";\n";
+ script.push('};');
var formstr = function(code) {
- return "'" + code
- .replace(/('|\\)/g, '\\$1')
- .replace(/\r/g, '\\r')
- .replace(/\n/g, '\\n') + "'";
+ return "'" + code
+ .replace(/('|\\)/g, '\\$1')
+ .replace(/\r/g, '\\r')
+ .replace(/\n/g, '\\n') + "'";
+ }
+ var formJs = function(code) {
+ var trim = code.replace(/^\s+|\s+$/, '');
+ //each goodsSizeList as item __index
+ if (/^each/.test(trim)) {
+ return trim.replace(/^each\b([\w\W]+)\bas\b([\w\W]+)\b([\w\W]+)/, function($0, $1, $2, $3) {
+ return 'each\( ' + $1 + ',function(' + $3 + ',' + $2 + '){';
+ });
+ } else if (/^\/each/.test(trim)) {
+ return trim.replace(/^\/each/, '});')
+ } else if (/^if/.test(trim)) {
+ return trim.replace(/^if(.+)/, function($0, $1) {
+ return 'if(' + $1 + '){';
+ });
+ } else if (/^\/if/.test(trim)) {
+ return trim.replace(/^\/if/, '};')
+ } else if (/^else$/.test(trim)) {
+ return trim.replace(/else/, '}else{');
+ } else {
+ return "result.push(" + code + ")";
+ }
}
- //获取参数
-
- var params = [];
-
+ // var PARAMS={};
+ var OBJECT = /\.\w+|'.*'|".*"/g;
+ var KEYWORDS = 'for,if,else,each,as';
+ var SPECHAR = /\W/g;
+ var NUMBER = /^\d[^,]*|,\d[^,]*/g;
+ var SPLIT2_RE = /^$|,+/;
+ var REGEXKEYWORDS = new RegExp("\\b" + [KEYWORDS.replace(/,/g, '\\b|\\b')].join('|'), 'g');
+ var getVar = function(code) {
+ var strArr = code.replace(OBJECT, '')
+ .replace(SPECHAR, ',')
+ .replace(REGEXKEYWORDS, '')
+ .replace(NUMBER, '')
+ .split(SPLIT2_RE);
+ for (var key in strArr) {
+ if (strArr[key] && !source.hasOwnProperty(strArr[key])) {
+ source[strArr[key]] = "";
+ }
+ }
+ }
- var html = "";
- html = str.replace(/\[\[(.*?)\]\]/igm, function(name, $1) {
- var trim = $1.replace(/^\s+|\s+$/, '');
- if (/^each/.test(trim)) {
- trim = trim.replace(/^each\s+([a-zA-Z0-1.]+)\s+as\s+(\w+)\s+(\w+)/, function($0, $1, $2, $3) {
- params.push($1);
- return 'each\( ' + $1 + ',function(' + $3 + ',' + $2 + '){';
- });
- return "[[" + trim + "]]";
- } else
- if (/^\/each/.test(trim)) {
- trim = trim.replace(/^\/each/, '});')
- return "[[" + trim + "]]";
- } else if (/^if/.test(trim)) {
- trim = trim.replace(/^if(.+)/, function($0, $1) {
- params.push($1);
- return 'if(' + $1 + '){';
- });
- return "[[" + trim + "]]";
- } else if (/^\/if/.test(trim)) {
- trim = trim.replace(/^\/if/, '};')
- return "[[" + trim + "]]";
- } else if (/^else$/.test(trim)) {
- trim = trim.replace(/else/, '}else{');
- return "[[" + trim + "]]";
+ var code = [],
+ params = {};
+ var arr = str.split(/\[\[|\]\]/).map(function(item, index) {
+ if (index % 2) {
+ return {
+ value: item,
+ regex: true
+ };
} else {
- params.push(trim);
- return "[[+" + trim + "+]]";
+ return {
+ value: item,
+ regex: false
+ };
}
});
- // console.log(params);
- //.match(/(\w+)+/g)
- for (var i in params) {
- var aps = params[i].split(/\+|\-|\*|\/|\=|\!|\~|'|"/g);
- for (var j in aps) {
- var ap = aps[j].replace(/^\s+|\s+$/, '');
- // console.log(":" + ap + ":");
- if (!/^[0-9]+$/.test(ap) && !/^\s*$/.test(ap) && !/\./g.test(ap)) {
- if (!source.hasOwnProperty(ap)) {
- source[ap] = "";
- // console.log(":" + ap + ":");
- }
- }
+
+ arr.forEach(function(item, index) {
+ if (item.regex) {
+ getVar(item.value);
+ code.push(formJs(item.value));
+ } else {
+ code.push("result.push(" + formstr(item.value) + ");");
}
- }
+ });
+ // var header="var result=[],";
+ // header+=Object.keys(source).join(',')+";"
var keys = [];
for (var key in source) {
@@ -180,55 +195,51 @@ var util = {
keys.push(key + "=" + JSON.stringify(source[key]));
}
}
- var header = "var " + keys.join(',') + ";";
+ var header = "var result=[]," + keys.join(',') + ";";
- html = html.replace(/(^|\]\])(.*?)(\[\[|$)/igm, function(name, $1, $2) {
- var trim = $2.replace(/^\s+|\s+$/, '');
- return trim ? formstr($2) : '';
- });
- // var result="var result='';result+=";
- var arr = html.split(/\n+/igm);
- result += "var p=[];\n";
- for (var i = 0; i < arr.length; i++) {
- if (/^'/.test(arr[i])) {
- result += "p.push(" + (arr[i]) + ");\n";
- } else {
- result += (arr[i]);
- }
- }
- result += "return p.join('');\n";
-
- // console.log(result);
+ var result = header + code.join('\n') + "return result.join('');";
- var fn = new Function(header + result);
- var b = fn.call(source);
- return b;
+ var fn = new Function(script.join('') + result);
+ return fn.call(source);
},
__input: function(id) {
return !!~$.trim($('#' + id).val()) ? $('#' + id).val() : ""
},
- __dateFormat:function(data,format) {
- var date = {
- "M+": data.getMonth() + 1,
- "d+": data.getDate(),
- "h+": data.getHours(),
- "m+": data.getMinutes(),
- "s+": data.getSeconds(),
- "q+": Math.floor((data.getMonth() + 3) / 3),
- "S+": data.getMilliseconds()
- };
- if (/(y+)/i.test(format)) {
- format = format.replace(RegExp.$1, (data.getFullYear() + '').substr(4 - RegExp.$1.length));
- }
- for (var k in date) {
- if (new RegExp("(" + k + ")").test(format)) {
- format = format.replace(RegExp.$1, RegExp.$1.length == 1
- ? date[k] : ("00" + date[k]).substr(("" + date[k]).length));
+ __dateFormat: function(data, format) {
+ if (!isNaN(data)) {
+ var date = {
+ "M+": data.getMonth() + 1,
+ "d+": data.getDate(),
+ "h+": data.getHours(),
+ "m+": data.getMinutes(),
+ "s+": data.getSeconds(),
+ "q+": Math.floor((data.getMonth() + 3) / 3),
+ "S+": data.getMilliseconds()
+ };
+ if (/(y+)/i.test(format)) {
+ format = format.replace(RegExp.$1, (data.getFullYear() + '').substr(4 - RegExp.$1.length));
+ }
+ for (var k in date) {
+ if (new RegExp("(" + k + ")").test(format)) {
+ format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? date[k] : ("00" + date[k]).substr(("" + date[k]).length));
+ }
}
+
+ return format;
+ } else {
+ return "";
+ }
+
+ },
+ __filterNull: function(obj, prop) {
+ // 判断item里面 instr属性是不是为空
+ if (obj[prop]) {
+ return obj[prop];
+ } else {
+ return "";
}
- return format;
}
}
module.exports = util;
\ No newline at end of file
diff --git a/client/js/goods/netsale-edit.js b/client/js/goods/netsale-edit.js
index ad171ec..57a5c47 100644
--- a/client/js/goods/netsale-edit.js
+++ b/client/js/goods/netsale-edit.js
@@ -7,7 +7,6 @@ require('../util/custom.js');
*/
window.NETSALEDATA = require('./partials/data.js');
-
window.GOLABDATA = {
on: function(key, callback) {
var that = this;
@@ -33,13 +32,17 @@ window.GOLABDATA = {
}
} else {
var map = {},
- args = [].slice.call(arguments, 1);
+ args = [].slice.call(arguments, 1),
+ listeners = null;
+
for (var key in that.registerEvent) {
- var listeners = that.registerEvent[key];
+ listeners = that.registerEvent[key];
for (var i in listeners) {
map[key] = listeners[i].apply(this, args);
}
}
+
+ console.log(map);
return map;
}
@@ -70,8 +73,12 @@ if ($('.contentpanel').data('type') == 'info') {
$('.contentpanel').find('input').prop('disabled', true);
$('.contentpanel').find('.btn').addClass('disabled');
$('.panel-footer').remove();
+ $('#edit-recommender, #edit-descriptioner').prop('contenteditable', false);
$('#saveAllInfo').hide();
+ $(".goods-img i").remove();
+ $("#search-key-list").hide();
+ $(".brand-list").hide();
// 上架审核的查看页面
if ($('.contentpanel').data('action') != 'audit') {
@@ -81,7 +88,7 @@ if ($('.contentpanel').data('type') == 'info') {
} else {
var status = NETSALEDATA.baseProductInfo.baseProduct.status;
//待审核状态 或者 再上架待审核
- if (status !=2 && status != 5) {
+ if (status != 2 && status != 5) {
$('#passBtn').hide();
$('#rejectBtn').hide();
}
@@ -93,10 +100,14 @@ if ($('.contentpanel').data('type') == 'info') {
$('#rejectBtn').hide();
}
+
+//保存完整网销信息
var e = new common.edit('#netsaleAllInfo');
$(document).on("click", "#saveAllInfo", function() {
var data = {};
- $.each(GOLABDATA.fire(), function(key, value) {
+ var allData = GOLABDATA.fire();
+
+ $.each(allData, function(key, value) {
if (typeof value == 'string') {
data = value;
return;
@@ -104,30 +115,20 @@ $(document).on("click", "#saveAllInfo", function() {
$.extend(data, value, true);
});
- /*common.util.__ajax({
- url: '/goods/product/saveNetSaleAllInfo',
- data: data
- }, function(res) {
-
-
-
- });*/
-
e.submit('/goods/product/saveNetSaleAllInfo', function(option) {
option.data = data;
option.success = function(res) {
res = res.data;
if (res.code == '200') {
e.$tip(res.message, function() {
- location.href = '/goods/netsale/index';
+ history.go(-1);
}, 'growl-success');
-
} else {
e.$tip(res.message);
}
return false;
}
- })
+ });
})
@@ -181,4 +182,28 @@ $(document).on("click", "#passBtn", function() {
};
}
Bll.toast("确定要通过该申请吗？", data);
-});
\ No newline at end of file
+});
+
+//类似描点跳转，描点会影响history.go(-1)
+$('.floatnav').on('click', 'li', function() {
+
+ var name = $(this).attr('name'),
+ scrollTop = $('.netsale-position[name="' + name + '"]').offset().top;
+
+ $(window).scrollTop(scrollTop);
+ return false;
+});
+
+//导航样式
+$('.floatnav').on('mouseenter', function() {
+ $('.floatnav').addClass('show');
+}).on('mouseleave', function() {
+ $('.floatnav').removeClass('show');
+});
+if (location.hash) {
+ var hashPos = location.hash.substring(1);
+ setTimeout(function() {
+ $('.floatnav').find('li[name="' + hashPos + '"]').trigger('click');
+ }, 500);
+
+}
\ No newline at end of file
diff --git a/client/js/goods/netsale.js b/client/js/goods/netsale.js
index 10e35dd..86a182a 100644
--- a/client/js/goods/netsale.js
+++ b/client/js/goods/netsale.js
@@ -36,18 +36,26 @@ var ENUM = {
'all': 0
},
isVIP: {
- 'N': '否',
- 'Y': '是'
+ "Y": "是",
+ "N": "否",
+ "B": "品牌设置"
}
};
var tabTree = new common.tabTree("#sortTree");
tabTree.init();
+
+
+/*new common.dropDown({
+ el: '#shopId',
+ ajax: 'shopsRest'
+});
+
new common.dropDown({
el: '#brandId',
ajax: 'brand'
-});
+});*/
var editPostion = '';
@@ -57,6 +65,7 @@ var t = new common.tab({
click: function() {
g.options.columns[11].hidden = true;
g.options.columns[8].hidden = true;
+ g.options.page = 1;
var columnname = $(this).find('a').attr('columnname');
if (columnname == 3) {
g.options.columns[11].hidden = false;
@@ -66,7 +75,10 @@ var t = new common.tab({
if (columnname == 1 || columnname == 2) {
editPostion = '#position9';
+ } else {
+ editPostion = '';
}
+
g.init($("#gridurl").val());
},
columns: [{
@@ -87,7 +99,7 @@ var t = new common.tab({
display: "上架后信息缺失({4})"
}, {
name: "all",
- value: '',
+ value: 'all',
display: "全部商品({all})"
}]
}).init(ENUM.tab);
@@ -99,7 +111,6 @@ var loadtab = function() {
common.util.__ajax({
url: '/goods/product/queryTabProductNum',
data: g.options.parms()
-
}, function(res) {
var __dt = $.extend({}, ENUM.tab, res.data);
t.init(__dt);
@@ -129,7 +140,8 @@ var g = new common.grid({
isOutLets: common.util.__input("isOutLets"),
productStatus: common.util.__input("productStatus"),
size: common.util.__input("size"),
- productStatusStr: t.value
+ productStatusStr: t.value,
+ tab: $('#basicTab').find('.active').index()
};
},
columns: [{
@@ -154,6 +166,7 @@ var g = new common.grid({
}
}, {
display: '商品信息',
+ width: '30%',
render: function(item) {
var productName = item.productName ? item.productName : '',
brandName = item.brandName ? item.brandName : '',
@@ -240,7 +253,7 @@ var g = new common.grid({
}
}, {
display: '上架状态',
- name: 'status', // -1待上架，2待审核，3驳回，4通过，1已上架，0已下架，5再上架待审核，6再上架驳回，7再上架通过。
+ name: 'status', // 8待上架，2待审核，3驳回，4通过，1已上架，0已下架，5再上架待审核，6再上架驳回，7再上架通过。
render: function(item) {
var html = '';
if (ENUM.status[item.status]) {
@@ -265,12 +278,12 @@ var g = new common.grid({
render: function(item) {
var HtmArr = [];
- if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 0 || item.status == 6) {
+ if (item.status == 4 || item.status == 1 || item.status == 5 || item.status == 6) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
- HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-skn="' + item.productSkn + '">下架</a>');
- } else if (item.status == 3 || item.status == 8 || item.status == 2) {
+ HtmArr.push('<a href="javascript:;" class="btn btn-danger btn-xs shelve-btn" data-index="' + item.__index + '">下架</a>');
+ } else if (item.status == 3 || item.status == 8 || item.status == 2 || item.status == 0) {
HtmArr.push('<a href="/goods/netsale/edit/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs edit-btn">编辑</a>');
- HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-skn="' + item.productSkn + '">上架</a>');
+ HtmArr.push('<a href="javascript:;" class="btn btn-success btn-xs shelve-btn" data-index="' + item.__index + '">上架</a>');
}
HtmArr.push('<a href="/goods/netsale/info/' + item.productSkn + editPostion + '" class="btn btn-info btn-xs info-btn">查看</a>');
return HtmArr.join('');
@@ -305,7 +318,7 @@ function shelveModal(title, html) {
});
shelveLayer = common.dialog.open({
- title: '上架',
+ title: title,
content: html
});
@@ -328,7 +341,12 @@ function shelveModal(title, html) {
g.reload();
}, 'growl-success');
} else {
- e.$tip(res.data.message);
+ //e.$tip(res.data.message);
+ var html = '';
+ $.each(res.data.data, function(key, value) {
+ html += key + ':' + value + '<br>';
+ });
+ e.$tip(html);
}
}
});
@@ -351,10 +369,8 @@ $('#export-btn').on('click', function() {
len = selectedArr.length,
data = g.options.parms();
-
-
$.each(data, function(key, value) {
- if (value && value != '' && key != 'size') {
+ if (value && value != '' && key != 'size' && key != 'tab') {
count++;
}
});
@@ -375,101 +391,134 @@ $('#export-btn').on('click', function() {
window.open("/ajax/down?queryConf=" + JSON.stringify(data) + "&type=netSale");
});
+//sku skc上架表格
+var shelveTable = new common.grid({
+ el: "#shelve-table",
+ secondIndex: 2,
+ columns: [{
+ display: 'SKC（商品信息）',
+ render: function(item) {
+
+ return 'SKC：' + item.productSkc + '<br>' +
+ '颜色：' + item.goodsName;
+ }
+ }, {
+ display: 'SKC上架操作（状态）',
+ render: function(item) {
+ if (item.status == 0) {
+ return '<a class="btn btn-success btnskc" data-type="1" data-index="' + item.__index + '" href="javascript:;">点击上架</a>';
+ } else {
+ return '<a class="btn btn-danger btnskc" data-type="0" data-index="' + item.__index + '" href="javascript:;">点击下架</a>';
+ }
+ }
+ }, {
+ display: '<div class="subhhead"><span>SKU</span><span>尺码</span><span>库存</span><span>SKU上架操作</span><span>SKU上架操作</span></div>',
+ render: function(item) {
+ console.log(item);
+ return common.util.__template2($("#template2").html(), item)
+ }
+ }]
+});
+
+/*代码优惠*/
+var goodsList = {},
+ shelveLayer = null;
//单个sku,skc上下架
$('#basicTable').on('click', '.shelve-btn', function() {
- var that = this,
- skn = $(this).data('skn'),
- shelveModalHtml = '',
- shelveLayer = null;
+ var item = g.rows[$(this).data("index")];
+
+ var that = this;
$(that).addClass('disabled');
- common.util.__ajax({
- url: '/goods/netsale/getdata',
- data: {
- param: skn
- }
- }, function(res) {
- shelveModalHtml = common.util.__template($('#template').html(), res.data.baseProductInfo.baseProduct);
+ getdata(item.productSkn, function(res) {
shelveLayer = common.dialog.open({
title: '上/下架',
width: 900,
- content: shelveModalHtml
+ content: common.util.__template($('#template').html(), res.data.baseProductInfo.baseProduct)
});
$(that).removeClass('disabled');
+ goodsList = res.data.goodsList;
+ shelveTable.init(goodsList);
+ });
- var shelveTable = new common.grid({
- el: "#shelve-table",
- secondIndex: 2,
- columns: [{
- display: 'SKC（商品信息）',
- render: function(item) {
-
- return 'SKC：' + item.productSkc + '<br>' +
- '颜色：' + item.goodsName;
- }
- }, {
- display: 'SKC上架操作（状态）',
- render: function(item) {
- if (item.status == 0) {
- return '<a class="btn btn-success" data-type="1" data-skc="' + item.productSkc + '" href="javascript:;">点击上架</a>';
- } else {
- return '<a class="btn btn-danger" data-type="0" data-skc="' + item.productSkc + '" href="javascript:;">点击下架</a>';
- }
- }
- }, {
- display: 'SKU',
- name: 'productSku'
- }, {
- display: '尺码',
- name: 'sizeName'
- }, {
- display: '库存',
- name: 'stock'
- }, {
- display: 'SKU上架操作',
- render: function(item) {
- if (item.status == 0) {
- return '下架';
- } else {
- return '上架';
- }
- }
- }, {
- display: 'SKU上架操作',
- render: function(item) {
- if (item.status == 0) {
- return '<a class="btn btn-success" data-type="1" data-sku="' + item.productSku + '" href="javascript:;">上架</a>';
- } else {
- return '<a class="btn btn-danger" data-type="0" data-sku="' + item.productSku + '" href="javascript:;">下架</a>';
- }
- }
- }]
- });
- shelveTable.init(res.data.goodsList, 'goodsSizeList');
-
- $('#shelve-table').on('click', '.btn', function() {
- var param = {},
- reqUrl = '';
- if ($(this).data('skc')) {
- param.productSkc = $(this).data('skc');
- reqUrl = '/goods/product/updateGoodsStatus';
- } else if ($(this).data('sku')) {
- param.productSku = $(this).data('sku');
- reqUrl = '/goods/product/updateProductSkuStatus';
- }
+});
- param.targetStatus = $(this).data('type');
- common.util.__ajax({
- url: reqUrl,
- data: param
- }, function(res) {
- if (res.code == 200) {
- shelveLayer.close();
- }
- })
- })
+function getdata(Skn, callback) {
+ common.util.__ajax({
+ url: '/goods/netsale/getdata',
+ data: {
+ param: Skn
+ }
+ }, function(res) {
+ callback && callback(res);
}, true);
+}
+
+
+$(document).on("click", ".btnskc", function() {
+ var item = goodsList[$(this).data("index")];
+ console.log(item);
+ common.util.__ajax({
+ url: '/goods/product/updateGoodsStatus',
+ data: {
+ productSkc: item.productSkc,
+ targetStatus: item.status ? 0 : 1
+ }
+ }, function(res) {
+ if (res.code == 200) {
+ getdata(item.productSkn, function(res) {
+ goodsList = res.data.goodsList;
+ shelveTable.init(res.data.goodsList);
+ });
+
+ }
+ })
+});
+
+$(document).on("click", ".btnsku", function() {
+ var item = goodsList[$(this).data("index")]
+ var item1 = item.goodsSizeList[$(this).data("subindex")];
+ common.util.__ajax({
+ url: '/goods/product/updateProductSkuStatus',
+ data: {
+ productSku: item1.productSku,
+ targetStatus: item1.status ? 0 : 1
+ }
+ }, function(res) {
+ if (res.code == 200) {
+ getdata(item.productSkn, function(res) {
+ goodsList = res.data.goodsList;
+ console.log(goodsList);
+ shelveTable.init(res.data.goodsList);
+ });
+ }
+ })
+});
+
+$(document).on("change", ".wqt_checkbox,.wqt_all", function() {
+ var _count1 = 0,
+ _count2 = 0;
+ $.each(g.selected, function(index, item) {
+ /*添加兼容逻辑*/
+ if (item.status == 8 || item.status == 3 || item.status == 2 || item.status == 0) {
+ _count1++; //上
+ } else {
+ _count2++; //下
+ }
+ });
+
+ if (_count1 == g.selected.length) {
+ $('#onshelve').removeClass('disabled');
+ } else {
+ $('#onshelve').addClass('disabled');
+ }
+
+ if (_count2 == g.selected.length) {
+ $('#offshelve').removeClass('disabled');
+ } else {
+ $('#offshelve').addClass('disabled');
+ }
});
\ No newline at end of file
diff --git a/client/js/goods/partials/add-info.js b/client/js/goods/partials/add-info.js
index 19687d7..7ceb798 100644
--- a/client/js/goods/partials/add-info.js
+++ b/client/js/goods/partials/add-info.js
@@ -8,6 +8,8 @@ var e = new common.edit('#addinfo-wrap'),
comfort = NETSALEDATA.specialAttrBo ? NETSALEDATA.specialAttrBo.wearSenses : "";
+
+/*上架补全信息*/
$('#saveAddInfo').on('click', function() {
e.submit('/goods/product/saveAfterSaleInfo', function(option) {
option.data = GOLABDATA.fire('LYaddInfo');
@@ -31,7 +33,8 @@ GOLABDATA.on("LYaddInfo", function() {
}
});
option.data.productSkn = $('#productSkn').val();
- option.data.wearSense = sense();
+ //option.data.wearSense = sense();
+ option.data.attributeProValuesTwo = JSON.stringify(attributeObj());
function sense() {
@@ -50,7 +53,19 @@ GOLABDATA.on("LYaddInfo", function() {
} else {
return '';
}
+ }
+ function attributeObj() {
+ var attributeArr = [];
+ $('.attribute-group').each(function() {
+ attributeArr.push({
+ productSkn: option.data.productSkn,
+ attributeId: $(this).find('[id]').attr('id'),
+ attributeValueId: $(this).find('[id]').val().split('|').join(',')
+ })
+ });
+
+ return attributeArr;
}
option.debug = true;
});
@@ -61,8 +76,8 @@ $.ajax({
url: '/goods/product/queryAfterSaleInfo',
data: {
saleType: 2,
- displayPosition: 2,
- categoryId: basicInfo.maxSortId
+ displayPosition: 3,
+ categoryId: basicInfo.smallSortId
},
dataType: 'json',
success: function(res) {
@@ -88,6 +103,17 @@ $.ajax({
}
});
+ if (NETSALEDATA.attributeProValuesBosTwo) {
+ $.each(NETSALEDATA.attributeProValuesBosTwo, function(i, value) {
+ $.each(data.attributes.data, function(i2, value2) {
+ if (value.attributeId == value2.attributeId) {
+ value2.selectedValues = value.attributeValueId.replace(/,/g, "|");
+ }
+ });
+ });
+ }
+
+
$.each(data.productComfort.data, function(index, item) {
if (comfort && comfort[index]) {
@@ -133,14 +159,87 @@ $.ajax({
brandId: basicInfo.brandId
}
});
+
+ e.init();
+
if ($('.contentpanel').data('type') == 'info') {
$('.contentpanel').find('input').prop('disabled', true);
$('.contentpanel').find('select').prop('disabled', true);
$('.contentpanel').find('.btn').addClass('disabled');
+ $('#addinfo-wrap').find('input').not(":checked").parents('label').hide();
}
- e.init();
+ }
+});
+
+
+//去编辑商品名称
+$('#editProductName').on('click', function() {
+ $('#productName').focus();
+})
+
+
+/*商品参数*/
+var goodsParamArr = [];
+var goodsParamEdit = new common.edit('#goodsParamWrap');
+common.util.__ajax({
+ url: '/goods/product/queryAttributesByConfEx',
+ data: {
+ saleType: 2,
+ displayPosition: 2,
+ categoryId: basicInfo.smallSortId
+ }
+}, function(res) {
+ var data = res.data;
+ if (NETSALEDATA.attributeProValuesBosOne) {
+ $.each(NETSALEDATA.attributeProValuesBosOne, function(i, value) {
+ $.each(data, function(i2, value2) {
+ if (value.attributeId == value2.attributeId) {
+ value2.selectedValues = value.attributeValueId.replace(/,/g, "|");
+ }
+ });
+ });
+ }
+ if (res.data.length == 0) {
+ $("#goodsParams-footer").hide();
+ }
+ $('#goodsParamWrap').html(common.util.__template2($('#goodsParamTemp').html(), {
+ data: data
+ }));
+ goodsParamEdit.init();
+
+ if ($('.contentpanel').data('type') == 'info') {
+ $('.contentpanel').find('input').prop('disabled', true);
+ $('.contentpanel').find('select').prop('disabled', true);
+ $('.contentpanel').find('.btn').addClass('disabled');
+ $('#goodsParamWrap').find('input').not(":checked").parents('label').hide();
}
-})
\ No newline at end of file
+
+
+}, true);
+
+
+GOLABDATA.on("TYcaizhi", function() {
+ var a = goodsParamEdit.submit(false, function(option) {
+ $('.goods-param-group').each(function() {
+ goodsParamArr.push({
+ productSkn: $('#productSkn').val(),
+ attributeId: $(this).find(':hidden').attr('id'),
+ attributeValueId: $(this).find(':hidden').val().split('|').join(',')
+ });
+ });
+ option.data.attributeProValuesOne = JSON.stringify(goodsParamArr);
+ option.data.productSkn = $('#productSkn').val();
+ option.debug = true;
+ });
+ return a ? a : goodsParamEdit.errMessage;
+});
+
+$("#propertySave").on('click', function() {
+ common.util.__ajax({
+ url: '/netSale/saveProductParam',
+ data: GOLABDATA.fire('TYcaizhi')
+ }, function() {});
+});
\ No newline at end of file
diff --git a/client/js/goods/partials/basic-info.js b/client/js/goods/partials/basic-info.js
index bc2f3cb..78478e2 100644
--- a/client/js/goods/partials/basic-info.js
+++ b/client/js/goods/partials/basic-info.js
@@ -2,6 +2,12 @@ var $ = require('jquery'),
common = require('../../common/common');
var basicInfohtml = '',
+ ENUM = {
+ isSuppled: {
+ 'Y': '是',
+ 'N': '否'
+ }
+ },
convertObj = {
ageLevel: {
'1': '成人',
@@ -15,11 +21,12 @@ var basicInfohtml = '',
},
grade: {
'1': '是',
- 'null': '否'
+ '0': '否'
},
isOutLets: {
'Y': '是',
- 'N': '否'
+ 'N': '否',
+ 'B': '品牌设置'
},
isLimited: {
'Y': '是',
@@ -40,6 +47,27 @@ var basicInfohtml = '',
attribute: {
1: '普通',
2: '赠品'
+ },
+ goodsSeason: {
+ 0: '四季',
+ 1: '春',
+ 2: '夏',
+ 3: '秋',
+ 4: '冬',
+ 5: '春夏',
+ 6: '秋冬'
+ },
+ seasons: {
+ 'seasons': '四季',
+ 'spring': '春',
+ 'summer': '夏',
+ 'autumn': '秋',
+ 'winter': '冬'
+ },
+ isVip: {
+ 'Y': '是',
+ 'N': '否',
+ 'B': '品牌设置'
}
},
basicInfo = NETSALEDATA.baseProductInfo.baseProduct || '',
@@ -58,7 +86,10 @@ function convert(basicInfo, obj) {
return basicInfo;
}
+
var basicInfoData = convert(basicInfo, convertObj);
+basicInfoData.expectArrivalTime = common.util.__dateFormat(new Date(basicInfoData.expectArrivalTime * 1000), "yyyy-MM-dd hh:mm:ss");
+basicInfoData.expectShelfTime = common.util.__dateFormat(new Date(basicInfoData.expectShelfTime * 1000), "yyyy-MM-dd hh:mm:ss");
//基本信息
basicInfoData.renderType = $('.contentpanel').data('type');
@@ -66,17 +97,34 @@ basicInfohtml = common.util.__template2($('#basicInfo').html(), basicInfoData);
$('#basic-info').html(basicInfohtml);
//能否补货
-$('#goods-table').html(common.util.__template2($('#goodsList').html(), {
- goodsList: NETSALEDATA.goodsList
-}));
+var suppledTable = new common.grid({
+ el: '#suppled-table',
+ hash: false,
+ secondIndex: 1,
+ columns: [{
+ display: 'SKC(厂家颜色)',
+ render: function(item) {
+ return item.productSkc + '（' + item.goodsName + '）';
+ }
+ }, {
+ display: 'SKU(尺码)',
+ render: function(item) {
+ return item.productSku + '（' + item.sizeName + '）';
+ }
+ }, {
+ display: '能否补货',
+ render: function(item) {
+ return ENUM.isSuppled[item.isSuppled];
+ }
+ }]
+});
+suppledTable.init(NETSALEDATA.goodsList, 'goodsSizeList')
//上架必填
productExtBo.renderType = $('.contentpanel').data('type');
productExtBo.sellChannels = productExtBo.sellChannels ? productExtBo.sellChannels.replace(/,/g, "|") : '';
-productExtBo.shopIds = productExtBo.shopIdList ? productExtBo.shopIdList.join('|') : '';
-//productExtBo.shopList =
-
+//productExtBo.shopList =
common.util.__ajax({
url: '/goods/ShopsRest/queryShopsByBrandId',
data: {
@@ -84,13 +132,23 @@ common.util.__ajax({
}
}, function(res) {
productExtBo.shopList = res.data;
+ productExtBo.shopIds = '';
+ if (productExtBo.shopIdList && productExtBo.shopIdList.length > 0) {
+ //如有选择店铺
+ productExtBo.shopIds = productExtBo.shopIdList ? productExtBo.shopIdList.join('|') : '';
+ } else if (res.data.length > 0) {
+ //如没有已选择店铺，默认选择全部
+ $.each(res.data, function(i, value) {
+ productExtBo.shopIds += value.shopsId + '|';
+ });
+ }
+ //
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
e.init();
}, true);
-
$('#product-ext').html(common.util.__template2($('#productExtBoTemp').html(), productExtBo));
-
+//如果是info页，所有input btn置灰
if ($('.contentpanel').data('type') == 'info') {
$('.contentpanel').find('input').prop('disabled', true);
$('.contentpanel').find('.btn').addClass('disabled');
@@ -99,6 +157,7 @@ if ($('.contentpanel').data('type') == 'info') {
var e = new common.edit('#basicInfoWrap');
e.init();
+//保存基本信息
$('#saveBasicInfo').on('click', function() {
e.submit('/goods/product/saveNetSaleBaseInfo', function(option) {
option.data = GOLABDATA.fire("LYbasicInfo");;
@@ -130,6 +189,5 @@ GOLABDATA.on("LYbasicInfo", function() {
data[key] = $(this).val().split('|').join(',');
}
});
- console.log(data);
return data;
});
\ No newline at end of file
diff --git a/client/js/goods/partials/brand-relation.js b/client/js/goods/partials/brand-relation.js
index 633e506..efc547b 100644
--- a/client/js/goods/partials/brand-relation.js
+++ b/client/js/goods/partials/brand-relation.js
@@ -4,6 +4,7 @@ var $ = require('jquery'),
var e = new common.edit('#brandWrap'),
brandSelectArr = [];
+
common.util.__ajax({
url: '/goods/brands/queryBrandsByStatus'
}, function(res) {
@@ -25,9 +26,13 @@ common.util.__ajax({
map['0-9'].push(item);
}
});
- $('.brand-list').html(common.util.__template2($('#brandTemp').html(), {
+
+ var brandHtml = common.util.__template2($('#brandTemp').html(), {
map: map
- }));
+ });
+ // var docFrag = new DocumentFragment();
+ // docFrag.firstChild.nodeValue = brandHtml;
+ $('#brand-list').html(brandHtml);
if (NETSALEDATA.brandRelationList) {
$('.selected-brand').html(common.util.__template2($('#brandShowTemp').html(), {
@@ -76,9 +81,14 @@ $('#saveBrandRelation').on('click', function() {
});
GOLABDATA.on("LYbrandRelation", function() {
- return e.submit('', function(option) {
+ return {
+ productSkn: $('#productSkn').val(),
+ brandRelationList: JSON.stringify($('#brandRelationList').val().split('|'))
+ }
+
+ /*return e.submit('', function(option) {
option.data.productSkn = $('#productSkn').val();
option.data.brandRelationList = JSON.stringify(option.data.brandRelationList.split('|'));
option.debug = true;
- });
+ });*/
});
\ No newline at end of file
diff --git a/client/js/goods/partials/editor_recommend.js b/client/js/goods/partials/editor_recommend.js
index 8a040ef..ea7488a 100644
--- a/client/js/goods/partials/editor_recommend.js
+++ b/client/js/goods/partials/editor_recommend.js
@@ -8,6 +8,8 @@ require('../../common/zh-cn');
var productSkn, BUCKET = {
bucket: "goodsimg"
};
+
+var editType = $('.contentpanel').data('type');
if (window.NETSALEDATA && window.NETSALEDATA.baseProductInfo && window.NETSALEDATA.baseProductInfo.baseProduct.productSkn) {
productSkn = window.NETSALEDATA.baseProductInfo.baseProduct.productSkn;
}
@@ -18,6 +20,8 @@ window.UMdescriptioner = UM.getEditor('edit-descriptioner');
if (window.NETSALEDATA && window.NETSALEDATA.productExtBo.productDesc && window.NETSALEDATA.productExtBo.productDesc) {
UMdescriptioner.setContent(window.NETSALEDATA.productExtBo.productDesc)
}
+
+
$(document).on("click", "#btn-descriptioner", function() {
common.util.__ajax({
url: '/netSale/saveProductDesc',
@@ -31,11 +35,12 @@ $(document).on("click", "#btn-descriptioner", function() {
return false;
});
-window.UMrecommender = UM.getEditor('edit-recommender');
/*小编推荐*/
+window.UMrecommender = UM.getEditor('edit-recommender');
if (window.NETSALEDATA && window.NETSALEDATA.productExtBo && window.NETSALEDATA.productExtBo.recommend) {
UMrecommender.setContent(window.NETSALEDATA.productExtBo.recommend);
}
+
$(document).on("click", "#btn-recommand", function() {
common.util.__ajax({
url: '/netSale/saveNetSaleRecommend',
@@ -50,12 +55,29 @@ $(document).on("click", "#btn-recommand", function() {
});
GOLABDATA.on("bianjiqi", function() {
+ /*if (UMdescriptioner.getContent() != '') {
+ return {
+ recommend: UMrecommender.getContent(),
+ productDesc: UMdescriptioner.getContent()
+ }
+ } else {
+ common.util.__tip('商品描述不可为空', 'warning');
+ return;
+ }
+*/
+
+ $('#productDesc').val(UMdescriptioner.getContent());
return {
recommend: UMrecommender.getContent(),
- productDesc: UMdescriptioner.getContent()
+ productDesc: $('#productDesc').val()
}
+
});
+if (editType == 'info') {
+ window.UMrecommender.setDisabled('fullscreen');
+ window.UMdescriptioner.setDisabled('fullscreen');
+}
/*逛*/
common.util.__ajax({
url: '/goods/article/queryArticlesBySKN',
@@ -96,15 +118,22 @@ var g = new common.grid({
}, {
display: "发表时间",
render: function(item) {
+ var date = new Date(item.createTime * 1000);
return common.util.__dateFormat(new Date(item.createTime * 1000), "yyyy-MM-dd hh:mm:ss");
+ //return date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + date.getHours() + ':' + date.getMinutes() + ':' + date.getSeconds();
}
}, {
display: "操作",
render: function(item) {
var html = [];
- html.push('<button type="button" data-index="' + item.__index + '" class="delete btn btn-danger btn-xs">删除</button>');
- html.push('<button type="button" data-index="' + item.__index + '" class="edit btn btn-info btn-xs">修改</button>');
- return html.join(',');
+ if (editType == 'edit') {
+ html.push('<button type="button" data-index="' + item.__index + '" class="delete btn btn-danger btn-xs">删除</button>');
+ html.push('<button type="button" data-index="' + item.__index + '" class="edit btn btn-info btn-xs">修改</button>');
+ return html.join(',');
+ } else {
+ return '';
+ }
+
}
}]
});
@@ -118,11 +147,12 @@ var Bll = {
var d = new common.dialog({
title: title,
- width: '60%',
+ width: '800px',
content: common.util.__template2($("#wqt-template1").html(), item),
button: [{
value: "提交",
callback: function() {
+
e.submit(url, function(option) {
option.data.id = item.id;
option.data.productSkn = productSkn;
@@ -162,7 +192,9 @@ var Bll = {
$(document).on("dblclick", ".poseditimg img", function(e) {
var pos = {
top: e.pageY - $(this).offset().top,
- left: e.pageX - $(this).offset().left
+ left: e.pageX - $(this).offset().left,
+ width: 150,
+ height: 150
}
Bll.posData.push(pos);
var _pos = $(common.util.__template2($("#kapian").html(), {
@@ -182,6 +214,10 @@ $(document).on("click", ".poseditimg .close", function(e) {
});
$(document).on("change", ".poseditimg .pos-text", function() {
var item = Bll.posData[$(this).data("index")];
+ /*if ($.trim($(this).val()).length > 8) {
+ common.util.__tip('skn不能超过8位', 'warning');
+ return;
+ };*/
item.id = $(this).val();
});
@@ -210,12 +246,13 @@ $(document).on("click", "#dapeiTable .delete", function() {
//修改
$(document).on("click", "#dapeiTable .edit", function() {
var item = g.rows[$(this).data("index")];
- common.util.__ajax({
+ common.util.__ajax2({
url: '/netSale/selectCollocationById',
data: {
param: item.id
}
}, function(data) {
+ console.log(data.data);
Bll.toast("添加搭配", data.data, "/netSale/updateCollocation");
});
// item.infoStr=[{"top":223,"left":380,"id":"ffffff"},{"top":454,"left":309,"id":"ggggg"}];
@@ -238,7 +275,7 @@ common.edit.ajaxfileupload(".fenmianfile", {
__type: "upload",
bucket: "goodsimg"
},
- valid_extensions: ['gif', 'png', 'jpg', 'jpeg'],
+ valid_extensions: ['png', 'jpg', 'jpeg'],
onComplete: function(response) {
console.log(response);
if (response.status && response.code == 200) {
@@ -257,54 +294,73 @@ common.edit.ajaxfileupload(".fenmianfile", {
item.push(data);
goodsList[$(this).data("index")].goodsImagesList = item;
$(this).parents(".cover-image-item").before(common.util.__template2($("#fenmianImgTemp").html(), data));
- $('#cover-color').append($($('#colorCoverTemp').html()));
} else {
- common.util.__tip(response.message);
+ common.util.__tip(response.message, 'warning');
}
}
});
-
-$('#cover-color').on("click", ".btn-metro", function() {
- var index = $(this).parents(".form-group").siblings().find('.cover-image-list').data("index");
- var index1 = $(this).parents(".cover-color-box").index();
+//颜色封面点击事件
+$('.cover-image-list').on("click", ".btn-metro", function() {
+ var index = $(this).parents(".cover-image-list").data("index");
+ var index1 = $(this).parents(".cover-image-item").index();
var item = goodsList[index].goodsImagesList[index1];
- var $groups = $(this).parents(".cover-color-box");
var colorIndex = $(this).index();
if ($(this).hasClass('info')) {
$(this).removeClass('info');
} else {
- $('.cover-color-box').each(function() {
+ $(this).parents('.cover-image-item').siblings().each(function() {
$(this).find('.btn-metro').eq(colorIndex).removeClass('info');
});
-
$(this).siblings('.btn-metro').removeClass('info').end().addClass('info');
}
- item.isDefault = $groups.find('.btn-metro').eq(0).hasClass('info') ? 'Y' : 'N';
+ var isDefault = $(this).parents('.cover-color').find('.btn-metro').eq(0).hasClass('info') ? 'Y' : 'N';
+ var genderCover = $(this).parents('.cover-color').find('.info').index() >= 0 ? $(this).parents('.cover-color').find('.info').index() : 0;
+
+ $.each(goodsList[index].goodsImagesList, function(i, value) {
+ if (value.genderCover == genderCover) {
+ value.genderCover = 0;
+ }
+ if (value.isDefault == isDefault) {
+ value.isDefault = 'N';
+ }
+ });
+
+ item.genderCover = genderCover;
+ item.isDefault = isDefault;
- if ($groups.find('.btn-metro').eq(1).hasClass('info')) {
- item.genderCover = 1;
- } else if (item.genderCover = $groups.find('.btn-metro').eq(2).hasClass('info')) {
- item.genderCover = 2;
- } else {
- item.genderCover = 0;
- }
});
-$(document).on("click", ".goods-color a", function() {
+//商品封面点击事件
+$(document).on("click", ".cover-goods a", function() {
var index = $(this).data("index");
var item = goodsList[index];
if ($(this).hasClass("info")) {
$(this).removeClass("info");
} else {
+ $('.cover-goods a').removeClass("info");
$(this).addClass("info");
}
item.isDefault = $(this).hasClass("info") ? "Y" : "N";
});
+
+//封面图删除
+$(document).on('click', '.remove-item-btn', function() {
+ var index = $(this).parents(".cover-image-list").data("index");
+ var index1 = $(this).parents(".cover-image-item").index();
+ $(this).parents('.cover-image-item').remove();
+ goodsList[index].goodsImagesList.splice(index1, 1);
+ console.log(goodsList[index].goodsImagesList);
+});
+
+//单独保存封面
$(document).on("click", "#fenMainSave", function() {
var data = GOLABDATA.fire("fenmian");
+ if (typeof data == "undefined") {
+ return false;
+ }
common.util.__ajax({
url: '/netSale/manageProductImg',
data: data
@@ -317,16 +373,14 @@ GOLABDATA.on("fenmian", function() {
goodsImagesBoList: []
};
-
-
$.each(goodsList, function(index, item) {
if (item.isDefault == "Y") {
map.productSkc = item.productSkc;
map.productSkn = item.productSkn;
}
- if (!item.goodsImagesList) {
- common.util.__tip('请设置skc:' + item.productSkc + '的封面', 'danger');
+ if (!item.goodsImagesList || item.goodsImagesList == 0) {
+ common.util.__tip('请设置skc:' + item.productSkc + '的封面', 'warning');
return;
}
$.each(item.goodsImagesList, function(_index, _item) {
diff --git a/client/js/goods/partials/goods-params.js b/client/js/goods/partials/goods-params.js
index 56f44b2..9c157e6 100644
--- a/client/js/goods/partials/goods-params.js
+++ b/client/js/goods/partials/goods-params.js
@@ -1,4 +1,4 @@
-var $ = require('jquery'),
+/*var $ = require('jquery'),
common = require('../../common/common');
var specialAttrBo = window.NETSALEDATA.specialAttrBo || {
@@ -9,8 +9,6 @@ var specialAttrBo = window.NETSALEDATA.specialAttrBo || {
var washTipsList = specialAttrBo.washTipsList;
var materialList = specialAttrBo.materialList;
-console.log(window.NETSALEDATA);
-
var e = new common.edit("#taoyu1");
common.util.__ajax({
@@ -59,6 +57,7 @@ common.util.__ajax({
});
}, true);
+
$("#propertySave").on('click', function() {
var washTips = $("#washTips").val() || "";
@@ -74,4 +73,4 @@ $("#propertySave").on('click', function() {
}, function() {
// body...
});
-});
\ No newline at end of file
+});*/
\ No newline at end of file
diff --git a/client/js/goods/partials/netsale-ty.js b/client/js/goods/partials/netsale-ty.js
index c150e0a..589253b 100644
--- a/client/js/goods/partials/netsale-ty.js
+++ b/client/js/goods/partials/netsale-ty.js
@@ -1,97 +1,97 @@
var $ = require('jquery'),
- common = require('../../common/common');
+ common = require('../../common/common'),
+ util = require('../../common/util');
if (window.NETSALEDATA) {
- { //商品参数
- var baseProduct = window.NETSALEDATA.baseProductInfo.baseProduct;
- var specialAttrBo = {
- productSkn: baseProduct.productSkn,
- washTipsList: [],
- materialList: []
- };
- if (window.NETSALEDATA.specialAttrBo) {
- specialAttrBo = window.NETSALEDATA.specialAttrBo;
- }
- var washTipsList = specialAttrBo.washTipsList || [];
- var materialList = specialAttrBo.materialList || [];
-
- var e = new common.edit("#taoyu1");
-
- //材质初始化
- common.util.__ajax({
- url: '/netSale/queryAllBySortId4Select',
- data: {
- param: baseProduct.maxSortId
- }
- }, function(res) {
- $("#material-group").html(common.util.__template2($("#material-params").html(), res || {}));
- var materials = [];
- for (var i = 0; i < materialList.length; i++) {
- materials[i] = materialList[i].id;
- }
- $("#material").val(materials.join("|"));
- e.init();
- }, true);
+ //{ //商品参数
+ /*var baseProduct = window.NETSALEDATA.baseProductInfo.baseProduct;
+ var specialAttrBo = {
+ productSkn: baseProduct.productSkn,
+ washTipsList: [],
+ materialList: []
+ };
+ if (window.NETSALEDATA.specialAttrBo) {
+ specialAttrBo = window.NETSALEDATA.specialAttrBo;
+ }
+ var washTipsList = specialAttrBo.washTipsList || [];
+ var materialList = specialAttrBo.materialList || [];
- //洗涤提示初始化
- common.util.__ajax({
- url: '/netSale/getAll4Select',
- data: {}
- }, function(res) {
- $("#washTip-group").html(common.util.__template2($("#washTip-params").html(), res || {}));
- var washTips = [];
- for (var i = 0; i < washTipsList.length; i++) {
- washTips[i] = washTipsList[i].sortId;
- }
- $("#washTips").val(washTips.join("|"));
- e.init();
- }, true);
+ var e = new common.edit("#taoyu1");
+ //材质初始化
+ common.util.__ajax({
+ url: '/netSale/queryAllBySortId4Select',
+ data: {
+ param: baseProduct.maxSortId
+ }
+ }, function(res) {
+ $("#material-group").html(common.util.__template2($("#material-params").html(), res || {}));
+ var materials = [];
+ for (var i = 0; i < materialList.length; i++) {
+ materials[i] = materialList[i].id;
+ }
+ $("#material").val(materials.join("|"));
+ e.init();
+ }, true);
+
+ //洗涤提示初始化
+ common.util.__ajax({
+ url: '/netSale/getAll4Select',
+ data: {}
+ }, function(res) {
+ $("#washTip-group").html(common.util.__template2($("#washTip-params").html(), res || {}));
+ var washTips = [];
+ for (var i = 0; i < washTipsList.length; i++) {
+ washTips[i] = washTipsList[i].sortId;
+ }
+ $("#washTips").val(washTips.join("|"));
+ e.init();
+ }, true);
- $(document).on('change', '.material', function() {
- var items = $("#material").val().split("|");
- for (var i = 0; i < items.length; i++) {
- materialList[i] = {
- "id": parseInt(items[i])
- };
- }
- });
- $(document).on('change', '.washTips', function() {
- var items = $("#washTips").val().split("|");
- for (var i = 0; i < items.length; i++) {
- washTipsList[i] = {
- "sortId": parseInt(items[i])
- };
- }
- });
+ $(document).on('change', '.material', function() {
+ var items = $("#material").val().split("|");
+ for (var i = 0; i < items.length; i++) {
+ materialList[i] = {
+ "id": parseInt(items[i])
+ };
+ }
+ });
- $(document).on('click', "#propertySave", function() {
+ $(document).on('change', '.washTips', function() {
+ var items = $("#washTips").val().split("|");
+ for (var i = 0; i < items.length; i++) {
+ washTipsList[i] = {
+ "sortId": parseInt(items[i])
+ };
+ }
+ });*/
- var washTips = $("#washTips").val() || "";
- var productMaterial = $("#material").val() || "";
+ /*$(document).on('click', "#propertySave", function() {
- common.util.__ajax({
- url: '/netSale/saveProductParam',
- data: {
- productSkn: specialAttrBo.productSkn,
- washTips: washTips.replace(/\|/g, ","),
- productMaterial: productMaterial.replace(/\|/g, ",")
- }
- }, function() {
- // body...
- });
- });
+ var washTips = $("#washTips").val() || "";
+ var productMaterial = $("#material").val() || "";
- window.GOLABDATA.on('TYcaizhi', function() {
- var washTips = $("#washTips").val() || "";
- var productMaterial = $("#material").val() || "";
- return {
- "washTips": washTips.replace(/\|/g, ","),
- "productMaterial": productMaterial.replace(/\|/g, ",")
- };
+ common.util.__ajax({
+ url: '/netSale/saveProductParam',
+ data: {
+ productSkn: specialAttrBo.productSkn,
+ washTips: washTips.replace(/\|/g, ","),
+ productMaterial: productMaterial.replace(/\|/g, ",")
+ }
});
- }
+ return false;
+ });*/
+
+ /*window.GOLABDATA.on('TYcaizhi', function() {
+ var washTips = $("#washTips").val() || "";
+ var productMaterial = $("#material").val() || "";
+ return {
+ "washTips": washTips.replace(/\|/g, ","),
+ "productMaterial": productMaterial.replace(/\|/g, ",")
+ };
+ });*/
+ //}
{ //搜索关键词
@@ -128,9 +128,13 @@ if (window.NETSALEDATA) {
$(document).on('click', '.add', function() {
var item = g.rows[$(this).data("index")];
var value = $("#searchKeys").val();
- if (value) value += ",";
- $("#searchKeys").val(value + item.content);
- searchKeys = $("#searchKeys").val();
+ if(value.indexOf(item.content) == -1) {
+ if (value) value += ",";
+ $("#searchKeys").val(value + item.content);
+ searchKeys = $("#searchKeys").val();
+ } else {
+ util.__tip("商品关键词不能重复");
+ }
});
$("#save-searchKey").on('click', function() {
@@ -140,9 +144,8 @@ if (window.NETSALEDATA) {
productSkn: window.NETSALEDATA.baseProductInfo.baseProduct.productSkn,
searchKeys: searchKeys
}
- }, function(res) {
-
});
+ return false;
});
window.GOLABDATA.on('TYsearchKey', function() {
@@ -206,9 +209,8 @@ if (window.NETSALEDATA) {
data: {
searchSortList: JSON.stringify(searchSortList)
}
- }, function() {
-
});
+ return false;
});
$("#sort0").on('change', function() {
diff --git a/client/sass/index.scss b/client/sass/index.scss
index adc9d5f..ea94a01 100644
--- a/client/sass/index.scss
+++ b/client/sass/index.scss
@@ -10,6 +10,9 @@
@import "common/ionicons.min";
@import "common/newselect2";
@import "common/jquery.gritter";
+@import "common/global";
+@import "common/umeditor";
+
@import "module/default";
@import "module/datepicker";
@@ -19,4 +22,5 @@
@import "module/brand";
@import "module/template";
@import "module/shop-pc";
-@import "module/shop-app";
\ No newline at end of file
+@import "module/shop-app";
+@import "module/base";
diff --git a/client/sass/module/_base.scss b/client/sass/module/_base.scss
new file mode 100644
index 0000000..4b83cda
--- /dev/null
+++ b/client/sass/module/_base.scss
@@ -0,0 +1,22 @@
+.panel-heading {
+ position: relative;
+}
+
+.panel-btns {
+ position: absolute;
+ top: 10px;
+ right: 10px;
+ display: none;
+
+ a {
+ border-color: #fff;
+ color: #999;
+ opacity: .75;
+ font-size: 11px;
+ padding: 3px 4px;
+ border: 1px solid #bbb;
+ line-height: 10px!important;
+ border-radius: 50px;
+ display: inline-block;
+ }
+}
\ No newline at end of file
diff --git a/client/sass/module/_edit.scss b/client/sass/module/_edit.scss
index f1223a1..d28fab5 100644
--- a/client/sass/module/_edit.scss
+++ b/client/sass/module/_edit.scss
@@ -31,17 +31,15 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
.cover-image-list {
li {
float: left;
- width: auto;
+ width: 135px;
height: auto;
border: none;
}
- .btn {
- padding: 2px 5px;
- }
+
.goods-img {
- margin: 0 auto;
+ margin: 10px auto 0;
border: 2px dashed #CCC;
}
@@ -51,6 +49,29 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
}
}
+.cover-image-list {
+ .cover-color {
+ width: auto;
+ text-align: center;
+ height: 40px;
+ line-height: 40px;
+ .btn {
+ padding: 2px 5px;
+ }
+ }
+
+}
+
+.fm-side {
+ width: 110px;
+ .cover-color {
+ text-align: left;
+ }
+ .goods-img {
+ margin: 10px 0 0;
+ }
+}
+
.goods-img {
position: relative;
width: 110px;
@@ -62,12 +83,30 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
height: 100%;
line-height: 150px;
overflow: hidden;
+
+ img {
+ max-width: 100%;
+ max-height: 100%;
+ }
+ }
+
+ .remove-item-btn {
+ position: absolute;
+ font-size: 20px;
+ top: -10px;
+ right: -10px;
+ cursor: pointer;
+ color: #ccc;
+
+ &:hover {
+ color: #000;
+ }
}
}
.poseditimg{
position: relative;
- width: 700px;
- height: 600px;
+ width: 100%;
+ height: auto;
img{
display: block;
width: 100%;
@@ -83,6 +122,12 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
}
}
}
+
+#dapei-form {
+ label {
+ min-width: 60px;
+ }
+}
.btn.info{
color: #fff;
background-color: #5bc0de;
@@ -92,9 +137,15 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
.floatnav{
padding: 0;
position: fixed;
- right: 20px;
- top: 20%;
+ right: 0;
+ top: 50%;
z-index: 999;
+ margin: -280px 0 0;
+ transform: translateX(150px);
+
+ ul {
+ padding: 0;
+ }
li {
width: 150px;
@@ -135,4 +186,72 @@ input[type=date], input[type=time], input[type=datetime-local], input[type=month
}
}
+
+ .glyphicon {
+ position: absolute;
+ font-size: 20px;
+ width: 30px;
+ height: 40px;
+ background: #f2dede;
+ border-radius: 10px 0 0 10px;
+ border: 1px solid #ebccd1;
+ left: -30px;
+ top: 50%;
+ margin: -20px 0 0 0;
+ color: #fff;
+ text-align: center;
+ line-height: 40px;
+ cursor: pointer;
+
+ &.glyphicon-chevron-right {
+ display: none;
+ }
+ }
+}
+
+.floatnav.show {
+ transform: translateX(0);
+ transition: transform .5s;
+
+ .glyphicon-chevron-right {
+ display: inline;
+ }
+ .glyphicon-chevron-left {
+ display: none;
+ }
+
+
+}
+
+.netsale-position {
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ left: 0;
+ top: -100%;
+ z-index:-1;
+}
+.w-goods-text{
+ border-radius: 3px;
+ background-color: #fff;
+ border: 1px solid #ccc;
+ padding: 5px;
+}
+.modal-dialog{
+ margin-top: 70px;
+}
+
+.subhhead{
+ span{
+ width: 100px;
+ display: inline-block;
+ height: 100%;
+ text-align: center;
+ }
}
+
+.edui-editor-body {
+ img {
+ max-width: 100%;
+ }
+}
\ No newline at end of file
diff --git a/client/webpack.config.js b/client/webpack.config.js
index 46efb1f..8d74021 100644
--- a/client/webpack.config.js
+++ b/client/webpack.config.js
@@ -1,86 +1,88 @@
var path = require('path');
var webpack = require("webpack");
var ExtractTextPlugin = require("extract-text-webpack-plugin");
-var fs=require('fs'),
-path=require('path');
+var fs = require('fs'),
+ path = require('path');
-var commons=["./js/common/common.js"];
+var commons = ["./js/common/common.js"];
var config = JSON.parse(fs.readFileSync('./package.json').toString());
-var spmroot=path.join(__dirname, 'spm_modules');
-var alias={};
-for(key in config.spm.dependencies){
+var spmroot = path.join(__dirname, 'spm_modules');
+var alias = {};
+for (key in config.spm.dependencies) {
+
+ var edition = path.join(key, config.spm.dependencies[key]);
- var edition=path.join(key,config.spm.dependencies[key]);
-
- var json=path.join(spmroot,path.join(edition,'package.json'));
+ var json = path.join(spmroot, path.join(edition, 'package.json'));
- var mainjs=JSON.parse(fs.readFileSync(json).toString()).spm.main;
- if(!alias[key]){
- alias[key]=path.join(edition,mainjs).replace('/\\/ig','/');
+ var mainjs = JSON.parse(fs.readFileSync(json).toString()).spm.main;
+ if (!alias[key]) {
+ alias[key] = path.join(edition, mainjs).replace('/\\/ig', '/');
}
}
for (key in config.spm.dependencies) {
- commons.push(key);
+ commons.push(key);
}
-var entry={index:[],libs:[]};
-
-entry.libs=commons;
+var entry = {
+ index: [],
+ libs: []
+};
+entry.libs = commons;
-var readfile=function(dir,callback){
+var readfile = function(dir, callback) {
var files = fs.readdirSync(dir);
- files.forEach(function (file) {
- var filePath = path.join(dir, file);
- if (fs.statSync(filePath).isFile() && /.*\.js$/i.test(file)) {
- callback && callback(filePath);
- }else{
- if(file!="common"&&file!="util"){
- readfile(filePath,callback);
- }
+ files.forEach(function(file) {
+ var filePath = path.join(dir, file);
+ if (fs.statSync(filePath).isFile() && /.*\.js$/i.test(file)) {
+ callback && callback(filePath);
+ } else {
+ if (file != "common" && file != "util" && file != "partials") {
+ readfile(filePath, callback);
}
+ }
});
}
-var index=[];
-readfile('./js',function(src){
+var index = [];
+readfile('./js', function(src) {
index.push(src);
});
//区分不同系统环境
-var __reg=/(js\\)|\\|(\.js)/g;
-if(path.sep=="/"){
- __reg=/(js\/)|\/|(\.js)/g;
+var __reg = /(js\\)|\\|(\.js)/g;
+if (path.sep == "/") {
+ __reg = /(js\/)|\/|(\.js)/g;
}
-for(var i in index){
- var __name=index[i].replace(__reg,'');
- entry[__name]='.'+path.sep+index[i];
+for (var i in index) {
+ var __name = index[i].replace(__reg, '');
+ entry[__name] = '.' + path.sep + index[i];
}
-var plugins=[
- //获取公共js
- new webpack.optimize.CommonsChunkPlugin('libs','libs.js')
- //全局引入jquery
- // new webpack.ProvidePlugin({
- // $: "jquery",
- // jQuery: "jquery",
- // "window.jQuery": "jquery"
- // })
+var plugins = [
+ //获取公共js
+ new webpack.optimize.CommonsChunkPlugin('libs', 'libs.js')
+ //全局引入jquery
+ // new webpack.ProvidePlugin({
+ // $: "jquery",
+ // jQuery: "jquery",
+ // "window.jQuery": "jquery"
+ // })
];
module.exports = {
- entry: entry,
- output: {
- path:path.join("../public","dist"),
- filename:'[name].js'
- },
- resolve:{
- root: [spmroot],
- extension:['','.js'],
- alias:alias
- },
- plugins:plugins
+ entry: entry,
+ output: {
+ path: path.join("../public", "dist"),
+ filename: '[name].js'
+ },
+ resolve: {
+ root: [spmroot],
+ extension: ['', '.js'],
+ alias: alias
+ },
+ plugins: plugins
};
\ No newline at end of file
diff --git a/public/images/100x100.png b/public/images/100x100.png
new file mode 100644
index 0000000..5932ff4
Binary files /dev/null and b/public/images/100x100.png differ
diff --git a/public/images/100x120.png b/public/images/100x120.png
new file mode 100644
index 0000000..997cb2d
Binary files /dev/null and b/public/images/100x120.png differ
diff --git a/public/images/anchor.gif b/public/images/anchor.gif
new file mode 100644
index 0000000..5aa797b
Binary files /dev/null and b/public/images/anchor.gif differ
diff --git a/public/images/arrow.png b/public/images/arrow.png
new file mode 100644
index 0000000..d900886
Binary files /dev/null and b/public/images/arrow.png differ
diff --git a/public/images/arrow_down.png b/public/images/arrow_down.png
new file mode 100644
index 0000000..e9257e8
Binary files /dev/null and b/public/images/arrow_down.png differ
diff --git a/public/images/arrow_up.png b/public/images/arrow_up.png
new file mode 100644
index 0000000..74277af
Binary files /dev/null and b/public/images/arrow_up.png differ
diff --git a/public/images/button-bg.gif b/public/images/button-bg.gif
new file mode 100644
index 0000000..ec7fa2e
Binary files /dev/null and b/public/images/button-bg.gif differ
diff --git a/public/images/calendar-arrow.png b/public/images/calendar-arrow.png
new file mode 100644
index 0000000..e4ddda9
Binary files /dev/null and b/public/images/calendar-arrow.png differ
diff --git a/public/images/cancelbutton.gif b/public/images/cancelbutton.gif
new file mode 100644
index 0000000..df4bc2c
Binary files /dev/null and b/public/images/cancelbutton.gif differ
diff --git a/public/images/caret.png b/public/images/caret.png
new file mode 100644
index 0000000..cf06947
Binary files /dev/null and b/public/images/caret.png differ
diff --git a/public/images/charts.png b/public/images/charts.png
new file mode 100644
index 0000000..713965c
Binary files /dev/null and b/public/images/charts.png differ
diff --git a/public/images/close-white.png b/public/images/close-white.png
new file mode 100644
index 0000000..4169974
Binary files /dev/null and b/public/images/close-white.png differ
diff --git a/public/images/close.png b/public/images/close.png
new file mode 100644
index 0000000..d368388
Binary files /dev/null and b/public/images/close.png differ
diff --git a/public/images/colorpicker/colorpicker_background.png b/public/images/colorpicker/colorpicker_background.png
new file mode 100644
index 0000000..b9638be
Binary files /dev/null and b/public/images/colorpicker/colorpicker_background.png differ
diff --git a/public/images/colorpicker/colorpicker_hex.png b/public/images/colorpicker/colorpicker_hex.png
new file mode 100644
index 0000000..2e06cee
Binary files /dev/null and b/public/images/colorpicker/colorpicker_hex.png differ
diff --git a/public/images/colorpicker/colorpicker_hsb_b.png b/public/images/colorpicker/colorpicker_hsb_b.png
new file mode 100644
index 0000000..9488800
Binary files /dev/null and b/public/images/colorpicker/colorpicker_hsb_b.png differ
diff --git a/public/images/colorpicker/colorpicker_hsb_h.png b/public/images/colorpicker/colorpicker_hsb_h.png
new file mode 100644
index 0000000..253e578
Binary files /dev/null and b/public/images/colorpicker/colorpicker_hsb_h.png differ
diff --git a/public/images/colorpicker/colorpicker_hsb_s.png b/public/images/colorpicker/colorpicker_hsb_s.png
new file mode 100644
index 0000000..e203647
Binary files /dev/null and b/public/images/colorpicker/colorpicker_hsb_s.png differ
diff --git a/public/images/colorpicker/colorpicker_indic.gif b/public/images/colorpicker/colorpicker_indic.gif
new file mode 100644
index 0000000..1337d14
Binary files /dev/null and b/public/images/colorpicker/colorpicker_indic.gif differ
diff --git a/public/images/colorpicker/colorpicker_overlay.png b/public/images/colorpicker/colorpicker_overlay.png
new file mode 100644
index 0000000..561cdd9
Binary files /dev/null and b/public/images/colorpicker/colorpicker_overlay.png differ
diff --git a/public/images/colorpicker/colorpicker_rgb_b.png b/public/images/colorpicker/colorpicker_rgb_b.png
new file mode 100644
index 0000000..9488800
Binary files /dev/null and b/public/images/colorpicker/colorpicker_rgb_b.png differ
diff --git a/public/images/colorpicker/colorpicker_rgb_g.png b/public/images/colorpicker/colorpicker_rgb_g.png
new file mode 100644
index 0000000..699a641
Binary files /dev/null and b/public/images/colorpicker/colorpicker_rgb_g.png differ
diff --git a/public/images/colorpicker/colorpicker_rgb_r.png b/public/images/colorpicker/colorpicker_rgb_r.png
new file mode 100644
index 0000000..01eccb5
Binary files /dev/null and b/public/images/colorpicker/colorpicker_rgb_r.png differ
diff --git a/public/images/colorpicker/colorpicker_select.gif b/public/images/colorpicker/colorpicker_select.gif
new file mode 100644
index 0000000..599f7f1
Binary files /dev/null and b/public/images/colorpicker/colorpicker_select.gif differ
diff --git a/public/images/colorpicker/colorpicker_submit.png b/public/images/colorpicker/colorpicker_submit.png
new file mode 100644
index 0000000..7f4c082
Binary files /dev/null and b/public/images/colorpicker/colorpicker_submit.png differ
diff --git a/public/images/colorpicker/select2.png b/public/images/colorpicker/select2.png
new file mode 100644
index 0000000..5499211
Binary files /dev/null and b/public/images/colorpicker/select2.png differ
diff --git a/public/images/copy.png b/public/images/copy.png
new file mode 100644
index 0000000..b2536aa
Binary files /dev/null and b/public/images/copy.png differ
diff --git a/public/images/cursor_h.gif b/public/images/cursor_h.gif
new file mode 100644
index 0000000..d7c3e7e
Binary files /dev/null and b/public/images/cursor_h.gif differ
diff --git a/public/images/cursor_h.png b/public/images/cursor_h.png
new file mode 100644
index 0000000..2088fc2
Binary files /dev/null and b/public/images/cursor_h.png differ
diff --git a/public/images/cursor_v.gif b/public/images/cursor_v.gif
new file mode 100644
index 0000000..bb508db
Binary files /dev/null and b/public/images/cursor_v.gif differ
diff --git a/public/images/cursor_v.png b/public/images/cursor_v.png
new file mode 100644
index 0000000..6f39ca3
Binary files /dev/null and b/public/images/cursor_v.png differ
diff --git a/public/images/datatables/sort_asc.png b/public/images/datatables/sort_asc.png
new file mode 100644
index 0000000..f055149
Binary files /dev/null and b/public/images/datatables/sort_asc.png differ
diff --git a/public/images/datatables/sort_desc.png b/public/images/datatables/sort_desc.png
new file mode 100644
index 0000000..41e7375
Binary files /dev/null and b/public/images/datatables/sort_desc.png differ
diff --git a/public/images/dialog-title-bg.png b/public/images/dialog-title-bg.png
new file mode 100644
index 0000000..f744f26
Binary files /dev/null and b/public/images/dialog-title-bg.png differ
diff --git a/public/images/droparrows.png b/public/images/droparrows.png
new file mode 100644
index 0000000..1efd31c
Binary files /dev/null and b/public/images/droparrows.png differ
diff --git a/public/images/dropdown-arrow.png b/public/images/dropdown-arrow.png
new file mode 100644
index 0000000..05b4730
Binary files /dev/null and b/public/images/dropdown-arrow.png differ
diff --git a/public/images/filescan.png b/public/images/filescan.png
new file mode 100644
index 0000000..1d27158
Binary files /dev/null and b/public/images/filescan.png differ
diff --git a/public/images/highlighted.gif b/public/images/highlighted.gif
new file mode 100644
index 0000000..9272b49
Binary files /dev/null and b/public/images/highlighted.gif differ
diff --git a/public/images/icons-all.gif b/public/images/icons-all.gif
new file mode 100644
index 0000000..21915e5
Binary files /dev/null and b/public/images/icons-all.gif differ
diff --git a/public/images/icons.gif b/public/images/icons.gif
new file mode 100644
index 0000000..8206560
Binary files /dev/null and b/public/images/icons.gif differ
diff --git a/public/images/icons.png b/public/images/icons.png
new file mode 100644
index 0000000..de9a1bb
Binary files /dev/null and b/public/images/icons.png differ
diff --git a/public/images/imglabel.png b/public/images/imglabel.png
new file mode 100644
index 0000000..4fc3c88
Binary files /dev/null and b/public/images/imglabel.png differ
diff --git a/public/images/loaderror.png b/public/images/loaderror.png
new file mode 100644
index 0000000..35ff333
Binary files /dev/null and b/public/images/loaderror.png differ
diff --git a/public/images/loaders/loader1.gif b/public/images/loaders/loader1.gif
new file mode 100644
index 0000000..26bb9e7
Binary files /dev/null and b/public/images/loaders/loader1.gif differ
diff --git a/public/images/loaders/loader10.gif b/public/images/loaders/loader10.gif
new file mode 100644
index 0000000..b327795
Binary files /dev/null and b/public/images/loaders/loader10.gif differ
diff --git a/public/images/loaders/loader11.gif b/public/images/loaders/loader11.gif
new file mode 100644
index 0000000..476e7cd
Binary files /dev/null and b/public/images/loaders/loader11.gif differ
diff --git a/public/images/loaders/loader12.gif b/public/images/loaders/loader12.gif
new file mode 100644
index 0000000..02bfe59
Binary files /dev/null and b/public/images/loaders/loader12.gif differ
diff --git a/public/images/loaders/loader13.gif b/public/images/loaders/loader13.gif
new file mode 100644
index 0000000..b9720a7
Binary files /dev/null and b/public/images/loaders/loader13.gif differ
diff --git a/public/images/loaders/loader14.gif b/public/images/loaders/loader14.gif
new file mode 100644
index 0000000..00c28ed
Binary files /dev/null and b/public/images/loaders/loader14.gif differ
diff --git a/public/images/loaders/loader15.gif b/public/images/loaders/loader15.gif
new file mode 100644
index 0000000..23fce88
Binary files /dev/null and b/public/images/loaders/loader15.gif differ
diff --git a/public/images/loaders/loader16.gif b/public/images/loaders/loader16.gif
new file mode 100644
index 0000000..fc8f536
Binary files /dev/null and b/public/images/loaders/loader16.gif differ
diff --git a/public/images/loaders/loader17.gif b/public/images/loaders/loader17.gif
new file mode 100644
index 0000000..cae2f54
Binary files /dev/null and b/public/images/loaders/loader17.gif differ
diff --git a/public/images/loaders/loader18.gif b/public/images/loaders/loader18.gif
new file mode 100644
index 0000000..3da9c45
Binary files /dev/null and b/public/images/loaders/loader18.gif differ
diff --git a/public/images/loaders/loader19.gif b/public/images/loaders/loader19.gif
new file mode 100644
index 0000000..5d66e4d
Binary files /dev/null and b/public/images/loaders/loader19.gif differ
diff --git a/public/images/loaders/loader2.gif b/public/images/loaders/loader2.gif
new file mode 100644
index 0000000..54b54a9
Binary files /dev/null and b/public/images/loaders/loader2.gif differ
diff --git a/public/images/loaders/loader20.gif b/public/images/loaders/loader20.gif
new file mode 100644
index 0000000..ab5315a
Binary files /dev/null and b/public/images/loaders/loader20.gif differ
diff --git a/public/images/loaders/loader21.gif b/public/images/loaders/loader21.gif
new file mode 100644
index 0000000..fa92e95
Binary files /dev/null and b/public/images/loaders/loader21.gif differ
diff --git a/public/images/loaders/loader22.gif b/public/images/loaders/loader22.gif
new file mode 100644
index 0000000..8454d3c
Binary files /dev/null and b/public/images/loaders/loader22.gif differ
diff --git a/public/images/loaders/loader23.gif b/public/images/loaders/loader23.gif
new file mode 100644
index 0000000..53e206f
Binary files /dev/null and b/public/images/loaders/loader23.gif differ
diff --git a/public/images/loaders/loader24.gif b/public/images/loaders/loader24.gif
new file mode 100644
index 0000000..9956953
Binary files /dev/null and b/public/images/loaders/loader24.gif differ
diff --git a/public/images/loaders/loader25.gif b/public/images/loaders/loader25.gif
new file mode 100644
index 0000000..5974e9c
Binary files /dev/null and b/public/images/loaders/loader25.gif differ
diff --git a/public/images/loaders/loader26.gif b/public/images/loaders/loader26.gif
new file mode 100644
index 0000000..9133465
Binary files /dev/null and b/public/images/loaders/loader26.gif differ
diff --git a/public/images/loaders/loader27.gif b/public/images/loaders/loader27.gif
new file mode 100644
index 0000000..701e07f
Binary files /dev/null and b/public/images/loaders/loader27.gif differ
diff --git a/public/images/loaders/loader28.gif b/public/images/loaders/loader28.gif
new file mode 100644
index 0000000..a9ebe32
Binary files /dev/null and b/public/images/loaders/loader28.gif differ
diff --git a/public/images/loaders/loader29.gif b/public/images/loaders/loader29.gif
new file mode 100644
index 0000000..eed7663
Binary files /dev/null and b/public/images/loaders/loader29.gif differ
diff --git a/public/images/loaders/loader3.gif b/public/images/loaders/loader3.gif
new file mode 100644
index 0000000..c111c62
Binary files /dev/null and b/public/images/loaders/loader3.gif differ
diff --git a/public/images/loaders/loader30.gif b/public/images/loaders/loader30.gif
new file mode 100644
index 0000000..d2a0629
Binary files /dev/null and b/public/images/loaders/loader30.gif differ
diff --git a/public/images/loaders/loader4.gif b/public/images/loaders/loader4.gif
new file mode 100644
index 0000000..4df287b
Binary files /dev/null and b/public/images/loaders/loader4.gif differ
diff --git a/public/images/loaders/loader5.gif b/public/images/loaders/loader5.gif
new file mode 100644
index 0000000..c1b8624
Binary files /dev/null and b/public/images/loaders/loader5.gif differ
diff --git a/public/images/loaders/loader6.gif b/public/images/loaders/loader6.gif
new file mode 100644
index 0000000..bd6ea7b
Binary files /dev/null and b/public/images/loaders/loader6.gif differ
diff --git a/public/images/loaders/loader7.gif b/public/images/loaders/loader7.gif
new file mode 100644
index 0000000..9669d83
Binary files /dev/null and b/public/images/loaders/loader7.gif differ
diff --git a/public/images/loaders/loader8.gif b/public/images/loaders/loader8.gif
new file mode 100644
index 0000000..9256b2c
Binary files /dev/null and b/public/images/loaders/loader8.gif differ
diff --git a/public/images/loaders/loader9.gif b/public/images/loaders/loader9.gif
new file mode 100644
index 0000000..075a436
Binary files /dev/null and b/public/images/loaders/loader9.gif differ
diff --git a/public/images/localimage.png b/public/images/localimage.png
new file mode 100644
index 0000000..7303c36
Binary files /dev/null and b/public/images/localimage.png differ
diff --git a/public/images/lock.gif b/public/images/lock.gif
new file mode 100644
index 0000000..b4e6d78
Binary files /dev/null and b/public/images/lock.gif differ
diff --git a/public/images/logo-primary.png b/public/images/logo-primary.png
new file mode 100644
index 0000000..d51a5f0
Binary files /dev/null and b/public/images/logo-primary.png differ
diff --git a/public/images/logo.png b/public/images/logo.png
new file mode 100644
index 0000000..b2889d7
Binary files /dev/null and b/public/images/logo.png differ
diff --git a/public/images/music.png b/public/images/music.png
new file mode 100644
index 0000000..354edeb
Binary files /dev/null and b/public/images/music.png differ
diff --git a/public/images/neweditor-tab-bg.png b/public/images/neweditor-tab-bg.png
new file mode 100644
index 0000000..8f398b0
Binary files /dev/null and b/public/images/neweditor-tab-bg.png differ
diff --git a/public/images/ok.gif b/public/images/ok.gif
new file mode 100644
index 0000000..9d1362c
Binary files /dev/null and b/public/images/ok.gif differ
diff --git a/public/images/pagebreak.gif b/public/images/pagebreak.gif
new file mode 100644
index 0000000..8d1cffd
Binary files /dev/null and b/public/images/pagebreak.gif differ
diff --git a/public/images/photos/media-audio.png b/public/images/photos/media-audio.png
new file mode 100644
index 0000000..0191d2f
Binary files /dev/null and b/public/images/photos/media-audio.png differ
diff --git a/public/images/photos/media-doc.png b/public/images/photos/media-doc.png
new file mode 100644
index 0000000..311ac0a
Binary files /dev/null and b/public/images/photos/media-doc.png differ
diff --git a/public/images/photos/media1.jpg b/public/images/photos/media1.jpg
new file mode 100644
index 0000000..827f3c4
Binary files /dev/null and b/public/images/photos/media1.jpg differ
diff --git a/public/images/photos/media2.png b/public/images/photos/media2.png
new file mode 100644
index 0000000..c0fa9aa
Binary files /dev/null and b/public/images/photos/media2.png differ
diff --git a/public/images/photos/media3.png b/public/images/photos/media3.png
new file mode 100644
index 0000000..4374734
Binary files /dev/null and b/public/images/photos/media3.png differ
diff --git a/public/images/photos/media4.png b/public/images/photos/media4.png
new file mode 100644
index 0000000..be017b1
Binary files /dev/null and b/public/images/photos/media4.png differ
diff --git a/public/images/photos/media5.png b/public/images/photos/media5.png
new file mode 100644
index 0000000..a008dd3
Binary files /dev/null and b/public/images/photos/media5.png differ
diff --git a/public/images/photos/media6.png b/public/images/photos/media6.png
new file mode 100644
index 0000000..96afbdb
Binary files /dev/null and b/public/images/photos/media6.png differ
diff --git a/public/images/photos/media7.png b/public/images/photos/media7.png
new file mode 100644
index 0000000..e0e0d87
Binary files /dev/null and b/public/images/photos/media7.png differ
diff --git a/public/images/photos/profile-big.jpg b/public/images/photos/profile-big.jpg
new file mode 100644
index 0000000..014123e
Binary files /dev/null and b/public/images/photos/profile-big.jpg differ
diff --git a/public/images/photos/profile.png b/public/images/photos/profile.png
new file mode 100644
index 0000000..bc9158c
Binary files /dev/null and b/public/images/photos/profile.png differ
diff --git a/public/images/photos/user1.png b/public/images/photos/user1.png
new file mode 100644
index 0000000..53e9c22
Binary files /dev/null and b/public/images/photos/user1.png differ
diff --git a/public/images/photos/user2.png b/public/images/photos/user2.png
new file mode 100644
index 0000000..8e85686
Binary files /dev/null and b/public/images/photos/user2.png differ
diff --git a/public/images/photos/user3.png b/public/images/photos/user3.png
new file mode 100644
index 0000000..6960ef9
Binary files /dev/null and b/public/images/photos/user3.png differ
diff --git a/public/images/photos/user4.png b/public/images/photos/user4.png
new file mode 100644
index 0000000..c1dfafe
Binary files /dev/null and b/public/images/photos/user4.png differ
diff --git a/public/images/photos/user5.png b/public/images/photos/user5.png
new file mode 100644
index 0000000..fccb455
Binary files /dev/null and b/public/images/photos/user5.png differ
diff --git a/public/images/pop-bg.png b/public/images/pop-bg.png
new file mode 100644
index 0000000..d7a5a30
Binary files /dev/null and b/public/images/pop-bg.png differ
diff --git a/public/images/prettyphoto/dark_rounded/btnNext.png.html b/public/images/prettyphoto/dark_rounded/btnNext.png.html
new file mode 100644
index 0000000..958cda1
--- /dev/null
+++ b/public/images/prettyphoto/dark_rounded/btnNext.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/btnNext.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/btnNext.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_rounded/btnPrevious.png.html b/public/images/prettyphoto/dark_rounded/btnPrevious.png.html
new file mode 100644
index 0000000..495c1f5
--- /dev/null
+++ b/public/images/prettyphoto/dark_rounded/btnPrevious.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/btnPrevious.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/btnPrevious.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_rounded/contentPattern.png.html b/public/images/prettyphoto/dark_rounded/contentPattern.png.html
new file mode 100644
index 0000000..0fdd364
--- /dev/null
+++ b/public/images/prettyphoto/dark_rounded/contentPattern.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/contentPattern.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/contentPattern.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_rounded/loader.gif.html b/public/images/prettyphoto/dark_rounded/loader.gif.html
new file mode 100644
index 0000000..7fe6643
--- /dev/null
+++ b/public/images/prettyphoto/dark_rounded/loader.gif.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/loader.gif">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/loader.gif</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_rounded/sprite.png.html b/public/images/prettyphoto/dark_rounded/sprite.png.html
new file mode 100644
index 0000000..c15480e
--- /dev/null
+++ b/public/images/prettyphoto/dark_rounded/sprite.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/sprite.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/sprite.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_square/btnNext.png.html b/public/images/prettyphoto/dark_square/btnNext.png.html
new file mode 100644
index 0000000..2cdcb03
--- /dev/null
+++ b/public/images/prettyphoto/dark_square/btnNext.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/btnNext.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/btnNext.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_square/btnPrevious.png.html b/public/images/prettyphoto/dark_square/btnPrevious.png.html
new file mode 100644
index 0000000..a532431
--- /dev/null
+++ b/public/images/prettyphoto/dark_square/btnPrevious.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/btnPrevious.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/btnPrevious.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_square/loader.gif.html b/public/images/prettyphoto/dark_square/loader.gif.html
new file mode 100644
index 0000000..0b8442f
--- /dev/null
+++ b/public/images/prettyphoto/dark_square/loader.gif.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/loader.gif">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/loader.gif</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/dark_square/sprite.png.html b/public/images/prettyphoto/dark_square/sprite.png.html
new file mode 100644
index 0000000..1f28361
--- /dev/null
+++ b/public/images/prettyphoto/dark_square/sprite.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/sprite.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/sprite.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/dark_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/default_thumb.png b/public/images/prettyphoto/default_thumb.png
new file mode 100644
index 0000000..1a26e4b
Binary files /dev/null and b/public/images/prettyphoto/default_thumb.png differ
diff --git a/public/images/prettyphoto/facebook/btnNext.png.html b/public/images/prettyphoto/facebook/btnNext.png.html
new file mode 100644
index 0000000..8b9622d
--- /dev/null
+++ b/public/images/prettyphoto/facebook/btnNext.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/btnNext.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/btnNext.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/btnPrevious.png.html b/public/images/prettyphoto/facebook/btnPrevious.png.html
new file mode 100644
index 0000000..18dad72
--- /dev/null
+++ b/public/images/prettyphoto/facebook/btnPrevious.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/btnPrevious.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/btnPrevious.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/contentPatternBottom.png.html b/public/images/prettyphoto/facebook/contentPatternBottom.png.html
new file mode 100644
index 0000000..a1bb2e7
--- /dev/null
+++ b/public/images/prettyphoto/facebook/contentPatternBottom.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternBottom.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternBottom.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/contentPatternLeft.png.html b/public/images/prettyphoto/facebook/contentPatternLeft.png.html
new file mode 100644
index 0000000..8715a95
--- /dev/null
+++ b/public/images/prettyphoto/facebook/contentPatternLeft.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternLeft.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternLeft.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/contentPatternRight.png.html b/public/images/prettyphoto/facebook/contentPatternRight.png.html
new file mode 100644
index 0000000..974405c
--- /dev/null
+++ b/public/images/prettyphoto/facebook/contentPatternRight.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternRight.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternRight.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/contentPatternTop.png.html b/public/images/prettyphoto/facebook/contentPatternTop.png.html
new file mode 100644
index 0000000..6f5b1e9
--- /dev/null
+++ b/public/images/prettyphoto/facebook/contentPatternTop.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternTop.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/contentPatternTop.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/default_thumbnail.gif.html b/public/images/prettyphoto/facebook/default_thumbnail.gif.html
new file mode 100644
index 0000000..49881e8
--- /dev/null
+++ b/public/images/prettyphoto/facebook/default_thumbnail.gif.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/default_thumbnail.gif">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/default_thumbnail.gif</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/loader.gif.html b/public/images/prettyphoto/facebook/loader.gif.html
new file mode 100644
index 0000000..9195f44
--- /dev/null
+++ b/public/images/prettyphoto/facebook/loader.gif.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/loader.gif">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/loader.gif</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/facebook/sprite.png.html b/public/images/prettyphoto/facebook/sprite.png.html
new file mode 100644
index 0000000..1a38921
--- /dev/null
+++ b/public/images/prettyphoto/facebook/sprite.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/sprite.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/sprite.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/facebook/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/light_rounded/btnNext.png.html b/public/images/prettyphoto/light_rounded/btnNext.png.html
new file mode 100644
index 0000000..15d7fa3
--- /dev/null
+++ b/public/images/prettyphoto/light_rounded/btnNext.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/btnNext.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/btnNext.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/light_rounded/btnPrevious.png.html b/public/images/prettyphoto/light_rounded/btnPrevious.png.html
new file mode 100644
index 0000000..1fa1fe5
--- /dev/null
+++ b/public/images/prettyphoto/light_rounded/btnPrevious.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/btnPrevious.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/btnPrevious.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/light_rounded/loader.gif.html b/public/images/prettyphoto/light_rounded/loader.gif.html
new file mode 100644
index 0000000..1d10651
--- /dev/null
+++ b/public/images/prettyphoto/light_rounded/loader.gif.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:25.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/loader.gif">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/loader.gif</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/light_rounded/sprite.png.html b/public/images/prettyphoto/light_rounded/sprite.png.html
new file mode 100644
index 0000000..5ee1d98
--- /dev/null
+++ b/public/images/prettyphoto/light_rounded/sprite.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:23.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/sprite.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/sprite.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_rounded/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/light_square/btnNext.png.html b/public/images/prettyphoto/light_square/btnNext.png.html
new file mode 100644
index 0000000..ec60c0e
--- /dev/null
+++ b/public/images/prettyphoto/light_square/btnNext.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/btnNext.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/btnNext.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/light_square/btnPrevious.png.html b/public/images/prettyphoto/light_square/btnPrevious.png.html
new file mode 100644
index 0000000..fecf6ac
--- /dev/null
+++ b/public/images/prettyphoto/light_square/btnPrevious.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/btnPrevious.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/btnPrevious.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/light_square/sprite.png.html b/public/images/prettyphoto/light_square/sprite.png.html
new file mode 100644
index 0000000..2e5d1a0
--- /dev/null
+++ b/public/images/prettyphoto/light_square/sprite.png.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+<title>Webpage</title>
+
+<link rel="stylesheet" href="../../../../../../css/style.default.css" type="text/css" />
+<link rel="stylesheet" href="../../../../../../css/style.blue.css" type="text/css" />
+
+<script type="text/javascript" src="../../../../../../js/jquery-1.10.2.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/modernizr.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/bootstrap.min.js"></script>
+<script type="text/javascript" src="../../../../../../js/jquery.dropdown.js"></script>
+<script type="text/javascript" src="../../../../../../js/custom.js"></script>
+
+<script>
+jQuery(document).ready(function(){
+ var winHeight = jQuery(window).height();
+ jQuery('#framedemo').height(winHeight - 65);
+
+ jQuery('#cd-dropdown').dropdown( {
+ gutter : 5,
+ stack : false,
+ slidingIn : 100
+ });
+
+
+});
+</script>
+
+</head>
+
+<body>
+
+
+<!-- Copyright � 2005. Spidersoft Ltd -->
+<style>
+A.applink:hover {border: 2px dotted #DCE6F4;padding:2px;background-color:#ffff00;color:green;text-decoration:none}
+A.applink {border: 2px dotted #DCE6F4;padding:2px;color:#2F5BFF;background:transparent;text-decoration:none}
+A.info {color:#2F5BFF;background:transparent;text-decoration:none}
+A.info:hover {color:green;background:transparent;text-decoration:underline}
+</style>
+<div style='BORDER: 1px solid #DCE6F4; MARGIN-TOP: 20px; MARGIN-BOTTOM: 20px; MARGIN-LEFT: 5px; MARGIN-RIGHT: 5px; PADDING: 5px; BACKGROUND-COLOR: #eef8ff;line-height:180%; COLOR: #000000; font-family: Verdana; font-size: 9pt; width=100%; FILTER: progid:DXImageTransform.Microsoft.Gradient(GradientType=0, StartColorStr="#FFFFFFFF", EndColorStr="#F2F5FAFF");'>
+��ҳ�������� <a class="applink" href="http://www.spidersoft.com"><b>WebZIP 7.0.0.1025</b></a> �� 08/13/14 13:13:24.<br>
+<b>��ַ:</b> <a class="info" href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/sprite.png">http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/sprite.png</a><br>
+<b>����:</b> Webpage • <b>��С:</b> 2525 • <b>�����:</b> Thu, 01 Jan 1970 00:00:00 GMT<br></div>
+<!-- /Copyright � 2005. Spidersoft Ltd -->
+
+
+<div class="headframe">
+ <div class="row-fluid">
+ <div class="span3"><a href="http://themepixels.com/"><img src="../../../../../../images/tp-logo.png" /></a></div>
+ <div class="span9 align-right">
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 40</p>
+
+</div>" class="btn btn-primary btn-small"><span class="iconfa-shopping-cart"></span> Purchase Theme</a>
+ <a href="http://themepixels.com/demo/webpage/chain/images/prettyPhoto/light_square/<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 41</p>
+
+</div>" class="btn btn-black btn-small"><span class="cls">×</span> Remove Frame</a>
+ </div>
+ </div><!-- row-fluid -->
+</div>
+<iframe id="framedemo" src="<div style="border:1px solid #990000;padding-left:20px;margin:0 0 10px 0;">
+
+<h4>A PHP Error was encountered</h4>
+
+<p>Severity: Notice</p>
+<p>Message: Trying to get property of non-object</p>
+<p>Filename: views/demo.php</p>
+<p>Line Number: 45</p>
+
+</div>"></iframe>
+
+</body>
+</html>
diff --git a/public/images/prettyphoto/loader.gif b/public/images/prettyphoto/loader.gif
new file mode 100644
index 0000000..35d397c
Binary files /dev/null and b/public/images/prettyphoto/loader.gif differ
diff --git a/public/images/prettyphoto/sprite.png b/public/images/prettyphoto/sprite.png
new file mode 100644
index 0000000..5f07ddc
Binary files /dev/null and b/public/images/prettyphoto/sprite.png differ
diff --git a/public/images/prettyphoto/sprite_next.png b/public/images/prettyphoto/sprite_next.png
new file mode 100644
index 0000000..379dc0d
Binary files /dev/null and b/public/images/prettyphoto/sprite_next.png differ
diff --git a/public/images/prettyphoto/sprite_prev.png b/public/images/prettyphoto/sprite_prev.png
new file mode 100644
index 0000000..1ee4865
Binary files /dev/null and b/public/images/prettyphoto/sprite_prev.png differ
diff --git a/public/images/prettyphoto/sprite_x.png b/public/images/prettyphoto/sprite_x.png
new file mode 100644
index 0000000..d4433ab
Binary files /dev/null and b/public/images/prettyphoto/sprite_x.png differ
diff --git a/public/images/prettyphoto/sprite_y.png b/public/images/prettyphoto/sprite_y.png
new file mode 100644
index 0000000..7786ab5
Binary files /dev/null and b/public/images/prettyphoto/sprite_y.png differ
diff --git a/public/images/scale.png b/public/images/scale.png
new file mode 100644
index 0000000..f45adb5
Binary files /dev/null and b/public/images/scale.png differ
diff --git a/public/images/screen.png b/public/images/screen.png
new file mode 100644
index 0000000..dfa7f21
Binary files /dev/null and b/public/images/screen.png differ
diff --git a/public/images/select2-spinner.gif b/public/images/select2-spinner.gif
new file mode 100644
index 0000000..5b33f7e
Binary files /dev/null and b/public/images/select2-spinner.gif differ
diff --git a/public/images/select2.png b/public/images/select2.png
new file mode 100644
index 0000000..1d804ff
Binary files /dev/null and b/public/images/select2.png differ
diff --git a/public/images/select2x2.png b/public/images/select2x2.png
new file mode 100644
index 0000000..4bdd5c9
Binary files /dev/null and b/public/images/select2x2.png differ
diff --git a/public/images/sortable.png b/public/images/sortable.png
new file mode 100644
index 0000000..1bca649
Binary files /dev/null and b/public/images/sortable.png differ
diff --git a/public/images/spacer.gif b/public/images/spacer.gif
new file mode 100644
index 0000000..5bfd67a
Binary files /dev/null and b/public/images/spacer.gif differ
diff --git a/public/images/sparator_v.png b/public/images/sparator_v.png
new file mode 100644
index 0000000..8cf5662
Binary files /dev/null and b/public/images/sparator_v.png differ
diff --git a/public/images/table-cell-align.png b/public/images/table-cell-align.png
new file mode 100644
index 0000000..ddf4285
Binary files /dev/null and b/public/images/table-cell-align.png differ
diff --git a/public/images/tangram-colorpicker.png b/public/images/tangram-colorpicker.png
new file mode 100644
index 0000000..738e500
Binary files /dev/null and b/public/images/tangram-colorpicker.png differ
diff --git a/public/images/themeforest.png b/public/images/themeforest.png
new file mode 100644
index 0000000..4d3b9fa
Binary files /dev/null and b/public/images/themeforest.png differ
diff --git a/public/images/toolbar_bg.png b/public/images/toolbar_bg.png
new file mode 100644
index 0000000..7ab685f
Binary files /dev/null and b/public/images/toolbar_bg.png differ
diff --git a/public/images/unhighlighted.gif b/public/images/unhighlighted.gif
new file mode 100644
index 0000000..7ad0b67
Binary files /dev/null and b/public/images/unhighlighted.gif differ
diff --git a/public/images/upload.png b/public/images/upload.png
new file mode 100644
index 0000000..08d4d92
Binary files /dev/null and b/public/images/upload.png differ
diff --git a/public/images/upload1.png b/public/images/upload1.png
new file mode 100644
index 0000000..c9056ca
Binary files /dev/null and b/public/images/upload1.png differ
diff --git a/public/images/upload2.png b/public/images/upload2.png
new file mode 100644
index 0000000..57ce63f
Binary files /dev/null and b/public/images/upload2.png differ
diff --git a/public/images/uploadfile.png b/public/images/uploadfile.png
new file mode 100644
index 0000000..eed7fa0
Binary files /dev/null and b/public/images/uploadfile.png differ
diff --git a/public/images/videologo.gif b/public/images/videologo.gif
new file mode 100644
index 0000000..555af74
Binary files /dev/null and b/public/images/videologo.gif differ
diff --git a/public/images/word.gif b/public/images/word.gif
new file mode 100644
index 0000000..9ef5d09
Binary files /dev/null and b/public/images/word.gif differ
diff --git a/public/images/wordpaste.png b/public/images/wordpaste.png
new file mode 100644
index 0000000..9367758
Binary files /dev/null and b/public/images/wordpaste.png differ
diff --git a/server/config/common.js b/server/config/common.js
index 6d99572..c1a61fb 100644
--- a/server/config/common.js
+++ b/server/config/common.js
@@ -13,8 +13,8 @@ var config = {
redis: null,
apiKey: 'sd4H1ecAqlp',
port: 30016,
- //domain: 'http://192.168.102.202:8088/platform',
- domain: 'http://172.16.6.227:8088/platform',
+ domain: 'http://192.168.102.202:8088/platform',
+ //domain: 'http://172.16.6.227:8088/platform',
loggers: {
api: {
level: 'verbose',
diff --git a/server/views/pages/goods/netsale-edit.html b/server/views/pages/goods/netsale-edit.html
index 65997fc..4b0fb0d 100644
--- a/server/views/pages/goods/netsale-edit.html
+++ b/server/views/pages/goods/netsale-edit.html
@@ -9,9 +9,9 @@
<li><a href="#">商品管理</a></li>
- <li>编辑</li>
+ <li>{{subtitle}}</li>
</ul>
- <h4>编辑商品信息</h4>
+ <h4>{{maintitle}}</h4>
</div>
</div>
</div>
@@ -45,6 +45,7 @@
<div class="panel panel-primary">
<div class="panel-heading">
<a class="netsale-position" href="javascript:;" name="position9"></a>
+ <a id="editProductName" class="btn btn-default" href="javascript:;" style="position: absolute;left: 40%;top: 20%;">去编辑商品名称</a>
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
@@ -72,30 +73,32 @@
<div class="floatnav">
<ul>
- <li>
- <a href="#position1"><i class="required-icon"></i>上架前必填</a>
+ <li name="position1">
+ <a href="javascript:;"><i class="required-icon"></i>上架前必填</a>
<ul class="sub-floatnav">
- <li><a href="#position2"><i class="required-icon"></i>基本信息</a></li>
- <li><a href="#position3"><i class="required-icon"></i>封面设置</a></li>
- <li><a href="#position4"><i class="required-icon"></i>商品描述</a></li>
- <li><a href="#position5"><i class="required-icon"></i>尺码信息</a></li>
- <li><a href="#position6"><i class="required-icon"></i>商品参数</a></li>
- <li><a href="#position7"><i class="required-icon"></i>商品排序</a></li>
+ <li name="position2"><a href="javascript:;"><i class="required-icon"></i>基本信息</a></li>
+ <li name="position3"><a href="javascript:;"><i class="required-icon"></i>封面设置</a></li>
+ <li name="position4"><a href="javascript:;"><i class="required-icon"></i>商品描述</a></li>
+ <li name="position5"><a href="javascript:;"><i class="required-icon"></i>尺码信息</a></li>
+ <li name="position6"><a href="javascript:;"><i class="required-icon"></i>商品参数</a></li>
+ <li name="position7"><a href="javascript:;"><i class="required-icon"></i>商品排序</a></li>
</ul>
</li>
- <li>
- <a href="#position8">搜索关键词</a>
+ <li name="position8">
+ <a href="javascript:;">搜索关键词</a>
</li>
- <li>
- <a href="#position9">上架后补全</a>
+ <li name="position9">
+ <a href="javascript:;">上架后补全</a>
<ul class="sub-floatnav">
- <li><a href="#position10">模特</a></li>
- <li><a href="#position11">品牌关联</a></li>
- <li><a href="#position12">小编推荐</a></li>
- <li><a href="#position13">搭配</a></li>
+ <li name="position10"><a href="javascript:;">模特</a></li>
+ <li name="position11"><a href="javascript:;">品牌关联</a></li>
+ <li name="position12"><a href="javascript:;">小编推荐</a></li>
+ <li name="position13"><a href="javascript:;">搭配</a></li>
</ul>
</li>
</ul>
+ <i class="glyphicon glyphicon-chevron-right"></i>
+ <i class="glyphicon glyphicon-chevron-left"></i>
</div>
<script type="text/template" id="picDialogTemp">
diff --git a/server/views/pages/goods/netsale.html b/server/views/pages/goods/netsale.html
index ca67163..c6b2145 100644
--- a/server/views/pages/goods/netsale.html
+++ b/server/views/pages/goods/netsale.html
@@ -38,11 +38,11 @@
<div class="panel-col2">
<input id="productName" class="form-control panel-input" type="text" placeholder="商品名称">
</div>
- <!-- <div class="panel-col2">
+ <div class="panel-col2">
<select name="shopId" id="shopId" tabindex="-1" title="" class="form-control">
<option value="-1">请选择店铺</option>
</select>
- </div> -->
+ </div>
<div class="panel-col">
<select name="brandId" id="brandId" tabindex="-1" title="" class="form-control">
<option value="-1">请选择品牌</option>
@@ -105,7 +105,7 @@
</div>
<div class="panel-col">
<select name="productStatus" id="productStatus" tabindex="-1" title="" class="form-control height40">
- <option value="">状态</option>
+ <option value="">上架状态</option>
<option value="8">待上架</option>
<option value="2">待审核</option>
<option value="3">驳回</option>
@@ -142,9 +142,9 @@
</div>
<div class="row" style="margin: 0 0 0 -5px;">
- <a id="onshelve" href="javascript:;" class="btn btn-default">上架</a>
- <a id="offshelve" href="javascript:;" class="btn btn-default">下架</a>
- <a id="export-btn" href="javascript:;" class="btn btn-default">导出</a>
+ <a id="onshelve" href="javascript:;" class="btn btn-info" >上架</a>
+ <a id="offshelve" href="javascript:;" class="btn btn-info">下架</a>
+ <a id="export-btn" href="javascript:;" class="btn btn-info">导出</a>
<a id="import-btn" href="/goods/netsale/batch" class="btn btn-info">批量（排序、款型系列）</a>
</div>
</div>
@@ -160,7 +160,6 @@
</div>
<input type="hidden" id="gridurl" value="{{gridurl}}">
-<input type="hidden" id="shopId" value="{{auth.shopId}}">
<script type="text/template" id="onshelve-template">
<form class="shelve-form form-horizontal form-bordered">
@@ -216,4 +215,22 @@
<p style="color: red;">商品名称：{productName}</p>
<div id="shelve-table" class="dataTables_wrapper no-footer"></div>
-</script>
\ No newline at end of file
+</script>
+
+<script type="text/template" id="template2">
+[[each goodsSizeList as item index]]
+ <div class="subhhead">
+ <span>[[item.productSku]]</span>
+ <span>[[item.sizeName]]</span>
+ <span>[[item.stock]]</span>
+ <span>[[ ["下架","上架"][item.status] ]]</span>
+ <span>
+ [[if item.status]]
+ <a class="btn btn-danger btnsku" data-subindex='[[index]]' data-index=[[__index]] href="javascript:;">下架</a>
+ [[else]]
+ <a class="btn btn-success btnsku" data-subindex='[[index]]' data-index=[[__index]] href="javascript:;">上架</a>
+ [[/if]]
+ </span>
+ </div>
+[[/each]]
+</script>
\ No newline at end of file
diff --git a/server/views/partials/netsale/add-info.html b/server/views/partials/netsale/add-info.html
index 5fa1865..61e125c 100644
--- a/server/views/partials/netsale/add-info.html
+++ b/server/views/partials/netsale/add-info.html
@@ -1,6 +1,8 @@
<div class="panel panel-default">
<div class="panel-heading">
+
<div class="panel-btns" style="display: none;">
+
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
<h2 class="panel-title">补全信息</h2>
@@ -13,50 +15,116 @@
</div>
</div>
-
-<script type="text/template" id="addInfoTemp">
- <div id="productStyleWrap" class="form-group">
- <div class="col-sm-1">商品风格：</div>
- <div class="col-sm-11">
- [[each productStyle as a index]]
- [[if index=="data"]]
- [[each a as b index]]
- <label style="cursor: pointer;"><input type="checkbox" name="style" value="[[b.text]]">[[b.text]]</label>
- [[/each]]
- [[/if]]
- [[/each]]
- <input id="style" type="hidden" for="checkbox" value="[[style]]">
- </div>
+<!-- <div id="productStyleWrap" class="form-group">
+ <div class="col-sm-1">商品风格：</div>
+ <div class="col-sm-11">
+ [[each productStyle as a index]]
+ [[if index=="data"]]
+ [[each a as b index]]
+ [[if index=="attributeValueList"]]
+ [[each b as c index]]
+ <label style="cursor: pointer;"><input type="checkbox" name="style" value="[[c]]">[[c]]</label>
+ [[/each]]
+ [[/if]]
+ [[/each]]
+ [[/if]]
+ [[/each]]
+ <input id="style" type="hidden" for="checkbox" value="[[style]]">
</div>
- <div id="productElementsWrap" class="form-group">
- <div class="col-sm-1">图案纹理：</div>
- <div class="col-sm-11">
- [[each productElements as a index]]
- [[if index=="data"]]
- [[each a as b index]]
- <label style="cursor: pointer;"><input type="checkbox" name="pattern" value="[[b.text]]">[[b.text]]</label>
- [[/each]]
- [[/if]]
+</div>
+<div id="productElementsWrap" class="form-group">
+ <div class="col-sm-1">图案纹理：</div>
+ <div class="col-sm-11">
+ [[each productElements as a index]]
+ [[if index=="data"]]
+ [[each a as b index]]
+ [[if index=="attributeValueList"]]
+ [[each b as c index]]
+ <label style="cursor: pointer;"><input type="checkbox" name="pattern" value="[[c]]">[[c]]</label>
+ [[/each]]
+ [[/if]]
+
+ [[/each]]
+ [[/if]]
+ [[/each]]
+ <input id="pattern" type="hidden" for="checkbox" value="[[pattern]]">
+ </div>
+</div>
+<div class="making-process-wrap form-group">
+ <label>制作工艺：</label>
+ <span>
+ [[each makingProcess as a index]]
+ [[each a.items as b index]]
+ <label style="cursor: pointer;"><input type="checkbox" name="makeCrafts" value="[[b]]">[[b]]</label>
+ [[/each]]
[[/each]]
- <input id="pattern" type="hidden" for="checkbox" value="[[pattern]]">
- </div>
+ <input id="makeCrafts" type="hidden" for="checkbox" value="[[makeCrafts]]">
+ </span>
</div>
+ <div id="wearSenseWrap" class="form-group">
+ <label>舒适度：</label>
+ [[each productComfort as a index]]
+ [[if index=="data"]]
+ [[each a as b index]]
+ <div style="display: inline-block;width: 140px;">
+ <label>[[b.text]]</label>
+ <select name="[[b.id]]" class="form-control">
+ <option value="">请选择</option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ </select>
+ <input type="hidden" value="[[b.value]]">
+ </div>
+ [[/each]]
+ [[/if]]
+ [[/each]]
+ </div>-->
+<script type="text/template" id="addInfoTemp">
+ [[each attributes as a index]]
+ [[if index=="data"]]
+ [[each a as b index]]
+ <div class="attribute-group form-group">
+ <label>[[b.attributeName]]：</label>
+ [[if b.inputType=='select']]
+ <div style="display: inline-block;width: 280px;">
+ <select class="form-control" id="[[b.attributeId]]" value="[[b.selectedValues||'']]">
+ [[each b.idNameList as c index]]
+ <option value="[[c.id]]">[[c.text]]</option>
+ [[/each]]
+ </select>
+ </div>
+ [[else]]
+ <span>
+ [[each b.idNameList as c index]]
+ <label style="cursor: pointer;"><input name="[[b.attributeId]]" type="[[b.inputType]]" value="[[c.id]]">[[c.text]]</label>
+ [[/each]]
+ </span>
+ <input id="[[b.attributeId]]" type="hidden" for="[[b.inputType]]" value="[[b.selectedValues||'']]">
+ [[/if]]
+
+ </div>
+ [[/each]]
+ [[/if]]
+ [[/each]]
<div id="brandModelWrap" class="form-group">
- <div class="col-sm-1">品牌款型：</div>
- <div class="col-sm-2">
- <select name="brandModelSelect" id="brandModelSelect" tabindex="-1" title="" class="form-control">
+ <label>品牌款型：</label>
+ <div style="display: inline-block;width: 280px;">
+ <select name="brandModelSelect" id="brandModelSelect" tabindex="-1" title="" class="form-control" >
[[if brandModelText]]
<option value="[[brandModel]]">[[brandModelText]]</option>
[[else]]
<option value="">请选择品牌款型</option>
[[/if]]
</select>
- <input type="hidden" id="brandModel" value="[[brandModel]]">
</div>
+ <input type="hidden" id="brandModel" value="[[brandModel]]">
</div>
<div id="brandSeriesWrap" class="form-group">
- <div class="col-sm-1">品牌系列：</div>
- <div class="col-sm-2">
+ <label>品牌系列：</label>
+ <div style="display: inline-block;width: 280px;">
<select name="brandSeriesSelect" id="brandSeriesSelect" tabindex="-1" title="" class="form-control">
[[if brandSeriesText]]
<option value="[[brandSeries]]">[[brandSeriesText]]</option>
@@ -64,55 +132,20 @@
<option value="">请选择品牌系列</option>
[[/if]]
</select>
- <input type="hidden" id="brandSeries" value="[[brandSeries]]">
- </div>
- </div>
- <div class="making-process-wrap form-group">
- <div class="col-sm-1">制作工艺：</div>
- <div class="col-sm-11">
- [[each makingProcess as a index]]
- [[each a.items as b index]]
- <label style="cursor: pointer;"><input type="checkbox" name="makeCrafts" value="[[b]]">[[b]]</label>
- [[/each]]
- [[/each]]
- <input id="makeCrafts" type="hidden" for="checkbox" value="[[makeCrafts]]">
- </div>
- </div>
- <div id="wearSenseWrap" class="form-group">
- <div class="col-sm-1">舒适度：</div>
- <div class="col-sm-11">
- [[each productComfort as a index]]
- [[if index=="data"]]
- [[each a as b index]]
- <div class="col-sm-2">
- <label>[[b.text]]</label>
- <select name="[[b.id]]" class="form-control">
- <option value="">请选择</option>
- <option value="1">1</option>
- <option value="2">2</option>
- <option value="3">3</option>
- <option value="4">4</option>
- <option value="5">5</option>
- </select>
- <input type="hidden" value="[[b.value]]">
- </div>
- [[/each]]
- [[/if]]
- [[/each]]
</div>
+ <input type="hidden" id="brandSeries" value="[[brandSeries]]">
</div>
+
<div class="form-group">
- <div class="col-sm-1">促销短语：</div>
- <div class="col-sm-11">
- <input id="salesPhrase" class="form-control" type="text" value="[[salesPhrase]]">
- </div>
+ <label>促销短语：</label>
+ <input id="salesPhrase" class="form-control" type="text" value="[[salesPhrase]]" style="display: inline-block;width: 280px;">
</div>
<div class="form-group">
- <div class="col-sm-1">是否促销：</div>
- <div class="col-sm-11">
+ <label>是否热销：</label>
+ <span>
<label class="radio-inline"><input type="radio" name="isHostsell" value="Y">是</label>
<label class="radio-inline"><input type="radio" name="isHostsell" value="N">否</label>
<input id="isHostsell" type="hidden" for="radio" value="[[isHostsell]]">
- </div>
+ </span>
</div>
</script>
\ No newline at end of file
diff --git a/server/views/partials/netsale/basic-info.html b/server/views/partials/netsale/basic-info.html
index d321ca3..603fa39 100644
--- a/server/views/partials/netsale/basic-info.html
+++ b/server/views/partials/netsale/basic-info.html
@@ -8,7 +8,13 @@
</div>
<div id="basicInfoWrap" class="panel-body nopadding">
<div id="basic-info"></div>
- <div id="goods-table"></div>
+ <div id="goods-table">
+ <div class="form-group">
+ <h5>能否补货</h5>
+ <div id="suppled-table" class="dataTables_wrapper no-footer">
+ </div>
+ </div>
+ </div>
<div id="product-ext"></div>
</div>
<div class="panel-footer">
@@ -43,13 +49,19 @@
<div class="col-sm-3">商品类型：[[attribute]]</div>
</div>
<div class="form-group">
- <div class="col-sm-2 height40">商品名称<i class="red">*</i>：</div>
+
+ <div class="col-sm-12">
+ <label>商品名称<i class="red">*</i>：</label>
+ [[if renderType=='edit']]
+ <input id="productName" style="width: 280px;display:inline-block;" class="form-control" placeholder="基础商品名称" type="text" value="[[productName]]" required maxlength="100">
+ [[else]]
+ <span>[[productName]]</span>
+ [[/if]]
+ </div>
[[if renderType=='edit']]
- <div class="col-sm-8"><input id="productName" class="form-control" placeholder="基础商品名称" type="text" value="[[productName]]" required></div>
- <div class="col-sm-12" style="color: red;"><div class="col-sm-2"></div>建议名称：【品牌英文+性别+图案纹理+版型+风格+三级类目+商家款号+（款型）】，如此可增加商品在搜索页的展示。</div>
- [[else]]
- <div class="col-sm-8 height40">[[productName]]</div>
+ <div class="col-sm-12" style="color: red;padding: 0 0 0 85px;">建议名称：【品牌英文+性别+图案纹理+版型+风格+三级类目+商家款号+（款型）】，如此可增加商品在搜索页的展示。</div>
[[/if]]
+
</div>
<div class="form-group">
<div class="col-sm-12">商品话题：[[productTag]]</div>
@@ -78,12 +90,12 @@
<div class="col-sm-3">销售价：[[salesPrice]]</div>
</div>
<div class="form-group">
- <div class="col-sm-3">是否VIP：</div>
+ <div class="col-sm-3">是否VIP：[[isVip]]</div>
<div class="col-sm-3">预计上架时间：[[expectShelfTime]]</div>
</div>
</script>
-<script type="text/template" id="goodsList">
+<!-- <script type="text/template" id="goodsList">
<div class="form-group">
<h5>能否补货</h5>
<table class="table table-bordered">
@@ -113,20 +125,28 @@
</tbody>
</table>
</div>
-</script>
+</script> -->
<script type="text/template" id="productExtBoTemp">
<div class="form-group">
<blockquote>上架必填</blockquote>
</div>
<div class="form-group">
- <div class="col-sm-2 height40">商品短评<i class="red">*</i>：</div>
+ <!-- <div class="col-sm-2 height40">商品短评<i class="red">*</i>：</div>
<div class="col-sm-8 height40">
[[if renderType=='edit']]
<input id="phrase" class="form-control" placeholder="商品短评" value="[[phrase]]" type="text" required>
[[else]]
<span>[[phrase]]</span>
[[/if]]
+ </div> -->
+ <div class="col-sm-12">
+ <label>商品短评<i class="red">*</i>：</label>
+ [[if renderType=='edit']]
+ <input id="phrase" style="display:inline-block;width: 280px;" class="form-control" placeholder="商品短评" type="text" value="[[phrase]]" required>
+ [[else]]
+ <span>[[phrase]]</span>
+ [[/if]]
</div>
</div>
<div class="form-group">
diff --git a/server/views/partials/netsale/brand-relation.html b/server/views/partials/netsale/brand-relation.html
index 2d6ec9c..6a450c8 100644
--- a/server/views/partials/netsale/brand-relation.html
+++ b/server/views/partials/netsale/brand-relation.html
@@ -21,9 +21,11 @@
<div class="col-sm-1" style="text-align:center;">[[index]]</div>
<div class="col-sm-10">
[[each item as a index]]
- <div class="col-sm-2 ckbox ckbox-default">
- <input id="brand-[[a.brandName]]" name="brandRelationList" type="checkbox" value="[[a.id]]" data-name="[[a.brandName]]">
- <label style="width:80%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;" for="brand-[[a.brandName]]">[[a.brandName]]</label>
+ <div class="col-sm-2">
+ <label style="width:80%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;cursor: pointer;">
+ <input name="brandRelationList" type="checkbox" value="[[a.id]]" data-name="[[a.brandName]]">
+ [[a.brandName]]
+ </label>
</div>
[[/each]]
</div>
diff --git a/server/views/partials/netsale/close-match.html b/server/views/partials/netsale/close-match.html
index 353dd69..2854203 100644
--- a/server/views/partials/netsale/close-match.html
+++ b/server/views/partials/netsale/close-match.html
@@ -26,9 +26,9 @@
[[if imageUrl]]
<img src="[[imageUrl]]">
[[/if]]
- [[each infoStr as item __index]]
+ [[each info as item __index]]
<div class="pos form-control" style="left:[[item.left]]px;top:[[item.top]]px;">
- <input type="text" class="pos-text" data-index='[[__index]]' value="[[item.id]]" />
+ <input type="text" maxlength="8" class="pos-text" data-index='[[__index]]' value="[[item.id]]" onkeyup="this.value=this.value.replace(/\D/gi,'')"/>
<span class="close" data-index='[[__index]]'>×</span>
</div>
[[/each]]
@@ -37,20 +37,20 @@
<div class="col-sm-4">
<div class="rows" id="dapei-form">
<div class="form-group">
- <label for="endTime" class="col-sm-2 control-label"><i class="red">*</i> 介绍</label>
- <div class="col-sm-10">
+ <label class="control-label pull-left"><i class="red">*</i> 介绍</label>
+ <div class="pull-left" style="width: 160px;">
<input type="text" id="content" class="form-control panel-input hasDatepicker" placeholder="介绍" value="[[content]]" required>
</div>
</div>
<div class="form-group">
- <label for="endTime" class="col-sm-2 control-label"><i class="red">*</i> 图片</label>
- <div class="col-sm-10">
+ <label class="control-label pull-left"><i class="red">*</i> 图片</label>
+ <div class="pull-left" style="width: 160px;">
<input type="file" id="imageUrl" name="imageUrl" value="[[imageUrl]]" required/>
</div>
</div>
<div class="form-group">
- <label for="endTime" class="col-sm-2 control-label"><i class="red">*</i> 排序</label>
- <div class="col-sm-10">
+ <label class="control-label pull-left"><i class="red">*</i> 排序</label>
+ <div class="pull-left" style="width: 160px;">
<input type="number" id="orderBy" class="form-control panel-input hasDatepicker" placeholder="排序" value="[[orderBy]]" required>
</div>
</div>
@@ -62,7 +62,7 @@
<script type="text/template" id="kapian">
<div class="pos form-control">
- <input type="text" class="pos-text" data-index='[[__index]]' value="[[id]]" />
+ <input type="text" maxlength="8" class="pos-text" data-index='[[__index]]' value="[[id]]" onkeyup="this.value=this.value.replace(/\D/gi,'')" />
<span class="close" data-index='[[__index]]'>×</span>
</div>
</script>
\ No newline at end of file
diff --git a/server/views/partials/netsale/fenmian.html b/server/views/partials/netsale/fenmian.html
index 8890ed6..c72cfa2 100644
--- a/server/views/partials/netsale/fenmian.html
+++ b/server/views/partials/netsale/fenmian.html
@@ -1,110 +1,127 @@
<div class="panel panel-default">
- <div class="panel-heading">
- <a class="netsale-position" href="javascript:;" name="position3"></a>
- <div class="panel-btns" style="display: none;">
- <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
- </div>
- <h2 class="panel-title">封面设置</h2>
- </div>
- <div class="panel-body nopadding" id="fenmianWrap">
-
-
- </div>
- <div class="panel-footer">
- <button class="btn btn-primary" id="fenMainSave">保存</button>
+ <div class="panel-heading">
+ <a class="netsale-position" href="javascript:;" name="position3"></a>
+ <div class="panel-btns" style="display: none;">
+ <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
+ <h2 class="panel-title">封面设置</h2>
+ </div>
+ <div class="panel-body nopadding" id="fenmianWrap">
+
+
+ </div>
+ <div class="panel-footer">
+ <button class="btn btn-primary" id="fenMainSave">保存</button>
</div>
+</div>
+
<script type="text/template" id="fenmianTemp">
[[each goodsList as item index]]
<div class="form-group">
- <div class="col-sm-1">
- <div class="goods-img">
+ <div class="fm-side col-sm-2">
+ <div class="goods-img">
<p>SKC: [[item.productSkc]]</p>
<p>[[item.goodsName]]：</p>
- <p>[[item.factoryGoodsName]]</p>
+ <p>[[item.factoryGoodsName || '']]</p>
</div>
-
- </div>
- <div class="col-sm-11">
- <ul class="cover-image-list col-sm-12" data-index=[[index]]>
- [[each item.goodsImagesList as _item _index]]
- <li class="cover-image-item fileinput-button" data-index=[[_index]]>
- <div class="goods-img">
- <a class="fileinput-button-icon" href="javascript:void(0);"><img src="[[_item.imageUrl]]"></a>
- </div>
- </li>
- [[/each]]
- <li class="cover-image-item fileinput-button">
- <div class="goods-img">
- <a class="fileinput-button-icon" href="javascript:void(0);">+</a>
- <input type="file" class="goods-img-upload fenmianfile" name="fenmianfile" data-index=[[index]]>
- </div>
- </li>
- </ul>
+ <div class="cover-color">颜色封面：</div>
</div>
+ <ul class="cover-image-list col-sm-10" style="padding: 0;margin: 0;" data-index=[[index]]>
+ [[each item.goodsImagesList as _item _index]]
+ <li class="cover-image-item fileinput-button" data-index=[[_index]]>
+ <div class="goods-img">
+ <a class="fileinput-button-icon" href="javascript:void(0);"><img src="[[_item.imageUrl]]"></a>
+ <i class="remove-item-btn glyphicon glyphicon-remove-circle"></i>
+ </div>
+ <div class="cover-color">
+ [[if _item.isDefault=="Y"]]
+ <a href="javascript:;" class="btn btn-default btn-metro info">默认</a>
+ [[else]]
+ <a href="javascript:;" class="btn btn-default btn-metro">默认</a>
+ [[/if]]
+
+ [[if _item.genderCover==1]]
+ <a href="javascript:;" class="btn btn-default btn-metro info">男封</a>
+ [[else]]
+ <a href="javascript:;" class="btn btn-default btn-metro">男封</a>
+ [[/if]]
+
+ [[if _item.genderCover==2]]
+ <a href="javascript:;" class="btn btn-default btn-metro info">女封</a>
+ [[else]]
+ <a href="javascript:;" class="btn btn-default btn-metro">女封</a>
+ [[/if]]
+ </div>
+ </li>
+ [[/each]]
+ <li class="cover-image-item fileinput-button">
+ <div class="goods-img">
+ <a class="fileinput-button-icon" href="javascript:void(0);">+</a>
+ <input type="file" class="goods-img-upload fenmianfile" name="fenmianfile" data-index=[[index]]>
+ </div>
+ </li>
+ </ul>
</div>
- <div class="form-group">
- <div class="col-sm-1">
+ <!-- <div class="form-group">
+ <div class="col-sm-2">
<div class="height40">颜色封面：</div>
</div>
- <div class="col-sm-11">
- <div id="cover-color" class="cover-color col-sm-12 height40">
+ <div class="col-sm-10">
+ <div class="cover-color col-sm-12">
[[each item.goodsImagesList as _item _index]]
- <div class="cover-color-box">
+ <div class="cover-color-box height40">
[[if _item.isDefault=="Y"]]
<a href="javascript:;" class="btn btn-default btn-metro info">默认</a>
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro">默认</a>
[[/if]]
-
+
[[if _item.genderCover==1]]
<a href="javascript:;" class="btn btn-default btn-metro info">男封</a>
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro">男封</a>
[[/if]]
-
+
[[if _item.genderCover==2]]
<a href="javascript:;" class="btn btn-default btn-metro info">女封</a>
[[else]]
<a href="javascript:;" class="btn btn-default btn-metro">女封</a>
[[/if]]
</div>
- [[/each]]
-
-
+ [[/each]]
</div>
</div>
- </div>
+ </div> -->
<div class="form-group">
- <div class="col-sm-1">
- <div class="goods-color height40">商品封面：</div>
- </div>
- <div class="col-sm-11">
- <div class="goods-color height40">
+ <div class="fm-side col-sm-2">商品封面：</div>
+ <div class="cover-goods col-sm-10">
[[if item.isDefault=="Y"]]
- <a href="javascript:;" class="btn btn-default btn-metro info" data-index=[[index]]>设置默认</a>
+ <a href="javascript:;" class="btn btn-default btn-metro info" data-index=[[index]]>设置默认</a>
[[else]]
- <a href="javascript:;" class="btn btn-default btn-metro" data-index=[[index]]>设置默认</a>
+ <a href="javascript:;" class="btn btn-default btn-metro" data-index=[[index]]>设置默认</a>
[[/if]]
- <!-- <a href="javascript:;" class="btn btn-default btn-metro">调用图片</a> -->
- </div>
- </div>
+ </div>
</div>
[[/each]]
-
</script>
<script type="text/template" id="fenmianImgTemp">
- <li class="cover-image-item fileinput-button" data-index=[[__index]]>
+ <li class="cover-image-item fileinput-button" data-index=[[_index]]>
<div class="goods-img">
- <a class="fileinput-button-icon" href="javascript:void(0);"><img src="[[imageUrl]]"></a>
+ <a class="fileinput-button-icon" href="javascript:void(0);"><img src="[[imageUrl]]"></a>
+ <i class="remove-item-btn glyphicon glyphicon-remove-circle"></i>
+ </div>
+ <div class="cover-color">
+ <a href="javascript:;" class="btn btn-default btn-metro">默认</a>
+ <a href="javascript:;" class="btn btn-default btn-metro">男封</a>
+ <a href="javascript:;" class="btn btn-default btn-metro">女封</a>
</div>
</li>
</script>
-<script type="text/template" id="colorCoverTemp">
- <div class="cover-color-box">
+<!-- <script type="text/template" id="colorCoverTemp">
+ <div class="cover-color-box height40">
<a href="javascript:;" class="btn btn-default btn-metro">默认</a>
<a href="javascript:;" class="btn btn-default btn-metro">男封</a>
<a href="javascript:;" class="btn btn-default btn-metro">女封</a>
</div>
-</script>
\ No newline at end of file
+</script> -->
\ No newline at end of file
diff --git a/server/views/partials/netsale/goods-description.html b/server/views/partials/netsale/goods-description.html
index a2239f9..3213e65 100644
--- a/server/views/partials/netsale/goods-description.html
+++ b/server/views/partials/netsale/goods-description.html
@@ -11,6 +11,7 @@
<script id="edit-descriptioner" type="text/plain" style="width:100%;height:500px;"></script>
</div>
<div class="panel-footer">
+ <input type="hidden" id="productDesc" required placeholder="商品描述">
<button class="btn btn-primary" id="btn-descriptioner">保存描述</button>
</div>
</form>
diff --git a/server/views/partials/netsale/goods-params.html b/server/views/partials/netsale/goods-params.html
index 3dc6bc9..1dda9a9 100644
--- a/server/views/partials/netsale/goods-params.html
+++ b/server/views/partials/netsale/goods-params.html
@@ -6,20 +6,14 @@
</div>
<h2 class="panel-title">商品参数</h2>
</div>
- <div class="panel-body nopadding">
- <div class="form-group" id="material-group">
-
- </div>
- <div class="form-group" id="washTip-group">
-
- </div>
+ <div id="goodsParamWrap" class="panel-body nopadding">
</div>
- <div class="panel-footer">
- <button class="btn btn-primary" id="propertySave">保存</button>
+ <div class="panel-footer" id="goodsParams-footer">
+ <a href="javascript:;" class="btn btn-primary" id="propertySave">保存</a>
</div>
</div>
-<script type="text/template" id="material-params">
+<!-- <script type="text/template" id="material-params">
<label class="col-sm-2 control-label">材质</label>
<div class="col-sm-8 height40">
[[each data as item index]]
@@ -38,4 +32,20 @@
[[/each]]
</div>
<input type="hidden" id="washTips" value="{washTips}" for="checkbox">
+</script> -->
+
+<script type="text/template" id="goodsParamTemp">
+ [[each data as b index]]
+ [[if b.idNameList && b.idNameList.length>0]]
+ <div class="goods-param-group form-group">
+ <label>[[b.attributeName]]：</label>
+ <span>
+ [[each b.idNameList as c index]]
+ <label style="cursor: pointer;"><input name="[[b.attributeId]]" type="[[b.inputType]]" value="[[c.id]]">[[c.text]]</label>
+ [[/each]]
+ </span>
+ <input id="[[b.attributeId]]" type="hidden" for="[[b.inputType]]" value="[[b.selectedValues]]" [[b.isMust=="N"?"":"required"]] placeholder="[[b.attributeName]]">
+ </div>
+ [[/if]]
+ [[/each]]
</script>
\ No newline at end of file
diff --git a/server/views/partials/netsale/goods-sort.html b/server/views/partials/netsale/goods-sort.html
index 62d1b76..9f6e7a7 100644
--- a/server/views/partials/netsale/goods-sort.html
+++ b/server/views/partials/netsale/goods-sort.html
@@ -1,7 +1,7 @@
<div class="panel panel-default">
- <form action="" class="form-horizontal form-bordered">
- <a class="netsale-position" href="javascript:;" name="position7"></a>
+
<div class="panel-heading">
+ <a class="netsale-position" href="javascript:;" name="position7"></a>
<div class="panel-btns" style="display: none;">
<a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
@@ -11,15 +11,15 @@
<div class="form-group">
<label class="col-sm-1 control-label" for="sort0">品牌</label>
<div class="col-sm-2">
- <input type="text" class="form-control" id="sort0" value="0" required="required" />
+ <input type="text" class="form-control" id="sort0" value="0" required />
</div>
<label class="col-sm-1 control-label" for="sort1">奥莱</label>
<div class="col-sm-2">
- <input type="text" class="form-control" id="sort1" value="0" required="required" />
+ <input type="text" class="form-control" id="sort1" value="0" required />
</div>
<label class="col-sm-1 control-label" for="sort2">搜索</label>
<div class="col-sm-2">
- <input type="text" class="form-control" id="sort2" value="0" required="required" />
+ <input type="text" class="form-control" id="sort2" value="0" required />
</div>
</div>
<div class="col-sm-12" style="color: red;"><div class="col-sm-1"></div>提示：商品在品牌商品列表中的排序，数字越大越靠前</div>
@@ -27,5 +27,4 @@
<div class="panel-footer">
<button class="btn btn-primary" id="sort-save">保存</button>
</div>
- </form>
</div>
\ No newline at end of file
diff --git a/server/views/partials/netsale/search-key.html b/server/views/partials/netsale/search-key.html
index 90334e3..09328c5 100644
--- a/server/views/partials/netsale/search-key.html
+++ b/server/views/partials/netsale/search-key.html
@@ -16,7 +16,7 @@
</div>
<div class="height40" style="color: red;">每个关键词请用英文“，”隔开</div>
</div>
- <div class="form-group">
+ <div class="form-group" id="search-key-list">
<label class="col-sm-1 control-label height40">搜索热词:</label>
<div class="col-sm-6" id="search-key">
diff --git a/server/views/partials/netsale/size-info.html b/server/views/partials/netsale/size-info.html
index 252f133..e7dce82 100644
--- a/server/views/partials/netsale/size-info.html
+++ b/server/views/partials/netsale/size-info.html
@@ -1,16 +1,14 @@
<div class="panel panel-default">
- <form action="" class="form-horizontal form-bordered">
- <div class="panel-heading">
- <a class="netsale-position" href="javascript:;" name="position5"></a>
- <div class="panel-btns" style="display: none;">
- <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
- </div>
- <h2 class="panel-title">尺码信息</h2>
+ <div class="panel-heading">
+ <a class="netsale-position" href="javascript:;" name="position5"></a>
+ <div class="panel-btns" style="display: none;">
+ <a href="" class="panel-minimize tooltips" data-toggle="tooltip" title=""><i class="fa fa-minus"></i></a>
</div>
- <div class="panel-body nopadding" id="body">
-
- </div>
- </form>
+ <h2 class="panel-title">尺码信息</h2>
+ </div>
+ <div class="panel-body nopadding" id="body">
+
+ </div>
</div>
<script type="text/template" id="sizeifo-template">
<table style="table-layout:fixed " class="table table-striped table-bordered responsive dataTable no-footer">
--
libgit2 0.24.0