Replace "group" with "circle" in the rest of the code
- Remaining mentions already mean "forum"
This commit is contained in:
parent
4f6e02357a
commit
4f7740264e
120 changed files with 1308 additions and 1304 deletions
|
@ -957,16 +957,16 @@ aside .posted-date-selector-months {
|
|||
width: 48px;
|
||||
height: 48px;
|
||||
}
|
||||
/* group member */
|
||||
/* circle member */
|
||||
#contact-edit-drop-link,
|
||||
.mail-list-delete-wrapper,
|
||||
.group-delete-wrapper {
|
||||
.circle-delete-wrapper {
|
||||
float: right;
|
||||
margin-right: 50px;
|
||||
}
|
||||
#contact-edit-drop-link .drophide,
|
||||
.mail-list-delete-wrapper .drophide,
|
||||
.group-delete-wrapper .drophide {
|
||||
.circle-delete-wrapper .drophide {
|
||||
background-image: url('../../../images/icons/22/delete.png');
|
||||
display: block;
|
||||
width: 22px;
|
||||
|
@ -977,7 +977,7 @@ aside .posted-date-selector-months {
|
|||
}
|
||||
#contact-edit-drop-link .drop,
|
||||
.mail-list-delete-wrapper .drop,
|
||||
.group-delete-wrapper .drop {
|
||||
.circle-delete-wrapper .drop {
|
||||
background-image: url('../../../images/icons/22/delete.png');
|
||||
display: block;
|
||||
width: 22px;
|
||||
|
@ -986,23 +986,23 @@ aside .posted-date-selector-months {
|
|||
top: -50px;
|
||||
}
|
||||
/*
|
||||
#group-members {
|
||||
#circle-members {
|
||||
margin-top: 20px;
|
||||
padding: 10px;
|
||||
height: 250px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-members-end {
|
||||
#circle-members-end {
|
||||
clear: both;
|
||||
}
|
||||
#group-all-contacts {
|
||||
#circle-all-contacts {
|
||||
padding: 10px;
|
||||
height: 450px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-all-contacts-end {
|
||||
#circle-all-contacts-end {
|
||||
clear: both;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
@ -1844,33 +1844,33 @@ ul.tabs li {
|
|||
ul.tabs li .active {
|
||||
border-bottom: 1px solid #005c94;
|
||||
}
|
||||
/** group editor **/
|
||||
#group-edit-desc {
|
||||
/** circle editor **/
|
||||
#circle-edit-desc {
|
||||
margin-top: 1em;
|
||||
color: #999999;
|
||||
}
|
||||
#group-update-wrapper {
|
||||
#circle-update-wrapper {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
}
|
||||
#group-update-wrapper #group {
|
||||
#circle-update-wrapper #circle {
|
||||
width: 300px;
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#group-update-wrapper #contacts {
|
||||
#circle-update-wrapper #contacts {
|
||||
width: 300px;
|
||||
float: left;
|
||||
}
|
||||
#group-update-wrapper #group-separator {
|
||||
#circle-update-wrapper #circle-separator {
|
||||
display: none;
|
||||
}
|
||||
#group-update-wrapper .contact_list {
|
||||
#circle-update-wrapper .contact_list {
|
||||
height: 300px;
|
||||
border: 1px solid #364e59;
|
||||
overflow: auto;
|
||||
}
|
||||
#group-update-wrapper .contact_list .contact-block-div {
|
||||
#circle-update-wrapper .contact_list .contact-block-div {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
float: left;
|
||||
|
|
|
@ -957,16 +957,16 @@ aside .posted-date-selector-months {
|
|||
width: 48px;
|
||||
height: 48px;
|
||||
}
|
||||
/* group member */
|
||||
/* circle member */
|
||||
#contact-edit-drop-link,
|
||||
.mail-list-delete-wrapper,
|
||||
.group-delete-wrapper {
|
||||
.circle-delete-wrapper {
|
||||
float: right;
|
||||
margin-right: 50px;
|
||||
}
|
||||
#contact-edit-drop-link .drophide,
|
||||
.mail-list-delete-wrapper .drophide,
|
||||
.group-delete-wrapper .drophide {
|
||||
.circle-delete-wrapper .drophide {
|
||||
background-image: url('../../../images/icons/22/delete.png');
|
||||
display: block;
|
||||
width: 22px;
|
||||
|
@ -977,7 +977,7 @@ aside .posted-date-selector-months {
|
|||
}
|
||||
#contact-edit-drop-link .drop,
|
||||
.mail-list-delete-wrapper .drop,
|
||||
.group-delete-wrapper .drop {
|
||||
.circle-delete-wrapper .drop {
|
||||
background-image: url('../../../images/icons/22/delete.png');
|
||||
display: block;
|
||||
width: 22px;
|
||||
|
@ -986,23 +986,23 @@ aside .posted-date-selector-months {
|
|||
top: -50px;
|
||||
}
|
||||
/*
|
||||
#group-members {
|
||||
#circle-members {
|
||||
margin-top: 20px;
|
||||
padding: 10px;
|
||||
height: 250px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-members-end {
|
||||
#circle-members-end {
|
||||
clear: both;
|
||||
}
|
||||
#group-all-contacts {
|
||||
#circle-all-contacts {
|
||||
padding: 10px;
|
||||
height: 450px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-all-contacts-end {
|
||||
#circle-all-contacts-end {
|
||||
clear: both;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
@ -1844,33 +1844,33 @@ ul.tabs li {
|
|||
ul.tabs li .active {
|
||||
border-bottom: 1px solid #009100;
|
||||
}
|
||||
/** group editor **/
|
||||
#group-edit-desc {
|
||||
/** circle editor **/
|
||||
#circle-edit-desc {
|
||||
margin-top: 1em;
|
||||
color: #999999;
|
||||
}
|
||||
#group-update-wrapper {
|
||||
#circle-update-wrapper {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
}
|
||||
#group-update-wrapper #group {
|
||||
#circle-update-wrapper #circle {
|
||||
width: 300px;
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#group-update-wrapper #contacts {
|
||||
#circle-update-wrapper #contacts {
|
||||
width: 300px;
|
||||
float: left;
|
||||
}
|
||||
#group-update-wrapper #group-separator {
|
||||
#circle-update-wrapper #circle-separator {
|
||||
display: none;
|
||||
}
|
||||
#group-update-wrapper .contact_list {
|
||||
#circle-update-wrapper .contact_list {
|
||||
height: 300px;
|
||||
border: 1px solid #364e59;
|
||||
overflow: auto;
|
||||
}
|
||||
#group-update-wrapper .contact_list .contact-block-div {
|
||||
#circle-update-wrapper .contact_list .contact-block-div {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
float: left;
|
||||
|
|
|
@ -6,10 +6,10 @@ $(document).ready(function(){
|
|||
var mail = parseInt($(data).find('mail').text());
|
||||
|
||||
$(".tool .notify").removeClass("on");
|
||||
$(data).find("group").each(function() {
|
||||
$(data).find("circle").each(function() {
|
||||
var gid = this.id;
|
||||
var gcount = this.innerHTML;
|
||||
$(".group-"+gid+" .notify").addClass("on").text(gcount);
|
||||
$(".circle-"+gid+" .notify").addClass("on").text(gcount);
|
||||
});
|
||||
|
||||
$(".forum-widget-entry .notify").removeClass("on");
|
||||
|
@ -81,14 +81,14 @@ $(document).ready(function() {
|
|||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
$('.circle-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
function() {
|
||||
$(this).removeClass('icon'); $(this).addClass('iconspacer');}
|
||||
);
|
||||
|
||||
$('.sidebar-group-element').hover(
|
||||
$('.sidebar-circle-element').hover(
|
||||
function() {
|
||||
id = $(this).attr('id');
|
||||
$('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
|
||||
|
|
|
@ -957,16 +957,16 @@ aside .posted-date-selector-months {
|
|||
width: 48px;
|
||||
height: 48px;
|
||||
}
|
||||
/* group member */
|
||||
/* circle member */
|
||||
#contact-edit-drop-link,
|
||||
.mail-list-delete-wrapper,
|
||||
.group-delete-wrapper {
|
||||
.circle-delete-wrapper {
|
||||
float: right;
|
||||
margin-right: 50px;
|
||||
}
|
||||
#contact-edit-drop-link .drophide,
|
||||
.mail-list-delete-wrapper .drophide,
|
||||
.group-delete-wrapper .drophide {
|
||||
.circle-delete-wrapper .drophide {
|
||||
background-image: url('../../../images/icons/22/delete.png');
|
||||
display: block;
|
||||
width: 22px;
|
||||
|
@ -977,7 +977,7 @@ aside .posted-date-selector-months {
|
|||
}
|
||||
#contact-edit-drop-link .drop,
|
||||
.mail-list-delete-wrapper .drop,
|
||||
.group-delete-wrapper .drop {
|
||||
.circle-delete-wrapper .drop {
|
||||
background-image: url('../../../images/icons/22/delete.png');
|
||||
display: block;
|
||||
width: 22px;
|
||||
|
@ -986,23 +986,23 @@ aside .posted-date-selector-months {
|
|||
top: -50px;
|
||||
}
|
||||
/*
|
||||
#group-members {
|
||||
#circle-members {
|
||||
margin-top: 20px;
|
||||
padding: 10px;
|
||||
height: 250px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-members-end {
|
||||
#circle-members-end {
|
||||
clear: both;
|
||||
}
|
||||
#group-all-contacts {
|
||||
#circle-all-contacts {
|
||||
padding: 10px;
|
||||
height: 450px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-all-contacts-end {
|
||||
#circle-all-contacts-end {
|
||||
clear: both;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
@ -1844,33 +1844,33 @@ ul.tabs li {
|
|||
ul.tabs li .active {
|
||||
border-bottom: 1px solid #86608e;
|
||||
}
|
||||
/** group editor **/
|
||||
#group-edit-desc {
|
||||
/** circle editor **/
|
||||
#circle-edit-desc {
|
||||
margin-top: 1em;
|
||||
color: #999999;
|
||||
}
|
||||
#group-update-wrapper {
|
||||
#circle-update-wrapper {
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
}
|
||||
#group-update-wrapper #group {
|
||||
#circle-update-wrapper #circle {
|
||||
width: 300px;
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
#group-update-wrapper #contacts {
|
||||
#circle-update-wrapper #contacts {
|
||||
width: 300px;
|
||||
float: left;
|
||||
}
|
||||
#group-update-wrapper #group-separator {
|
||||
#circle-update-wrapper #circle-separator {
|
||||
display: none;
|
||||
}
|
||||
#group-update-wrapper .contact_list {
|
||||
#circle-update-wrapper .contact_list {
|
||||
height: 300px;
|
||||
border: 1px solid #364e59;
|
||||
overflow: auto;
|
||||
}
|
||||
#group-update-wrapper .contact_list .contact-block-div {
|
||||
#circle-update-wrapper .contact_list .contact-block-div {
|
||||
width: 50px;
|
||||
height: 50px;
|
||||
float: left;
|
||||
|
|
|
@ -412,10 +412,10 @@ aside {
|
|||
}
|
||||
}
|
||||
|
||||
/* group member */
|
||||
/* circle member */
|
||||
#contact-edit-drop-link,
|
||||
.mail-list-delete-wrapper,
|
||||
.group-delete-wrapper {
|
||||
.circle-delete-wrapper {
|
||||
float: right;
|
||||
margin-right: 50px;
|
||||
.drophide {
|
||||
|
@ -433,23 +433,23 @@ aside {
|
|||
}
|
||||
}
|
||||
/*
|
||||
#group-members {
|
||||
#circle-members {
|
||||
margin-top: 20px;
|
||||
padding: 10px;
|
||||
height: 250px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-members-end {
|
||||
#circle-members-end {
|
||||
clear: both;
|
||||
}
|
||||
#group-all-contacts {
|
||||
#circle-all-contacts {
|
||||
padding: 10px;
|
||||
height: 450px;
|
||||
overflow: auto;
|
||||
border: 1px solid #ddd;
|
||||
}
|
||||
#group-all-contacts-end {
|
||||
#circle-all-contacts-end {
|
||||
clear: both;
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
|
@ -1145,11 +1145,11 @@ ul.tabs {
|
|||
}
|
||||
|
||||
|
||||
/** group editor **/
|
||||
#group-edit-desc { margin-top: 1em; color: @FieldHelpColor; }
|
||||
#group-update-wrapper{
|
||||
/** circle editor **/
|
||||
#circle-edit-desc { margin-top: 1em; color: @FieldHelpColor; }
|
||||
#circle-update-wrapper{
|
||||
height: auto; overflow: auto;
|
||||
#group {
|
||||
#circle {
|
||||
width:300px;
|
||||
float:left;
|
||||
margin-right:20px;
|
||||
|
@ -1158,7 +1158,7 @@ ul.tabs {
|
|||
width:300px;
|
||||
float:left;
|
||||
}
|
||||
#group-separator { display: none; }
|
||||
#circle-separator { display: none; }
|
||||
.contact_list {
|
||||
height: 300px;
|
||||
border: 1px solid @MenuBorder;
|
||||
|
|
30
view/theme/quattro/templates/circle_side.tpl
Normal file
30
view/theme/quattro/templates/circle_side.tpl
Normal file
|
@ -0,0 +1,30 @@
|
|||
<div id="circle-sidebar" class="widget">
|
||||
<div class="title tool">
|
||||
<h3 class="label">{{$title}}</h3>
|
||||
<a href="circle/new" title="{{$createtext}}" class="action"><span class="icon text s16 add"> {{$add}}</span></a>
|
||||
</div>
|
||||
|
||||
<div id="sidebar-circle-list">
|
||||
<ul>
|
||||
{{foreach $circles as $circle}}
|
||||
<li class="tool {{if $circle.selected}}selected{{/if}} circle-{{$circle.id}}">
|
||||
<a href="{{$circle.href}}" class="label">
|
||||
{{$circle.text}}
|
||||
</a>
|
||||
{{if $circle.edit}}
|
||||
<a href="{{$circle.edit.href}}" class="action"><span class="icon text s10 edit">{{$circle.edit.title}}</span></a>
|
||||
{{/if}}
|
||||
{{if $circle.cid}}
|
||||
<input type="checkbox"
|
||||
class="{{if $circle.selected}}ticked{{else}}unticked {{/if}} action"
|
||||
onclick="return contactCircleChangeMember(this, '{{$circle.id}}','{{$circle.cid}}');"
|
||||
{{if $circle.ismember}}checked="checked"{{/if}}
|
||||
/>
|
||||
{{/if}}
|
||||
<span class="notify"></span>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
<div id="group-sidebar" class="widget">
|
||||
<div class="title tool">
|
||||
<h3 class="label">{{$title}}</h3>
|
||||
<a href="group/new" title="{{$createtext}}" class="action"><span class="icon text s16 add"> {{$add}}</span></a>
|
||||
</div>
|
||||
|
||||
<div id="sidebar-group-list">
|
||||
<ul>
|
||||
{{foreach $groups as $group}}
|
||||
<li class="tool {{if $group.selected}}selected{{/if}} group-{{$group.id}}">
|
||||
<a href="{{$group.href}}" class="label">
|
||||
{{$group.text}}
|
||||
</a>
|
||||
{{if $group.edit}}
|
||||
<a href="{{$group.edit.href}}" class="action"><span class="icon text s10 edit">{{$group.edit.title}}</span></a>
|
||||
{{/if}}
|
||||
{{if $group.cid}}
|
||||
<input type="checkbox"
|
||||
class="{{if $group.selected}}ticked{{else}}unticked {{/if}} action"
|
||||
onclick="return contactgroupChangeMember(this, '{{$group.id}}','{{$group.cid}}');"
|
||||
{{if $group.ismember}}checked="checked"{{/if}}
|
||||
/>
|
||||
{{/if}}
|
||||
<span class="notify"></span>
|
||||
</li>
|
||||
{{/foreach}}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue