diff --git a/view/theme/quattro/dark/colors.less b/view/theme/quattro/dark/colors.less index 35a8d8468f..097e971ab2 100644 --- a/view/theme/quattro/dark/colors.less +++ b/view/theme/quattro/dark/colors.less @@ -113,3 +113,6 @@ @MailDisplaySubjectColor: @Grey5; @MailDisplaySubjectBackgroundColor: #f6f7f8; + +@NotificationsPageListOddBackground: @Grey1; +@NotificationsPageListEvenBackground: @Grey2; diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index dba3d8ad11..5438e9f411 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -64,6 +64,9 @@ .icon.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } +.icon.type-application { + background-image: url("../../../images/icons/22/zip.png"); +} .icon.type-audio { background-image: url("../../../images/icons/22/audio.png"); } @@ -134,6 +137,9 @@ .icon.s10.type-unkn { background-image: url("../../../images/icons/10/zip.png"); } +.icon.s10.type-application { + background-image: url("../../../images/icons/10/zip.png"); +} .icon.s10.type-audio { background-image: url("../../../images/icons/10/audio.png"); } @@ -204,6 +210,9 @@ .icon.s16.type-unkn { background-image: url("../../../images/icons/16/zip.png"); } +.icon.s16.type-application { + background-image: url("../../../images/icons/16/zip.png"); +} .icon.s16.type-audio { background-image: url("../../../images/icons/16/audio.png"); } @@ -274,6 +283,9 @@ .icon.s22.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } +.icon.s22.type-application { + background-image: url("../../../images/icons/22/zip.png"); +} .icon.s22.type-audio { background-image: url("../../../images/icons/22/audio.png"); } @@ -344,6 +356,9 @@ .icon.s48.type-unkn { background-image: url("../../../images/icons/48/zip.png"); } +.icon.s48.type-application { + background-image: url("../../../images/icons/48/zip.png"); +} .icon.s48.type-audio { background-image: url("../../../images/icons/48/audio.png"); } @@ -477,6 +492,19 @@ div.jGrowl div.info { color: #ffffff; padding-left: 58px; } +/* notifications page */ +.notif-item { + padding: 0.5em; +} +.notif-item:nth-child(even) { + background-color: #cccccc; +} +.notif-item:nth-child(odd) { + background-color: #ffffff; +} +.notif-item .notif-image { + width: 16px; +} /* header */ header { position: fixed; @@ -1272,7 +1300,7 @@ section { width: 25px; height: 25px; } -/* reshare */ +/* reshare e embed */ .wall-item-container .wall-item-content .type-link img, .type-link img { max-width: 160px; @@ -1280,10 +1308,21 @@ section { float: left; margin-right: 10px; } +.wall-item-container .wall-item-content .type-link img.attachment-image, +.type-link img.attachment-image { + max-width: 650px; + max-height: inital; + float: none; + margin-right: 0px; +} .type-link blockquote { - margin-left: 160px; + margin: 1em 0px; max-height: 160px; overflow: hidden; + padding-left: 1em; +} +.type-video blockquote { + padding-left: 1em; } .shared_header { height: 32px; @@ -1306,6 +1345,13 @@ blockquote.shared_content { color: #000; border: none; } +.oembed.video > a.embed_video { + display: block; + float: none; +} +.oembed.video > a.embed_video > div { + background: rgba(255, 255, 255, 0.36) url(../../../images/icons/48/play.png) no-repeat center center !important; +} /* threaded comments */ .children { margin-top: 1em; @@ -1397,7 +1443,30 @@ span[id^="showmore-wrap"] { display: block; } #contacts-actions { - clear: both; + position: absolute; + left: 800px; + width: 200px; + background-color: #ffffff; + border: 2px solid #364e59; + display: none; +} +#contacts-actions .batch-action { + display: block; + width: 100%; + background-color: #ffffff; + border: 0px; + color: #2d2d2d; + text-align: left; + padding: 5px 10px; + font-size: 11px; +} +#contacts-actions .batch-action:hover { + background-color: #bdcdd4; +} +@media (max-width: 1000px) { + #contacts-actions { + left: 40px; + } } .contact-photo { width: 48px; @@ -1916,6 +1985,11 @@ ul.tabs li .active { background: url("../../../images/icons/16/user.png") no-repeat left center; padding-left: 18px; } +#photo-top-upload-link, +.photos-upload-link { + margin: 1em 0px; + display: block; +} .photos-upload-link a, #photo-top-upload-link { background: url("../../../images/icons/16/add.png") no-repeat left center; @@ -1981,10 +2055,8 @@ ul.tabs li .active { background: url("../../../images/icons/22/image.png") no-repeat top left; padding-left: 23px; min-height: 22px; -} -#photo-album-title a { - display: block; - padding-top: 5px; + padding-top: 6px; + /* a { display: block;}*/ } #photo-caption { display: block; diff --git a/view/theme/quattro/green/colors.less b/view/theme/quattro/green/colors.less index 78c67a13b4..5f17bca780 100644 --- a/view/theme/quattro/green/colors.less +++ b/view/theme/quattro/green/colors.less @@ -111,3 +111,6 @@ @MailDisplaySubjectColor: @Grey5; @MailDisplaySubjectBackgroundColor: #f6f7f8; + +@NotificationsPageListOddBackground: @Grey1; +@NotificationsPageListEvenBackground: @Green4; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index ea54da6b4b..5378baedd9 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -64,6 +64,9 @@ .icon.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } +.icon.type-application { + background-image: url("../../../images/icons/22/zip.png"); +} .icon.type-audio { background-image: url("../../../images/icons/22/audio.png"); } @@ -134,6 +137,9 @@ .icon.s10.type-unkn { background-image: url("../../../images/icons/10/zip.png"); } +.icon.s10.type-application { + background-image: url("../../../images/icons/10/zip.png"); +} .icon.s10.type-audio { background-image: url("../../../images/icons/10/audio.png"); } @@ -204,6 +210,9 @@ .icon.s16.type-unkn { background-image: url("../../../images/icons/16/zip.png"); } +.icon.s16.type-application { + background-image: url("../../../images/icons/16/zip.png"); +} .icon.s16.type-audio { background-image: url("../../../images/icons/16/audio.png"); } @@ -274,6 +283,9 @@ .icon.s22.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } +.icon.s22.type-application { + background-image: url("../../../images/icons/22/zip.png"); +} .icon.s22.type-audio { background-image: url("../../../images/icons/22/audio.png"); } @@ -344,6 +356,9 @@ .icon.s48.type-unkn { background-image: url("../../../images/icons/48/zip.png"); } +.icon.s48.type-application { + background-image: url("../../../images/icons/48/zip.png"); +} .icon.s48.type-audio { background-image: url("../../../images/icons/48/audio.png"); } @@ -477,6 +492,19 @@ div.jGrowl div.info { color: #ffffff; padding-left: 58px; } +/* notifications page */ +.notif-item { + padding: 0.5em; +} +.notif-item:nth-child(even) { + background-color: #ddffdd; +} +.notif-item:nth-child(odd) { + background-color: #ffffff; +} +.notif-item .notif-image { + width: 16px; +} /* header */ header { position: fixed; @@ -1272,7 +1300,7 @@ section { width: 25px; height: 25px; } -/* reshare */ +/* reshare e embed */ .wall-item-container .wall-item-content .type-link img, .type-link img { max-width: 160px; @@ -1280,10 +1308,21 @@ section { float: left; margin-right: 10px; } +.wall-item-container .wall-item-content .type-link img.attachment-image, +.type-link img.attachment-image { + max-width: 650px; + max-height: inital; + float: none; + margin-right: 0px; +} .type-link blockquote { - margin-left: 160px; + margin: 1em 0px; max-height: 160px; overflow: hidden; + padding-left: 1em; +} +.type-video blockquote { + padding-left: 1em; } .shared_header { height: 32px; @@ -1306,6 +1345,13 @@ blockquote.shared_content { color: #000; border: none; } +.oembed.video > a.embed_video { + display: block; + float: none; +} +.oembed.video > a.embed_video > div { + background: rgba(255, 255, 255, 0.36) url(../../../images/icons/48/play.png) no-repeat center center !important; +} /* threaded comments */ .children { margin-top: 1em; @@ -1397,7 +1443,30 @@ span[id^="showmore-wrap"] { display: block; } #contacts-actions { - clear: both; + position: absolute; + left: 800px; + width: 200px; + background-color: #ffffff; + border: 2px solid #364e59; + display: none; +} +#contacts-actions .batch-action { + display: block; + width: 100%; + background-color: #ffffff; + border: 0px; + color: #2d2d2d; + text-align: left; + padding: 5px 10px; + font-size: 11px; +} +#contacts-actions .batch-action:hover { + background-color: #ccff42; +} +@media (max-width: 1000px) { + #contacts-actions { + left: 40px; + } } .contact-photo { width: 48px; @@ -1916,6 +1985,11 @@ ul.tabs li .active { background: url("../../../images/icons/16/user.png") no-repeat left center; padding-left: 18px; } +#photo-top-upload-link, +.photos-upload-link { + margin: 1em 0px; + display: block; +} .photos-upload-link a, #photo-top-upload-link { background: url("../../../images/icons/16/add.png") no-repeat left center; @@ -1981,10 +2055,8 @@ ul.tabs li .active { background: url("../../../images/icons/22/image.png") no-repeat top left; padding-left: 23px; min-height: 22px; -} -#photo-album-title a { - display: block; - padding-top: 5px; + padding-top: 6px; + /* a { display: block;}*/ } #photo-caption { display: block; diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less index 13a2b49bba..830e647823 100644 --- a/view/theme/quattro/icons.less +++ b/view/theme/quattro/icons.less @@ -20,6 +20,7 @@ &.unlock { background-image: url("../../../images/icons/@{size}/unlock.png"); } &.plugin { background-image: url("../../../images/icons/@{size}/plugin.png"); } &.type-unkn { background-image: url("../../../images/icons/@{size}/zip.png"); } + &.type-application { background-image: url("../../../images/icons/@{size}/zip.png"); } &.type-audio{ background-image: url("../../../images/icons/@{size}/audio.png"); } &.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); } &.type-image{ background-image: url("../../../images/icons/@{size}/image.png"); } diff --git a/view/theme/quattro/lilac/colors.less b/view/theme/quattro/lilac/colors.less index d48f9552f4..36584e53cf 100644 --- a/view/theme/quattro/lilac/colors.less +++ b/view/theme/quattro/lilac/colors.less @@ -116,3 +116,6 @@ @MailDisplaySubjectColor: @Grey5; @MailDisplaySubjectBackgroundColor: #f6f7f8; + +@NotificationsPageListOddBackground: @Grey1; +@NotificationsPageListEvenBackground: @Grey2; \ No newline at end of file diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index 1acbe78135..196dd8b93c 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -64,6 +64,9 @@ .icon.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } +.icon.type-application { + background-image: url("../../../images/icons/22/zip.png"); +} .icon.type-audio { background-image: url("../../../images/icons/22/audio.png"); } @@ -134,6 +137,9 @@ .icon.s10.type-unkn { background-image: url("../../../images/icons/10/zip.png"); } +.icon.s10.type-application { + background-image: url("../../../images/icons/10/zip.png"); +} .icon.s10.type-audio { background-image: url("../../../images/icons/10/audio.png"); } @@ -204,6 +210,9 @@ .icon.s16.type-unkn { background-image: url("../../../images/icons/16/zip.png"); } +.icon.s16.type-application { + background-image: url("../../../images/icons/16/zip.png"); +} .icon.s16.type-audio { background-image: url("../../../images/icons/16/audio.png"); } @@ -274,6 +283,9 @@ .icon.s22.type-unkn { background-image: url("../../../images/icons/22/zip.png"); } +.icon.s22.type-application { + background-image: url("../../../images/icons/22/zip.png"); +} .icon.s22.type-audio { background-image: url("../../../images/icons/22/audio.png"); } @@ -344,6 +356,9 @@ .icon.s48.type-unkn { background-image: url("../../../images/icons/48/zip.png"); } +.icon.s48.type-application { + background-image: url("../../../images/icons/48/zip.png"); +} .icon.s48.type-audio { background-image: url("../../../images/icons/48/audio.png"); } @@ -477,6 +492,19 @@ div.jGrowl div.info { color: #ffffff; padding-left: 58px; } +/* notifications page */ +.notif-item { + padding: 0.5em; +} +.notif-item:nth-child(even) { + background-color: #cccccc; +} +.notif-item:nth-child(odd) { + background-color: #ffffff; +} +.notif-item .notif-image { + width: 16px; +} /* header */ header { position: fixed; @@ -1272,7 +1300,7 @@ section { width: 25px; height: 25px; } -/* reshare */ +/* reshare e embed */ .wall-item-container .wall-item-content .type-link img, .type-link img { max-width: 160px; @@ -1280,10 +1308,21 @@ section { float: left; margin-right: 10px; } +.wall-item-container .wall-item-content .type-link img.attachment-image, +.type-link img.attachment-image { + max-width: 650px; + max-height: inital; + float: none; + margin-right: 0px; +} .type-link blockquote { - margin-left: 160px; + margin: 1em 0px; max-height: 160px; overflow: hidden; + padding-left: 1em; +} +.type-video blockquote { + padding-left: 1em; } .shared_header { height: 32px; @@ -1306,6 +1345,13 @@ blockquote.shared_content { color: #000; border: none; } +.oembed.video > a.embed_video { + display: block; + float: none; +} +.oembed.video > a.embed_video > div { + background: rgba(255, 255, 255, 0.36) url(../../../images/icons/48/play.png) no-repeat center center !important; +} /* threaded comments */ .children { margin-top: 1em; @@ -1397,7 +1443,30 @@ span[id^="showmore-wrap"] { display: block; } #contacts-actions { - clear: both; + position: absolute; + left: 800px; + width: 200px; + background-color: #ffffff; + border: 2px solid #364e59; + display: none; +} +#contacts-actions .batch-action { + display: block; + width: 100%; + background-color: #ffffff; + border: 0px; + color: #2d2d2d; + text-align: left; + padding: 5px 10px; + font-size: 11px; +} +#contacts-actions .batch-action:hover { + background-color: #c0a3c7; +} +@media (max-width: 1000px) { + #contacts-actions { + left: 40px; + } } .contact-photo { width: 48px; @@ -1916,6 +1985,11 @@ ul.tabs li .active { background: url("../../../images/icons/16/user.png") no-repeat left center; padding-left: 18px; } +#photo-top-upload-link, +.photos-upload-link { + margin: 1em 0px; + display: block; +} .photos-upload-link a, #photo-top-upload-link { background: url("../../../images/icons/16/add.png") no-repeat left center; @@ -1981,10 +2055,8 @@ ul.tabs li .active { background: url("../../../images/icons/22/image.png") no-repeat top left; padding-left: 23px; min-height: 22px; -} -#photo-album-title a { - display: block; - padding-top: 5px; + padding-top: 6px; + /* a { display: block;}*/ } #photo-caption { display: block; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 46eed3d6c0..2abd9a432c 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -115,6 +115,13 @@ div.jGrowl div.info { padding-left: 58px; } +/* notifications page */ +.notif-item { + padding: 0.5em; + &:nth-child(even) { background-color: @NotificationsPageListEvenBackground; } + &:nth-child(odd) { background-color: @NotificationsPageListOddBackground; } + .notif-image { width: 16px; } +} /* header */ @@ -674,23 +681,34 @@ section { } .wwto .contact-photo { width: 25px; height: 25px; } -/* reshare */ +/* reshare e embed */ .wall-item-container .wall-item-content .type-link img, .type-link img { max-width: 160px; max-height: 160px; float: left; margin-right: 10px; + + &.attachment-image { + max-width: 650px; + max-height: inital; + float: none; + margin-right: 0px; + } + } .type-link { blockquote { - margin-left: 160px; + margin: 1em 0px; max-height: 160px; overflow: hidden; + padding-left: 1em; } .oembed {} } +.type-video blockquote { padding-left: 1em; } + .shared_header { height: 32px; color: #999; @@ -716,6 +734,20 @@ blockquote.shared_content { } +.oembed.video { + > a.embed_video { + display: block; + float: none; + > div { + background: + rgba(255, 255, 255, 0.36) + url(../../../images/icons/48/play.png) + no-repeat center center + !important; + } + } +} + /* threaded comments */ .children { @@ -788,7 +820,31 @@ span[id^="showmore-wrap"] { .contact-select { position: absolute; top:64px; left:64px; display:none; } .contact-select:checked, .contact-photo:hover .contact-select { display:block; } -#contacts-actions { clear: both; } +#contacts-actions { + position: absolute; + left: 800px; + width: 200px; + background-color: @MenuBg; + border: 2px solid @MenuBorder; + .batch-action { + display: block; + width: 100%; + background-color: @MenuBg; + border: 0px; + color: @MenuItem; + text-align: left; + padding: 5px 10px; + font-size: 11px; + } + .batch-action:hover { + background-color: @MenuItemHoverBg; + } + display: none; +} +@media (max-width: 1000px) { + #contacts-actions { left: 40px; } +} + .contact-photo { width: 48px; height: 48px; img { width: 48px; height: 48px; } @@ -1286,6 +1342,8 @@ ul.tabs { padding-left: 18px; } +#photo-top-upload-link, +.photos-upload-link { margin: 1em 0px; display: block; } .photos-upload-link a, #photo-top-upload-link { background: url("../../../images/icons/16/add.png") no-repeat left center; @@ -1334,7 +1392,8 @@ ul.tabs { background: url("../../../images/icons/22/image.png") no-repeat top left; padding-left: 23px; min-height: 22px; - a { display: block; padding-top: 5px; } + padding-top: 6px; + /* a { display: block;}*/ } #photo-caption { diff --git a/view/theme/quattro/templates/admin_users.tpl b/view/theme/quattro/templates/admin_users.tpl new file mode 100644 index 0000000000..249f1f6728 --- /dev/null +++ b/view/theme/quattro/templates/admin_users.tpl @@ -0,0 +1,138 @@ + + +
+

{{$title}} - {{$page}}

+ +
+ + +

{{$h_pending}}

+ {{if $pending}} + + + + {{foreach $th_pending as $th}}{{/foreach}} + + + + + + {{foreach $pending as $u}} + + + + + + + + {{/foreach}} + +
{{$th}}
{{$u.created}}{{$u.name}} + + +
+ +
+ {{else}} +

{{$no_pending}}

+ {{/if}} + +

{{$h_users}}

+ {{if $users}} + + + + + {{foreach $th_users as $th}}{{/foreach}} + + + + + + {{foreach $users as $u}} + + + + + + + + + + {{/if}} + + + {{/foreach}} + +
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}} + {{if $u.is_admin}} +   + {{else}} + + {{if $u.is_admin}} +   + {{else}} + + + {{/if}} +
+ +
+ {{else}} + NO USERS?!? + {{/if}} +
+ {{if $deleted}} +

{{$h_deleted}}

+ + + + + {{foreach $th_deleted as $th}}{{/foreach}} + + + + {{foreach $deleted as $u}} + + + + + + + + + + {{/foreach}} + +
{{$th}}
{{$u.nickname}}{{$u.name}}{{$u.register_date}}{{$u.lastitem_date}}
+ {{/if}} +

{{$h_newuser}}

+
+ + + + + + + + + + + + + +
{{include file="field_input.tpl" field=$newusername}}
{{include file="field_input.tpl" field=$newusernickname}}
{{include file="field_input.tpl" field=$newuseremail}}
+
+
+
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php index 167ebc7538..1be5c02678 100644 --- a/view/theme/quattro/theme.php +++ b/view/theme/quattro/theme.php @@ -42,6 +42,24 @@ $(document).ready(function(){ } }); + + /* + * show and hide contact action buttons in + * contacts page on contacts' checkbox selection + */ + $('.contact-select').bind('click', function(e) { + var y = e.clientY; + var elm = $("#contacts-actions"); + y=y-40; + if (y<0) y=0; + if (y+elm.height() > $("html").height()) y=$("html").height()-elm.height(); + elm.css('top', y+"px"); + if ($(".contact-select:checked").length > 0) { + elm.show(); + } else { + elm.hide(); + } + }); }); function insertFormatting(comment,BBcode,id) { @@ -90,43 +108,44 @@ function cmtBbOpen(id) { function cmtBbClose(id) { $("#comment-edit-bb-" + id).hide(); } + $(document).ready(function() { -$('html').click(function() { $("#nav-notifications-menu" ).hide(); }); + $('html').click(function() { $("#nav-notifications-menu" ).hide(); }); -$('.group-edit-icon').hover( - function() { - $(this).addClass('icon'); $(this).removeClass('iconspacer');}, - function() { - $(this).removeClass('icon'); $(this).addClass('iconspacer');} - ); + $('.group-edit-icon').hover( + function() { + $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); -$('.sidebar-group-element').hover( - function() { - id = $(this).attr('id'); - $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, + $('.sidebar-group-element').hover( + function() { + id = $(this).attr('id'); + $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');}, - function() { - id = $(this).attr('id'); - $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} - ); + function() { + id = $(this).attr('id'); + $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');} + ); -$('.savedsearchdrop').hover( - function() { - $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, - function() { - $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} - ); + $('.savedsearchdrop').hover( + function() { + $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');}, + function() { + $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');} + ); -$('.savedsearchterm').hover( - function() { - id = $(this).attr('id'); - $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, + $('.savedsearchterm').hover( + function() { + id = $(this).attr('id'); + $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');}, - function() { - id = $(this).attr('id'); - $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} + function() { + id = $(this).attr('id'); + $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');} ); });