Author: alevkovsky Date: 2009-03-10 08:02:32 -0400 (Tue, 10 Mar 2009) New Revision: 12902 Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/avatar_default.png Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumsPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagesPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.xhtml trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css Log: Realworld: apply new design for image editing markup, move styles to css Modified: trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties =================================================================== --- trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-10 11:58:49 UTC (rev 12901) +++ trunk/test-applications/realworld2/web/src/main/resources/messages_ru.properties 2009-03-10 12:02:32 UTC (rev 12902) @@ -47,10 +47,10 @@ comment.askForFriend=\u0417\u0430\u043F\u0440\u043E\u0441 \u043D\u0430 \u0434\u0440\u0443\u0436\u0431\u0443 comment.askForFriend.message=\u041F\u043E\u0436\u0430\u043B\u0443\u0439\u0441\u0442\u0430, \u0434\u043E\u0431\u0430\u0432\u044C\u0442\u0435 \u043C\u0435\u043D\u044F \u0432 \u0441\u043F\u0438\u0441\u043E\u043A \u0432\u0430\u0448\u0438\u0445 \u0434\u0440\u0443\u0437\u0435\u0439. comment.date=\u0414\u0430\u0442\u0430\: \#{comment.date} -comment.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 +comment.delete=\u0423\u0434\u0430\u043B\u0438\u0442\u044C comment.edit=\u0420\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 comment.noComments=\u041A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u043A \u044D\u0442\u043E\u0439 \u0444\u043E\u0442\u043E\u0433\u0440\u0430\u0444\u0438\u0438 \u043E\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u044E\u0442 -comment.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043C\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0439 +comment.add=\u0414\u043E\u0431\u0430\u0432\u0438\u0442\u044C comment.save=\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C comment.cancel=\u041E\u0442\u043C\u0435\u043D\u0430 @@ -280,4 +280,4 @@ pics=\u0438\u0437\u043E\u0431\u0440\u0430\u0436\u0435\u043D\u0438\u0439 tags=\u0422\u044D\u0433\u0438 comment.comments=\u041A\u043E\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 -original_size=\u041E\u0440\u0438\u0433\u0438\u043D\u0430\u043B\u044C\u043D\u044B\u0439 \u0440\u0430\u0437\u043C\u0435\u0440 +original_size=\u041E\u0440\u0438\u0433\u0438\u043D\u0430\u043B Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/avatar_default.png =================================================================== (Binary files differ) Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/avatar_default.png ___________________________________________________________________ Name: svn:mime-type + image/png Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/userAlbumsPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImageMainBlock.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagePreviewBlock.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/image/userImagesPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/userShelfPreview.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbum.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userAlbums.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userImages.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/userShelfs.xhtml =================================================================== (Binary files differ) Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css =================================================================== --- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-10 11:58:49 UTC (rev 12901) +++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld2.css 2009-03-10 12:02:32 UTC (rev 12902) @@ -295,7 +295,7 @@ .content_box p {margin : 0px 0px 5px 0px; FONT-SIZE : 12PX} .preview_box_album_80 {width : 100px; position : relative; float : left; margin : 0px 10px 10px 0px;} -.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute;} +.preview_box_album_80 img.pr_album_bg {width : 100px; height : 100px; position : absolute; border: 0px;} .preview_box_album_80 table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_album_80 table img{margin: 0px 0px 2px 0px; border : 1px solid #FFFFFF;} .preview_box_album_80 div.album_name {text-align : center; overflow : hidden; width : 100px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} @@ -338,9 +338,9 @@ .preview_box_photo_160 div.photo_name {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; margin-top : 3px; text-overflow: ellipsis; height : 14px;} .preview_box_photo_160 div.photo_data {text-align : center; overflow : hidden; width : 180px; white-space : nowrap; text-overflow: ellipsis; color : #666666; font-size : 10px; height : 14px} -.preview_box_photo_nav {width : 50px; height : 50px; position : relative; float : left; margin : 0px 2px 0px 0px;} -.preview_box_photo_nav img.pr_photo_bg {width : 50px; height : 50px; position : absolute;} -.preview_box_photo_nav table{position : relative; width : 50px; height : 50px; text-align : center; vertical-align : middle; border-collapse : collapse;} +.preview_box_photo_nav {width : 100px; height : 100px; position : relative; float : left; margin : 0px 2px 0px 0px;} +.preview_box_photo_nav img.pr_photo_bg {width : 100px; height : 100px; position : absolute; border: 0px;} +.preview_box_photo_nav table{position : relative; width : 100px; height : 100px; text-align : center; vertical-align : middle; border-collapse : collapse;} .preview_box_photo_nav table img{margin: 0px 0px 0px 0px; border : 1px solid #FFFFFF;} .preview_box_photo_nav table img.sel{margin: 0px 0px 0px 0px; border : 3px solid #DF6400;} @@ -484,4 +484,126 @@ .dr-insldr-vert-spacer { padding: 0px; - } +} + +.shelf-header-table{ + border-collapse : collapse; + margin-bottom : 15px; +} + +.shelf-header-table h1{ + margin-bottom : 4px; +} + +.shelf-header-table-col2{ + padding : 8px 0px 0px 20px; + vertical-align : top; + white-space : nowrap; +} + +.additional-info-text{ + color : #666666; +} + +.album-header-table{ + border-collapse : collapse; + margin-bottom : 15px; +} + +.album-header-table h1{ + margin-bottom : 4px; +} + +.album-header-table-col2{ + padding : 8px 0px 0px 20px; + vertical-align : top; + white-space : nowrap; +} + +.album-cover-image{ + border : 2px solid #FFFFFF; +} + +.image-header-table{ + border-collapse : collapse; + margin-bottom : 15px; +} + +.image-header-table h1{ + margin-bottom : 4px; +} + +.image-header-table-col2{ + padding : 8px 0px 0px 20px; + vertical-align : top; + white-space : nowrap; +} + +.image-cover-image{ + border : 2px solid #FFFFFF; +} + +.mainImage-div{ + padding-top : 10px; +} + +.mainImage-table{ + border-collapse : collapse; + margin-bottom : 5px; +} + +.mainImage-table-col1{ + padding-right : 10px; + padding-left : 30px; + text-align : right; +} + +.mainImage-table-col3{ + padding-bottom : 5px +} + +.buttons-body{ + cursor : pointer; + margin : 0px 0px 0px 0px; + position : relative; + width : 103px; + height : 28px; +} + +.buttons-body-image{ + position : absolute; + top : 0px; + left : 0px; + border: 0px; +} +.buttons-body-text-div{ + position : relative; + color : #ffffff; + top : 7px; + left : 8px; +} +.buttons-body-spacer-image{ + position : absolute; + top : 0px; + left : 0px; + border: 0px; +} + +.slideshow-outerdiv{ + cursor : pointer; + margin-bottom : 7px +} + +.comment-table{ + border-collapse : collapse; + margin-bottom : 20px; +} +.comment-deleteLink{ + margin : 1px 0px 7px 0px; + background : #f1f1f1; + padding : 3px 4px 4px 4px; +} +.comment-text{ + margin : 0px 0px 10px 0px; + padding : 0px 4px 0px 4px; +} \ No newline at end of file