rooty/OwncloudContactsOfficial
1
0
Fork 0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00
Code Issues Releases Activity

Use core icons

Browse Source
This commit is contained in:
Thomas Tanghus 2014-03-05 13:06:53 +01:00
parent 27d352ca4f
commit 3481235e63
18 changed files with 13 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
css/contacts.css
View File

@ -85,13 +85,14 @@
#app-navigation .active {
font-weight: bold;
}
#app-navigation li > .utils > *:not(.numcontacts) {
#app-navigation li > .utils > *:not(.numcontacts):not(.starred) {
display: none;
}
#app-navigation li > .utils > * {
line-height: 44px;
width: 44px; height: 44px;
background-size: auto;
float: left;
}
#app-navigation li.active[data-type="category"] > .utils > * {
display: inline-block;
@ -234,7 +235,6 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
}
[class^="icon-"], [class*=" icon-"], .action, .icon {
display: inline-block;
cursor: pointer;
background-repeat: no-repeat;
}
@ -250,21 +250,12 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
text-indent: 18px;
}
/* TODO: Use @import url('../css/[no-]svg.css); instead. */
.no-svg .starred { background-image:url('../img/starred.png'); background-size: contain; }
.no-svg .checked { background-image:url('../img/checkmark-green.png'); }
.no-svg .checked.disabled { background-image:url('../img/checkmark-gray.png'); cursor: default; }
.svg .action.text, .svg .icon.text, .svg .svg.text {
background-size: 16px 16px;
background-origin: content-box;
background-repeat: no-repeat;
width: auto; height: auto;
}
.svg .starred { background-image:url('../img/starred.svg'); background-size: contain; }
.svg .checked { background-image:url('../img/checkmark-green.svg'); }
.svg .checked.disabled { background-image:url('../img/checkmark-gray.svg'); cursor: default; }
.transparent{ opacity: 0.6; }
.float { float: left; display: inline-block; width: auto; }
@ -360,7 +351,7 @@ ul.propertylist { width: 100%; line-height: 34px; }
clear: none; opacity: 0;
}
.propertylist li.propertycontainer:hover > .listactions { opacity: 1; }
.propertylist li.propertycontainer .listactions a {
.singleproperties .propertycontainer .listactions a, .propertylist li.propertycontainer .listactions a {
display: inline-block;
clear: none;
width: 16px; height: 16px;
@ -431,42 +422,6 @@ dt[data-element="org"] { margin-top: 4px; }
.addressbooks-settings a.action:hover { opacity: 1; }
.addressbooks-settings td.active, .addressbooks-settings td.action { width: 20px; }
/*
#contacts-settings .settings {
height:1.4em;
background-repeat: no-repeat;
background-position:0px 0px;
background-origin: content-box;
background-image:url('%webroot%/core/img/actions/settings.svg');
}
#contacts-settings .settings:hover {
font-weight: normal;
color: #666666;
}
#contacts-settings.open {
height: auto;
z-index: 10;
overflow-y: auto;
}
#contacts-settings {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
background: none repeat scroll 0 0 #EEEEEE;
border-right: 1px solid #CCCCCC;
border-top: 1px solid #CCCCCC;
bottom: 0;
height: 2.8em;
margin: 0;
overflow: visible;
padding: 0;
position: fixed;
width: 20em;
z-index: 2;
}
#contacts-settings li,#contacts-settings li:hover { background-color: transparent; white-space: nowrap; }
#contacts-settings a.action:not(.settings) { width: 16px; height: 16px; }
*/
.addressbooklist .actions { position: absolute; right: 0px; }
.addressbooklist .actions > a { width: 20px; height: 20px; }
.addressbooklist > li > div {
@ -584,13 +539,9 @@ input[type=checkbox].propertytype { width: 10px; }
padding-left: 20px;
font-weight: normal;
}
.no-svg .favorite { display: inline-block; float: left; height: 20px; width: 20px; background-image:url('../img/inactive_star.png'); }
.no-svg .favorite.active, .favorite:hover { background-image:url('../img/active_star.png'); }
.no-svg .favorite.inactive { background-image:url('../img/inactive_star.png'); }
.no-svg .favorite { display: inline-block; float: left; height: 20px; width: 20px; }
.svg .favorite { display: inline-block; float: left; height: 20px; width: 20px; background-image:url('../img/inactive_star.svg'); background-size:contain; }
.svg .favorite.active, .favorite:hover { background-image:url('../img/active_star.svg'); }
.svg .favorite.inactive { background-image:url('../img/inactive_star.svg'); background-size:contain; }
.svg .favorite { display: inline-block; float: left; height: 20px; width: 20px; background-size:contain; }
#app-content {
top: 44px;
@ -750,7 +701,7 @@ fieldset.adr ul li input.label { margin-top: -4px !important; }
width: 32px;
margin-left: 10px;
}
/* Override default style for an open cpntact */
/* Override default style for an open contact */
tbody tr, tbody tr.hover {
background-color: #fff !important;
}

BIN
img/active_star.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 527 B

6
img/active_star.svg
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="306.45" width="322" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<g transform="translate(-148.04 -745.93)">
<path transform="translate(-21.071 -112.5)" fill="#fc0" d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 541 B

BIN
img/checkmark-gray.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 688 B

6
img/checkmark-gray.svg
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="300" width="300" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<g transform="translate(-101.54 -225.22)">
<path d="m404.4 284.12c-36.34-30.74-53.53-57.61-53.53-57.61-67.11 48.77-138.37 221.96-138.37 221.96-33.4-58-66.98-74.17-66.98-74.17-15.097 24.885-41.119 58.049-41.119 58.049 60.694 20.164 111.64 94.158 111.64 94.158 110.13-213.29 188.36-242.39 188.36-242.39z" fill-rule="evenodd" fill="#6c5353"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 633 B

BIN
img/checkmark-green.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 618 B

6
img/checkmark-green.svg
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="300" width="300" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<g transform="translate(-101.54 -225.22)">
<path d="m404.4 284.12c-36.34-30.74-53.53-57.61-53.53-57.61-67.11 48.77-138.37 221.96-138.37 221.96-33.4-58-66.98-74.17-66.98-74.17-15.097 24.885-41.119 58.049-41.119 58.049 60.694 20.164 111.64 94.158 111.64 94.158 110.13-213.29 188.36-242.39 188.36-242.39z" fill-rule="evenodd" fill="#1e6f1e"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 633 B

BIN
img/checkmark.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 280 B

BIN
img/contact-new.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 525 B

18
img/contact-new.svg
View File

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="20" width="20" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<g transform="matrix(1.2461 0 0 1.242 -.12304 -.51608)">
<g transform="matrix(1.0634 0 0 1.0634 -.031694 -.53733)">
<rect height="9.1085" width="13.409" y="2.5105" x=".5" stroke-width="0"/>
<g stroke-width="0" fill="#fff">
<rect height="4.3601" width="3.169" y="3.2825" x="1.2452"/>
<rect height=".70081" width="6.1161" y="3.3218" x="5.0012"/>
<rect height=".70081" width="2.5802" y="5.122" x="5.0012"/>
<rect height=".70081" width="8.1389" y="8.4222" x="1.2264"/>
<rect height=".70081" width="4.3482" y="9.9222" x="1.2264"/>
<rect height=".70081" width="2.5802" y="5.122" x="8.601"/>
<rect height=".70081" width="4.9375" y="6.8222" x="5.0012"/>
</g>
<path d="m10.824 8.4436h2v2h2v2h-2v2h-2v-2h-2v-2h2z" stroke="#fff" stroke-width=".5"/>
</g>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

BIN
img/inactive_star.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 569 B

6
img/inactive_star.svg
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="306.45" width="322" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<g transform="translate(-148.04 -745.93)">
<path transform="translate(-21.071 -112.5)" fill="#ccc" d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 541 B

BIN
img/person.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 605 B

41
img/person.svg
View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns="http://www.w3.org/2000/svg" height="22" width="22" version="1.0" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<linearGradient id="c">
<stop stop-color="#b8b8b8" offset="0"/>
<stop stop-color="#878787" offset="1"/>
</linearGradient>
<linearGradient id="b">
<stop stop-color="#f5f5f5" offset="0"/>
<stop stop-color="#d2d2d2" offset="1"/>
</linearGradient>
<linearGradient id="d">
<stop stop-color="#fff" offset="0"/>
<stop stop-color="#fff" stop-opacity="0" offset="1"/>
</linearGradient>
<linearGradient id="a">
<stop offset="0"/>
<stop stop-opacity="0" offset="1"/>
</linearGradient>
<radialGradient id="g" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="28.66" cx="25" gradientTransform="matrix(.67742 0 0 .19286 -5.0163 9.9977)" r="16"/>
<linearGradient id="m" y2="45" xlink:href="#c" gradientUnits="userSpaceOnUse" x2="30" gradientTransform="matrix(.51613 0 0 .51667 -.98397 -.49181)" y1="25.085" x1="30"/>
<linearGradient id="l" y2="43.531" xlink:href="#d" gradientUnits="userSpaceOnUse" x2="29.996" gradientTransform="matrix(.51613 0 0 .51667 -.98397 -.49181)" y1="21.44" x1="29.996"/>
<radialGradient id="f" xlink:href="#b" gradientUnits="userSpaceOnUse" cy="12.313" cx="26.376" gradientTransform="matrix(.86552 -.071029 .067606 .84907 -11.039 -4.2048)" r="8"/>
<linearGradient id="k" y2="44.679" xlink:href="#c" gradientUnits="userSpaceOnUse" x2="30" gradientTransform="matrix(.52770 0 0 .53573 -1.3311 -1.4043)" y1="5" x1="30"/>
<linearGradient id="j" y2="37.438" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="17" gradientTransform="matrix(0.75 0 0 .43478 -5.1276 2.9174)" y1="39" x1="22"/>
<radialGradient id="e" xlink:href="#a" gradientUnits="userSpaceOnUse" cy="33.188" cx="30" gradientTransform="matrix(.81492 -3.8845e-7 1.1365e-7 .25340 -9.9476 6.5902)" r="4.6875"/>
<linearGradient id="i" y2="37.438" xlink:href="#a" gradientUnits="userSpaceOnUse" x2="17" gradientTransform="matrix(-0.75 0 0 .43478 34.15 2.9174)" y1="39" x1="22"/>
<linearGradient id="h" y2="24.913" xlink:href="#d" gradientUnits="userSpaceOnUse" x2="30" gradientTransform="matrix(.52770 0 0 .53573 -1.3311 -1.4043)" y1="6.334" x1="30"/>
</defs>
<g transform="translate(-3 -1)">
<path d="m12.177 10.1c0.23753 1.1247 0.37012 1.9754 0.17742 3.1-1.5023 1.2477-5.3445 1.8084-5.3387 3.1l-0.51613 3.875c0 1.2841 3.5817 2.325 8.0001 2.325 4.4183 0 8.0001-1.0409 8.0001-2.325l-0.51613-3.875c-0.0061-1.1055-3.871-1.8083-5.3549-3.1-0.12675-1.0438-0.02586-2.0562 0.19355-3.1h-4.6452z" stroke="url(#m)" stroke-width=".99989" fill="url(#g)"/>
<path d="m13.219 11.094c0.08722 0.85671 0.3354 1.801-0.04818 2.6159-0.64255 0.72846-1.5946 1.0938-2.4674 1.4727-1.3803 0.327-2.9893 0.817-2.7778 1.815-0.1417 1.063-0.2835 2.126-0.4252 3.19 0.3064 0.16061 1.0809 0.5849 1.625 0.6875 2.5208 0.66695 5.1678 0.72537 7.7549 0.51952 1.5117-0.16621 3.0886-0.35266 4.4326-1.1133 0.33544-0.07362 0.10712-0.31641 0.11494-0.65492-0.13206-1.0213-0.26412-2.0426-0.39619-3.0638-0.58765-0.5027-1.3913-0.75352-2.1064-1.0646-1.0828-0.4473-2.2515-0.853-3.0869-1.708-0.39162-0.68956-0.16147-1.5387-0.10732-2.2865 0.25968-0.52835-0.2234-0.4019-0.55293-0.40969h-1.9589z" stroke="url(#l)" stroke-width=".99989" fill="none"/>
<g>
<path d="m14.5 1.5422c-2.1858 0-3.9578 1.679-3.9578 3.7501 0.01713 0.76649 0.08155 1.677 0.5277 3.7501 0.26385 0.8036 2.6173 2.9465 2.6385 3.2144 0.5117 0.26786 1.3193 0.26786 1.847 0 0-0.26786 2.1108-2.4108 2.3747-3.2144 0.50205-2.1545 0.50077-2.9465 0.5277-3.7501 0-2.0711-1.772-3.7501-3.9578-3.7501z" stroke="url(#k)" stroke-width="1.0845" fill="url(#f)"/>
<path opacity=".5" d="m10.622 21.7c-1.7714-0.862-0.9265-2.775-0.7496-4-0.75 0.87-0.3724 3.3-1.8724 3.3 1 0.35562 1.6845 0.59817 2.6224 0.7z" fill="url(#j)"/>
<path opacity=".3" d="m12 13.35c0.366 0.96 1.343 1.65 2.5 1.65 1.1566 0 2.134-0.69018 2.5-1.6495h-5z" fill="url(#e)"/>
<path opacity=".5" d="m18.4 21.7c1.7718-0.86182 0.9269-2.7752 0.75-4 0.75 0.87 0.372 3.3 1.872 3.3-1 0.35562-1.6845 0.59817-2.6224 0.7z" fill="url(#i)"/>
</g>
<path d="m14.5 2.5312c-1.6666 0-2.9513 1.2303-2.9688 2.7188 0.000139 0.00624-0.000145 0.024997 0 0.03125 0.01647 0.7081 0.08609 1.5273 0.5 3.4688-0.0051-0.03667 0.09671 0.20414 0.3125 0.46875 0.23243 0.28502 0.5666 0.60833 0.875 0.9375s0.59885 0.66898 0.84375 0.9375c0.09435 0.10345 0.17196 0.1869 0.25 0.28125 0.16681 0.03524 0.41525 0.03212 0.625 0 0.06182-0.08397 0.11475-0.15943 0.1875-0.25 0.21825-0.27171 0.4739-0.57599 0.75-0.90625s0.56921-0.68139 0.78125-0.96875c0.19756-0.26773 0.30731-0.50314 0.3125-0.5 0.4607-1.9998 0.47374-2.6696 0.5-3.4688 0-0.010182 0.000119-0.021091 0-0.03125-0.018-1.4884-1.302-2.7188-2.969-2.7188z" stroke="url(#h)" stroke-width="1.0845" fill="none"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 4.7 KiB

BIN
img/starred.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 703 B

6
img/starred.svg
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="300" width="300" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
<g transform="translate(-148.04 -752.38)">
<path stroke-linejoin="round" stroke="#000" stroke-width="5" fill="#fc0" d="m330.36 858.43 43.111 108.06 117.64 9.2572-89.445 74.392 27.55 114.75-98.391-62.079-100.62 61.66 28.637-112.76-89.734-76.638 116.09-7.6094z" stroke-opacity=".56579" transform="matrix(.91668 0 0 .96332 -4.7129 -71.76)" stroke-miterlimit="0"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 654 B

12
js/contacts.js
View File

@ -1182,7 +1182,7 @@ OC.Contacts = OC.Contacts || {};
}
values = {
id: this.id,
favorite:groupprops.favorite ? 'active' : '',
favorite:groupprops.favorite ? 'icon-starred' : 'icon-star',
name: this.getPreferredValue('FN', ''),
n0: n[0]||'', n1: n[1]||'', n2: n[2]||'', n3: n[3]||'', n4: n[4]||'',
nickname: this.getPreferredValue('NICKNAME', ''),
@ -1259,7 +1259,7 @@ OC.Contacts = OC.Contacts || {};
self.deleteProperty({obj:event.target});
});
this.$fullelem.on('click keydown', '.globe,.mail', function(event) {
this.$fullelem.on('click keydown', '.globe,.mail,.favorite', function(event) {
$('.tipsy').remove();
if(wrongKey(event)) {
return;
@ -1316,20 +1316,20 @@ OC.Contacts = OC.Contacts || {};
$bdayinput.attr('placeholder', $.datepicker.formatDate(datepickerFormatDate, new Date()));
this.$fullelem.find('.favorite').on('click', function () {
var state = $(this).hasClass('active');
var state = $(this).hasClass('icon-starred');
if(!self.data) {
return;
}
if(state) {
$(this).switchClass('active', 'inactive');
$(this).switchClass('icon-starred', 'icon-star');
} else {
$(this).switchClass('inactive', 'active');
$(this).switchClass('icon-star', 'icon-starred');
}
$(document).trigger('request.contact.setasfavorite', {
id: self.id,
state: !state
});
});
}).tipsy();
this.loadAvatar();
if(!this.data) {
// A new contact

2
templates/contacts.php
View File

@ -225,7 +225,7 @@
<li><a class="icon-upload action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
<li><a class="icon-folder action cloud icon-cloud" title="<?php echo $l->t('Select photo from Files'); ?>"></a></li>
</ul>
<a class="favorite {favorite}"></a>
<a class="favorite {favorite} tooltipped" title="<?php echo $l->t('Favorite'); ?>"></a>
</div>
<div class="singleproperties">
<h3><?php p($l->t('Name')); ?></h3>