Permalink
Browse files

Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev

  • Loading branch information...
2 parents 55096cc + 739cf34 commit ad5cc2f365630f9ae2316dd7d4398415fa7bc59f @stefancrain stefancrain committed Jan 25, 2013
@@ -50,8 +50,8 @@
{/literal}
{literal}
<script type="text/javascript">
-BBTree.startInstance({displaySettings:{writeSets: [291,296], treeTypeSet: 'edit'}});
-//document.ready(); this is when the page drops the results in. WAAAAAY FASTER.
+BBTree.startInstance({pullSets: [291, 296], buttonType: 'edit'});
+
</script>
{/literal}
{capture assign=docLink}{docURL page="Tags Admin"}{/capture}
@@ -102,10 +102,11 @@ BBTree.startInstance({displaySettings:{writeSets: [291,296], treeTypeSet: 'edit'
<div class="BBInit"></div>
{literal}
<script>
- BBTree.initContainer();
+ BBTree.initContainer('', {pullSets: [291,296], buttonType: 'edit',tabLocation: 'crm-tagTabHeader'}, {entity_id: 216352});
+ //BBTree.initContainer('two', {pullSets: [296], buttonType: 'tagging'}, {entity_id: 216352, entity_type: 'civicrm_activity'});
</script>
{/literal}
</div>
- </div>
+ </div>
</div>
{/if}
@@ -199,32 +199,34 @@ SassCommand: sass --watch C:\projects\Bluebird-CRM\themes\Bluebird\nyss_skin\tag
display: none; }
/* tabs */
-.crm-tagTabHeader {
+.crm-tagTabHeader, .BBTree-Tags {
height: 15px;
clear: both; }
-
-.crm-tagTabHeader li, .crm-tagTabHeader li#tagLabel_291, .crm-tagTabHeader li#tagLabel_296 {
- float: left;
- margin-right: 15px;
- background: transparent url(/sites/default/themes/Bluebird/nyss_skin/images/button.png) no-repeat scroll right -30px !important;
- list-style: none;
- width: 135px;
- color: #fff;
- text-align: center;
- cursor: pointer;
- font-size: 12px; }
-
-.crm-tagTabHeader li:hover, .crm-tagTabHeader li#tagLabel_291:hover, .crm-tagTabHeader li#tagLabel_296:hover {
- color: #ccc;
- border-top: #457aa4 3px solid;
- margin-top: -3px; }
-
-.crm-tagTabHeader li.active, .crm-tagTabHeader li#tagLabel_291.active, .crm-tagTabHeader li#tagLabel_296.active {
- border-top: #457aa4 3px solid;
- margin-top: -3px;
- font-size: 14px; }
+ .crm-tagTabHeader li, .BBTree-Tags li {
+ float: left;
+ margin-right: 15px;
+ background: transparent url(/sites/default/themes/Bluebird/nyss_skin/images/button.png) no-repeat scroll right -30px !important;
+ list-style: none;
+ width: 135px;
+ color: #fff;
+ text-align: center;
+ cursor: pointer;
+ font-size: 12px; }
+ .crm-tagTabHeader li:hover, .BBTree-Tags li:hover {
+ color: #ccc;
+ border-top: #457aa4 3px solid;
+ margin-top: -3px; }
+ .crm-tagTabHeader li.active, .BBTree-Tags li.active {
+ border-top: #457aa4 3px solid;
+ margin-top: -3px;
+ font-size: 14px; }
/* legend */
+#crm-container .crm-tagLegend td div {
+ height: 16px;
+ width: 16px;
+ float: left;
+ margin-right: 5px; }
#crm-container .crm-tagLegend td.addTag div {
background-image: url("/sites/default/themes/Bluebird/nyss_skin/images/fcb.png") !important;
cursor: pointer;
@@ -203,15 +203,39 @@ $levelClassSlug : "lv";
}
}
/* tabs */
-.crm-tagTabHeader {height:15px; clear:both;}
-.crm-tagTabHeader li, .crm-tagTabHeader li#tagLabel_291, .crm-tagTabHeader li#tagLabel_296 {float:left;margin-right:15px;background: transparent url(/sites/default/themes/Bluebird/nyss_skin/images/button.png) no-repeat scroll right -30px!important; list-style: none; width:135px; color:#fff; text-align:center;cursor:pointer; font-size:12px;}
-.crm-tagTabHeader li:hover, .crm-tagTabHeader li#tagLabel_291:hover, .crm-tagTabHeader li#tagLabel_296:hover {color:#ccc;border-top:#457AA4 3px solid; margin-top:-3px;}
-.crm-tagTabHeader li.active, .crm-tagTabHeader li#tagLabel_291.active, .crm-tagTabHeader li#tagLabel_296.active {border-top:#457AA4 3px solid; margin-top:-3px; font-size: 14px;}
+.crm-tagTabHeader, .BBTree-Tags {
+ height:15px; clear:both;
+ li{
+ float:left;
+ margin-right:15px;
+ background: transparent url(/sites/default/themes/Bluebird/nyss_skin/images/button.png) no-repeat scroll right -30px !important;
+ list-style: none;
+ width:135px;
+ color:#fff;
+ text-align:center;
+ cursor:pointer;
+ font-size:12px;
+ &:hover{
+ color:#ccc;
+ border-top:#457AA4 3px solid;
+ margin-top:-3px;
+ }
+ &.active{
+ border-top:#457AA4 3px solid;
+ margin-top:-3px;
+ font-size: 14px;
+ }
+ }
+
+}
/* legend */
#crm-container .crm-tagLegend {
td div {
-
+ height:16px;
+ width:16px;
+ float:left;
+ margin-right:5px;
}
td.addTag div {@include functionIcon($functionIconLink); @include addTag;}
td.removeTag div {@include functionIcon($functionIconLink); @include removeTag;}
Oops, something went wrong.

0 comments on commit ad5cc2f

Please sign in to comment.