From f5317fb4c90c49e908483a43e86a2b98a9da397e Mon Sep 17 00:00:00 2001 From: Denis Shakhov Date: Sat, 14 Apr 2012 21:02:15 +0700 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2?= =?UTF-8?q?=20=D0=B2=20=D1=88=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jquery/markitup/skins/simple/style.css | 8 +- engine/lib/internal/template/js/settings.js | 2 - engine/lib/internal/template/js/topic.js | 3 +- engine/lib/internal/template/js/wall.js | 4 +- .../actions/ActionLink/add.tpl | 4 +- .../actions/ActionPhotoset/add.tpl | 6 +- .../actions/ActionProfile/wall_items.tpl | 8 +- .../ActionProfile/wall_items_reply.tpl | 12 +-- .../actions/ActionQuestion/add.tpl | 4 +- .../actions/ActionSettings/account.tpl | 32 +++++--- .../actions/ActionTopic/add.tpl | 8 +- .../skin/developer-jquery/comment_tree.tpl | 2 +- .../skin/developer-jquery/css/comments.css | 2 +- .../skin/developer-jquery/css/common.css | 2 +- templates/skin/developer-jquery/css/grid.css | 2 +- .../skin/developer-jquery/css/modals.css | 9 ++- templates/skin/developer-jquery/css/topic.css | 5 +- .../developer-jquery/topic_preview_topic.tpl | 5 +- .../skin/developer-jquery/window_load_img.tpl | 76 +++++++++++++------ .../skin/developer-jquery/window_login.tpl | 6 +- 20 files changed, 120 insertions(+), 80 deletions(-) diff --git a/engine/lib/external/jquery/markitup/skins/simple/style.css b/engine/lib/external/jquery/markitup/skins/simple/style.css index d1fa3f49..07027dcb 100644 --- a/engine/lib/external/jquery/markitup/skins/simple/style.css +++ b/engine/lib/external/jquery/markitup/skins/simple/style.css @@ -4,15 +4,18 @@ // ------------------------------------------------------------------*/ .markItUp a: link, .markItUp a: visited { color: #000; text-decoration: none; } -.markItUp { width: 600px; margin-bottom: 5px; } +.markItUp { margin-bottom: 5px; } .markItUpContainer { font: 11px Verdana, Arial, Helvetica, sans-serif; } .markItUpEditor { font: 12px "Courier New", Courier, monospace; padding: 5px; - width: 587px; height: 200px; line-height: 18px; overflow: auto; + width: 100%; + -moz-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid #C0CAD5; } .markItUpPreviewFrame { overflow: auto; @@ -35,7 +38,6 @@ /***************************************************************************************/ /* first row of buttons */ .markItUpHeader { - width: 587px; background: #eee; padding: 5px; border-top: 1px solid #c0cad5; diff --git a/engine/lib/internal/template/js/settings.js b/engine/lib/internal/template/js/settings.js index 6f5e78d4..42e5dc47 100644 --- a/engine/lib/internal/template/js/settings.js +++ b/engine/lib/internal/template/js/settings.js @@ -27,7 +27,6 @@ ls.settings = (function ($) { {name: ls.lang.get('panel_list_li'), className:'editor-li', openWith:'
  • ', closeWith:'
    • ' }, {separator:'---------------' }, {name: ls.lang.get('panel_image'), className:'editor-picture', key:'P', beforeInsert: function(h) { jQuery('#window_upload_img').jqmShow(); } }, - {name: ls.lang.get('panel_image'), className:'editor-image', replaceWith:'' }, {name: ls.lang.get('panel_video'), className:'editor-video', replaceWith:'' }, {name: ls.lang.get('panel_url'), className:'editor-link', key:'L', openWith:'', closeWith:'', placeHolder:'Your text to link...' }, {name: ls.lang.get('panel_user'), className:'editor-user', replaceWith:'' }, @@ -51,7 +50,6 @@ ls.settings = (function ($) { {name: ls.lang.get('panel_quote'), className:'editor-quote', key:'Q', replaceWith: function(m) { if (m.selectionOuter) return '
    '+m.selectionOuter+'
    '; else if (m.selection) return '
    '+m.selection+'
    '; else return '
    ' } }, {name: ls.lang.get('panel_code'), className:'editor-code', openWith:'', closeWith:'' }, {name: ls.lang.get('panel_image'), className:'editor-picture', key:'P', beforeInsert: function(h) { jQuery('#window_upload_img').jqmShow(); } }, - {name: ls.lang.get('panel_image'), className:'editor-image', replaceWith:'' }, {name: ls.lang.get('panel_url'), className:'editor-link', key:'L', openWith:'', closeWith:'', placeHolder:'Your text to link...' }, {name: ls.lang.get('panel_user'), className:'editor-user', replaceWith:'' }, {separator:'---------------' }, diff --git a/engine/lib/internal/template/js/topic.js b/engine/lib/internal/template/js/topic.js index 0b3f0d5f..57b90f64 100644 --- a/engine/lib/internal/template/js/topic.js +++ b/engine/lib/internal/template/js/topic.js @@ -14,8 +14,7 @@ ls.topic = (function ($) { if (result.bStateError) { ls.msg.error(null, result.sMsg); } else { - preview.html(result.sText); - + preview.show().html(result.sText); ls.hook.run('ls_topic_preview_after',[form, preview, result]); } }); diff --git a/engine/lib/internal/template/js/wall.js b/engine/lib/internal/template/js/wall.js index f332ca96..8bb5a35f 100644 --- a/engine/lib/internal/template/js/wall.js +++ b/engine/lib/internal/template/js/wall.js @@ -194,8 +194,8 @@ ls.wall = (function ($) { if (result.bStateError) { ls.msg.error(null, result.sMsg); } else { - $('#wall-item-'+iId).detach(); - $('#wall-reply-item-'+iId).detach(); + $('#wall-item-'+iId).fadeOut().remove(); + $('#wall-reply-item-'+iId).fadeOut().remove(); ls.hook.run('ls_wall_remove_after',[iId, result]); } }); diff --git a/templates/skin/developer-jquery/actions/ActionLink/add.tpl b/templates/skin/developer-jquery/actions/ActionLink/add.tpl index aa10e3c2..6bb37144 100644 --- a/templates/skin/developer-jquery/actions/ActionLink/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionLink/add.tpl @@ -75,9 +75,7 @@ - +
    {hook run='add_topic_link_end'} diff --git a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl index ee507561..ab858a36 100644 --- a/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionPhotoset/add.tpl @@ -85,7 +85,7 @@

    -

    +

    @@ -154,9 +154,7 @@ - +
    {hook run='add_topic_photoset_end'} diff --git a/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl b/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl index 076bded1..9053b090 100644 --- a/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl +++ b/templates/skin/developer-jquery/actions/ActionProfile/wall_items.tpl @@ -11,10 +11,6 @@
    • - {if $oWall->isAllowDelete()} - Удалить - {/if} -
    {$oWall->getText()}
    @@ -22,6 +18,10 @@ {if $oUserCurrent and !$aReplyWall} {/if}
    diff --git a/templates/skin/developer-jquery/actions/ActionProfile/wall_items_reply.tpl b/templates/skin/developer-jquery/actions/ActionProfile/wall_items_reply.tpl index a0b2812e..ace22adf 100644 --- a/templates/skin/developer-jquery/actions/ActionProfile/wall_items_reply.tpl +++ b/templates/skin/developer-jquery/actions/ActionProfile/wall_items_reply.tpl @@ -7,13 +7,15 @@
  • {$oReplyUser->getLogin()}
    • - - {if $oReplyWall->isAllowDelete()} - Удалить - {/if} - +
    {$oReplyWall->getText()}
    + + {if $oReplyWall->isAllowDelete()} + + {/if} {/foreach} \ No newline at end of file diff --git a/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl b/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl index 3d2f64d7..b6eca348 100644 --- a/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionQuestion/add.tpl @@ -89,9 +89,7 @@ - +
    {hook run='add_topic_question_end'} diff --git a/templates/skin/developer-jquery/actions/ActionSettings/account.tpl b/templates/skin/developer-jquery/actions/ActionSettings/account.tpl index 2f283fc3..6e165bf1 100644 --- a/templates/skin/developer-jquery/actions/ActionSettings/account.tpl +++ b/templates/skin/developer-jquery/actions/ActionSettings/account.tpl @@ -18,11 +18,13 @@
    {$aLang.settings_account} -

    - - - {$aLang.settings_profile_mail_notice} -

    +
    +
    +
    + + {$aLang.settings_profile_mail_notice} +
    +
    @@ -31,14 +33,20 @@ {$aLang.settings_account_password_notice} -

    -

    +
    +
    +
    +
    -

    -

    - -

    -

    +
    +
    +
    +
    + +
    +
    +
    +
    {hook run='form_settings_account_end'} diff --git a/templates/skin/developer-jquery/actions/ActionTopic/add.tpl b/templates/skin/developer-jquery/actions/ActionTopic/add.tpl index f289e166..7a0548db 100644 --- a/templates/skin/developer-jquery/actions/ActionTopic/add.tpl +++ b/templates/skin/developer-jquery/actions/ActionTopic/add.tpl @@ -63,7 +63,7 @@

    -

    +

    @@ -88,14 +88,12 @@ - + -

    + {hook run='add_topic_topic_end'} diff --git a/templates/skin/developer-jquery/comment_tree.tpl b/templates/skin/developer-jquery/comment_tree.tpl index 964049d2..cc32bd32 100644 --- a/templates/skin/developer-jquery/comment_tree.tpl +++ b/templates/skin/developer-jquery/comment_tree.tpl @@ -79,7 +79,7 @@
    {hook run='form_add_comment_begin'} - + {hook run='form_add_comment_end'} diff --git a/templates/skin/developer-jquery/css/comments.css b/templates/skin/developer-jquery/css/comments.css index 94ac2d38..d59bb00b 100644 --- a/templates/skin/developer-jquery/css/comments.css +++ b/templates/skin/developer-jquery/css/comments.css @@ -71,5 +71,5 @@ .reply-header { font-size: 20px; line-height: 1.3em; margin-bottom: 15px; } .reply { padding-bottom: 10px; } -.reply textarea { height: 100px; margin-bottom: 10px; } +.reply textarea { height: 100px; } .reply textarea.loader { background: #f7f7f7 url(../images/loader.gif) no-repeat center;} \ No newline at end of file diff --git a/templates/skin/developer-jquery/css/common.css b/templates/skin/developer-jquery/css/common.css index 947450fb..63a2bbfb 100644 --- a/templates/skin/developer-jquery/css/common.css +++ b/templates/skin/developer-jquery/css/common.css @@ -94,8 +94,8 @@ .user-list li .author { font-weight: bold; color: #333; } .user-list-avatar { overflow: hidden; zoom: 1; } +.user-list-avatar li { width: 64px; overflow: hidden; float: left; margin-right: 15px; text-align: center; font-size: 11px; margin-bottom: 10px; } .user-list-avatar li img { margin-bottom: 2px; display: block; } -.user-list-avatar li { width: 64px; overflow: hidden; float: left; margin-right: 15px; text-align: center; font-size: 11px; } diff --git a/templates/skin/developer-jquery/css/grid.css b/templates/skin/developer-jquery/css/grid.css index 93e2b844..2321394f 100644 --- a/templates/skin/developer-jquery/css/grid.css +++ b/templates/skin/developer-jquery/css/grid.css @@ -2,7 +2,7 @@ СЕТКА -------------------------------------------- */ -#container { max-width: 1000px; margin: 0 auto; margin-bottom: 20px; } +#container { width: 1000px; margin: 0 auto; margin-bottom: 20px; } #header { padding: 50px 0; position: relative; } #nav { margin-bottom: 15px; overflow: hidden; } #wrapper { overflow: hidden; zoom: 1; padding: 30px; background: #fff; border-bottom: 1px solid #eee; box-shadow: 0 0 3px rgba(0,0,0,.1); } diff --git a/templates/skin/developer-jquery/css/modals.css b/templates/skin/developer-jquery/css/modals.css index b74c40e9..3cfffdff 100644 --- a/templates/skin/developer-jquery/css/modals.css +++ b/templates/skin/developer-jquery/css/modals.css @@ -57,4 +57,11 @@ .modal.modal-write .write-list li.write-item-type-poll .write-item-image { background-position: -100px 0; } .modal.modal-write .write-list li.write-item-type-link .write-item-image { background-position: -200px 0; } .modal.modal-write .write-list li.write-item-type-photoset .write-item-image { background-position: -300px 0; } -.modal.modal-write .write-list li.write-item-type-blog .write-item-image { background-position: -400px 0; } \ No newline at end of file +.modal.modal-write .write-list li.write-item-type-blog .write-item-image { background-position: -400px 0; } + + +/* Upload Image */ +.modal-image-upload { width: 500px; margin-left: -250px; } + + + diff --git a/templates/skin/developer-jquery/css/topic.css b/templates/skin/developer-jquery/css/topic.css index a9b5e490..ea76c1e9 100644 --- a/templates/skin/developer-jquery/css/topic.css +++ b/templates/skin/developer-jquery/css/topic.css @@ -31,7 +31,6 @@ .topic .topic-footer .topic-info li.topic-info-comments a span { color: #777; } .topic .topic-footer .topic-info li.topic-info-comments a:hover { text-decoration: underline; } - /* Share */ .topic .topic-share { display: none; padding: 3px; margin-bottom: 10px; border: 5px solid #eee; } @@ -120,3 +119,7 @@ .topic.topic-type-talk .talk-recipients h3 { font-size: 16px; font-weight: bold; margin-bottom: 10px; } +/* Topic Preview */ +.topic-preview { margin-top: 30px; } +.topic-preview .profile-page-header { border-top: 1px solid #ddd; } +.topic-preview .topic { margin-bottom: 20px; } \ No newline at end of file diff --git a/templates/skin/developer-jquery/topic_preview_topic.tpl b/templates/skin/developer-jquery/topic_preview_topic.tpl index 5b8e17e3..61b9e1de 100644 --- a/templates/skin/developer-jquery/topic_preview_topic.tpl +++ b/templates/skin/developer-jquery/topic_preview_topic.tpl @@ -1,5 +1,7 @@ {assign var="oUser" value=$oTopic->getUser()} +

    Предпросмотр

    +

    @@ -40,8 +42,7 @@

    -
    - + \ No newline at end of file diff --git a/templates/skin/developer-jquery/window_load_img.tpl b/templates/skin/developer-jquery/window_load_img.tpl index dcd35fac..6c7416aa 100644 --- a/templates/skin/developer-jquery/window_load_img.tpl +++ b/templates/skin/developer-jquery/window_load_img.tpl @@ -4,32 +4,60 @@ - -

    -

    + + +
    + + + +

    +

    + + {hook run="uploadimg_source"} + +

    + + +

    + +

    +

    + + {hook run="uploadimg_additional"} + + + + - {hook run="uploadimg_source"} -

    - - -

    - -

    -

    - - {hook run="uploadimg_additional"} - - - - + +
    \ No newline at end of file diff --git a/templates/skin/developer-jquery/window_login.tpl b/templates/skin/developer-jquery/window_login.tpl index c59fdf8e..4ac16e0f 100644 --- a/templates/skin/developer-jquery/window_login.tpl +++ b/templates/skin/developer-jquery/window_login.tpl @@ -10,10 +10,10 @@ jQuery(function($){ $('div.tab-content:not(:first)').hide(); - $('ul.nav-tabs a').click(function(){ + $('ul.nav-pills-tabs a').click(function(){ if (this.hash) { $('div.tab-content').hide(); - $('ul.nav-tabs li').removeClass('active'); + $('ul.nav-pills-tabs li').removeClass('active'); $('div.tab-content' + this.hash).show(); $(this).parent('li').addClass('active'); } @@ -28,7 +28,7 @@
    -