1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2024-12-01 13:24:10 +01:00

Remove use of %webroot%. Closes #406

This commit is contained in:
Thomas Tanghus 2014-02-26 23:23:01 +01:00
parent f07df773ab
commit 394d15350e
6 changed files with 35 additions and 101 deletions

View File

@ -252,17 +252,6 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
/* TODO: Use @import url('../css/[no-]svg.css); instead. */
/*.no-svg .add { background-image:url('%webroot%/core/img/actions/add.png'); }*/
.no-svg .delete { background-image:url('%webroot%/core/img/actions/delete.png'); }
.no-svg .edit { background-image:url('%webroot%/core/img/actions/rename.png'); }
.no-svg .share { background-image:url('%webroot%/core/img/actions/share.png'); }
/*.no-svg .groups { background-image:url('%webroot%/core/img/actions/shared.png'); }*/
.no-svg .mail { background-image:url('%webroot%/core/img/actions/mail.png'); }
.no-svg .import, .no-svg .upload { background-image:url('%webroot%/core/img/actions/upload.png'); }
.no-svg .export, .no-svg .download { background-image:url('%webroot%/core/img/actions/download.png'); }
.no-svg .export, .no-svg .shared { background-image:url('%webroot%/core/img/actions/shared.png'); }
.no-svg .globe { background-image:url('%webroot%/core/img/actions/public.png'); }
.no-svg .settings { background-image:url('%webroot%/core/img/actions/settings.svg'); }
.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; }
@ -273,17 +262,6 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
background-repeat: no-repeat;
width: auto; height: auto;
}
/*.svg .add { background-image:url('%webroot%/core/img/actions/add.svg'); }*/
.svg .delete { background-image:url('%webroot%/core/img/actions/delete.svg'); }
.svg .edit { background-image:url('%webroot%/core/img/actions/rename.svg'); }
.svg .share { background-image:url('%webroot%/core/img/actions/share.svg'); }
/*.svg .groups { background-image:url('%webroot%/core/img/actions/shared.svg'); }*/
.svg .mail { background-image:url('%webroot%/core/img/actions/mail.svg'); }
.svg .import,.svg .upload { background-image:url('%webroot%/core/img/actions/upload.svg'); }
.svg .export,.svg .download { background-image:url('%webroot%/core/img/actions/download.svg'); }
.svg .export,.svg .shared { background-image:url('%webroot%/core/img/actions/shared.svg'); }
.svg .globe { background-image:url('%webroot%/core/img/actions/public.svg'); }
.svg .settings { background-image:url('%webroot%/core/img/actions/settings.svg'); }
.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; }
@ -292,8 +270,6 @@ span.ui-icon { margin: 1px 3px 10px 0px; }
.float { float: left; display: inline-block; width: auto; }
.float.right { float: right; }
.break { clear: both; }
.loading { background: url('%webroot%/core/img/loading.gif') no-repeat center !important; cursor: wait; }
.wait { opacity: cursor: wait; }
.control {
border: 1px solid #DDDDDD;
border-radius: 0.3em;
@ -506,11 +482,11 @@ dt[data-element="org"] { margin-top: 4px; }
/* Single elements */
#file_upload_form, #file_upload_target, #import_upload_target, #crop_target { display:none; }
#import_upload_start, .import-upload-button {
width: 30px; height: 30px;
width: 30px !important; height: 30px !important;
display:block;
position: absolute;
right: 0; top: 0;
margin: 5px;
margin: 5px !important;
cursor: pointer;
}
#import_upload_start {
@ -518,7 +494,6 @@ dt[data-element="org"] { margin-top: 4px; }
z-index: 1001;
}
.import-upload-button {
background-image: url("%webroot%/core/img/actions/upload.svg");
background-position: center center;
background-repeat: no-repeat;
cursor: pointer;
@ -568,7 +543,7 @@ input[type=checkbox].propertytype { width: 10px; }
right: -6px; top: -6px;
width: 25px; height: 25px;
}
#photowrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; background-image: url('%webroot%/core/img/loading.gif'); cursor: wait; }
#photowrapper.wait { opacity: 0.6; filter:alpha(opacity=0.6); z-index:1000; cursor: wait; }
#phototools { position:absolute; margin: 5px 0 0 10px; width:auto; height:20px; padding:2px; background-color:#fff; list-style-type:none; border-radius: 0.3em; -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; }
#phototools li { display: inline; }
#phototools li a { float:left; opacity: 0.6; }
@ -812,9 +787,8 @@ tbody tr.contact.active, tbody tr.contact:hover {
cursor:pointer;
width:16px; height:16px;
margin: 18px 0 2px 5px; z-index: 200;
opacity: 0.6; background-image:url('%webroot%/core/img/actions/mail.svg');
display: none; opacity: 0.8;
}
#contactlist tbody > tr > td a.mailto:hover { opacity: 0.8; }
#contactlist tbody > tr > td > a.delete {
position: absolute;
@ -855,8 +829,6 @@ tbody tr.contact.active, tbody tr.contact:hover {
-ms-transform: rotate(270deg); transform: rotate(270deg);
}
#contact figure img { -moz-border-radius:.3em; -webkit-border-radius:.3em; border-radius:.3em; border: thin solid #bbb; margin: 0.3em; background-image: url('%webroot%/core/img/loading.gif'); -moz-box-shadow: 0 1px 3px #777; -webkit-box-shadow: 0 1px 3px #777; box-shadow: 0 1px 3px #777; opacity: 1; }
#contact span.adr {
float: left;
width: 300px;

36
css/font-awesome.css vendored
View File

@ -1,36 +0,0 @@
/* Alter the FontAwesome style sheet to not change the font for normal text.
* Enable you to do eg. <button class="icon-fubar">Text</button> without the
* need for an extra <i /> element.
*
* This requires the 3rdparty_minimizer_path branch:
*@import url('%3rdpartyroot%/fontawesome/css/font-awesome.min.css');*/
[class^="icon-"],
[class*=" icon-"] {
font-family: "Lucida Grande", Arial, Verdana, sans-serif;
}
[class^="icon-"]:before,
[class*=" icon-"]:before {
font-family: FontAwesome;
font-weight: normal;
font-style: normal;
text-decoration: inherit;
-webkit-font-smoothing: antialiased;
}
input[type="submit"][class^="icon-"].text, input[type="submit"][class*=" icon-"].text,
input[type="button"][class^="icon-"].text, input[type="button"][class*=" icon-"].text,
button[class^="icon-"].text, button[class*=" icon-"].text,
.button[class^="icon-"].text, .button[class*=" icon-"].text,
select[class^="icon-"].text, select[class*=" icon-"].text {
font-weight: bold;
}
input[type="submit"][class^="icon-"].text:before, input[type="submit"][class*=" icon-"].text:before,
input[type="button"][class^="icon-"].text:before, input[type="button"][class*=" icon-"].text:before,
button[class^="icon-"].text:before, button[class*=" icon-"].text:before,
.button[class^="icon-"].text:before, .button[class*=" icon-"].text:before,
select[class^="icon-"].text:before, select[class*=" icon-"].text:before {
padding-right: 3px;
}

View File

@ -1653,7 +1653,7 @@ OC.Contacts = OC.Contacts || {};
var finishLoad = function(image) {
console.log('finishLoad', self.getDisplayName(), image.width, image.height);
$(image).addClass('contactphoto');
$photowrapper.removeClass('loading wait');
$photowrapper.removeClass('loading');
$photowrapper.css({width: image.width + 10, height: image.height + 10});
$(image).insertAfter($phototools).fadeIn();
};
@ -1668,9 +1668,9 @@ OC.Contacts = OC.Contacts || {};
.imageplaceholder(name || '#');
};
$photowrapper.addClass('loading').addClass('wait');
$photowrapper.addClass('loading');
if(!this.hasPhoto()) {
$photowrapper.removeClass('loading wait');
$photowrapper.removeClass('loading');
addAvatar();
} else {
$.when(this.storage.getContactPhoto(backend, parent, id))

View File

@ -688,7 +688,7 @@ OC.Contacts = OC.Contacts || {};
$elem.data('obj', self);
$elem.data('rawname', t('contacts', 'Favorites'));
if(!$elem.find('.starred').length) {
$elem.data('contacts', contacts).find('.numcontacts').before('<span class="starred action" />');
$elem.data('contacts', contacts).find('.numcontacts').before('<span class="icon icon-starred starred action" />');
}
$elem.droppable({
drop: self.contactDropped,

View File

@ -52,8 +52,6 @@ class PageController extends Controller {
\OCP\Util::addScript('contacts', 'jquery.ocaddnew');
\OCP\Util::addScript('files', 'jquery.fileupload');
\OCP\Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop');
\OCP\Util::addStyle('3rdparty/fontawesome', 'font-awesome');
\OCP\Util::addStyle('contacts', 'font-awesome');
\OCP\Util::addStyle('', 'jquery.multiselect');
\OCP\Util::addStyle('contacts', 'jquery.combobox');
\OCP\Util::addStyle('contacts', 'jquery.ocaddnew');

View File

@ -28,7 +28,7 @@
<select id="import_into">
<option value="-1"><?php p($l->t('Import into...')); ?></option>
</select>
<button class="svg tooltipped rightwards import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
<button class="icon icon-upload svg tooltipped rightwards import-upload-button" title="<?php p($l->t('Select file...')); ?>"></button>
<input id="import_upload_start" class="tooltipped rightwards" title="<?php p($l->t('Select file...')); ?>" type="file" accept="text/vcard,text/x-vcard,text/directory" name="file" disabled />
</li>
<li class="import-status">
@ -56,15 +56,15 @@
</span>
<span class="actions">
<a class="delete svg action text permanent">
<a class="icon icon-delete delete svg action text permanent">
<?php p($l->t('Delete')); ?>
<img class="svg" alt="<?php p($l->t('Delete'))?>" src="<?php print_unescaped(OCP\image_path("core", "actions/delete.svg")); ?>" />
</a>
<select class="groups svg action text permanent shared" name="groups">
<option value="-1" disabled="disabled" selected="selected"><?php p($l->t('Groups')); ?></option>
</select>
<a class="download svg action text permanent"><?php p($l->t('Download')); ?></a>
<a class="action svg text permanent merge edit"><?php p($l->t('Merge')); ?></a>
<a class="icon icon-download download svg action text permanent"><?php p($l->t('Download')); ?></a>
<a class="icon icon-rename action svg text permanent merge edit"><?php p($l->t('Merge')); ?></a>
</span>
</td>
<td class="info email"><?php p($l->t('Email')); ?></td>
@ -160,8 +160,8 @@
<li class="group" data-type="{type}" data-id="{id}">
<a class="name" role="button">{name}</a>
<span class="utils">
<a class="action delete tooltipped rightwards"></a>
<a class="action edit tooltipped rightwards"></a>
<a class="icon icon-delete action delete tooltipped rightwards"></a>
<a class="icon icon-rename action edit tooltipped rightwards"></a>
<span class="action numcontacts">{num}</span>
</span>
</li>
@ -192,7 +192,7 @@
</td>
<td class="email">
<a href="mailto:{email}">{email}</a>
<a class="svg mailto hidden" title="<?php p($l->t('Compose mail')); ?>"></a>
<a class="icon icon-mail svg mailto hidden" title="<?php p($l->t('Compose mail')); ?>"></a>
</td>
<td class="tel">{tel}</td>
<td class="adr">{adr}</td>
@ -220,9 +220,9 @@
<li>
<div id="photowrapper" class="propertycontainer" data-element="photo">
<ul id="phototools" class="transparent hidden">
<li><a class="action delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
<li><a class="action edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
<li><a class="action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
<li><a class="icon icon-delete action delete" title="<?php echo $l->t('Delete current photo'); ?>"></a></li>
<li><a class="icon icon-rename action edit" title="<?php echo $l->t('Edit current photo'); ?>"></a></li>
<li><a class="icon icon-upload action upload" title="<?php echo $l->t('Upload new photo'); ?>"></a></li>
<li><a class="action cloud icon-cloud" title="<?php echo $l->t('Select photo from ownCloud'); ?>"></a></li>
</ul>
<a class="favorite {favorite}"></a>
@ -268,7 +268,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{nickname}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</div>
@ -278,7 +278,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{title}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</div>
@ -288,7 +288,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{org}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</div>
@ -298,7 +298,7 @@
<label class="propertyname"></label>
<input class="value rightwards onfocus" type="text" name="value" value="{bday}" required />
<span class="listactions">
<a role="button" class="action delete"></a>
<a role="button" class="icon icon-delete action delete"></a>
</span>
</dd>
</d>
@ -375,8 +375,8 @@
</span>
<input type="email" class="nonempty value" name="value" value="{value}" x-moz-errormessage="<?php p($l->t('Please specify a valid email address.')); ?>" placeholder="<?php p($l->t('someone@example.com')); ?>" required />
<span class="listactions">
<a class="action mail tooltipped leftwards" title="<?php p($l->t('Mail to address')); ?>"></a>
<a role="button" class="action delete tooltipped leftwards" title="<?php p($l->t('Delete email address')); ?>"></a>
<a class="icon icon-mail action mail tooltipped leftwards" title="<?php p($l->t('Mail to address')); ?>"></a>
<a role="button" class="icon icon-delete action delete tooltipped leftwards" title="<?php p($l->t('Delete email address')); ?>"></a>
</span>
</li>
</div>
@ -390,7 +390,7 @@
</span>
<input type="text" class="nonempty value" name="value" value="{value}" placeholder="<?php p($l->t('Enter phone number')); ?>" required />
<span class="listactions">
<a role="button" class="action delete tooltipped leftwards"></a>
<a role="button" class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
</li>
</div>
@ -404,8 +404,8 @@
</span>
<input type="url" class="nonempty value" name="value" value="{value}" placeholder="http://www.example.com/" required />
<span class="listactions">
<a role="button" class="action globe tooltipped leftwards" title="<?php p($l->t('Go to web site')); ?>">
<a role="button" class="action delete tooltipped leftwards"></a>
<a role="button" class="icon icon-public action globe tooltipped leftwards" title="<?php p($l->t('Go to web site')); ?>">
<a role="button" class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
</li>
</div>
@ -421,8 +421,8 @@
<span class="adr">{value}</span>
</span>
<span class="listactions">
<a class="action globe tooltipped leftwards" title="<?php p($l->t('View on map')); ?>"></a>
<a class="action delete tooltipped leftwards"></a>
<a class="icon icon-public action globe tooltipped leftwards" title="<?php p($l->t('View on map')); ?>"></a>
<a class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
<fieldset class="adr hidden editor">
<ul>
@ -472,7 +472,7 @@
<input type="text" class="nonempty value" name="value" value="{value}"
placeholder="<?php p($l->t('Instant Messenger')); ?>" required />
<span class="listactions">
<a role="button" class="action delete tooltipped leftwards"></a>
<a role="button" class="icon icon-delete action delete tooltipped leftwards"></a>
</span>
</li>
</div>
@ -486,11 +486,11 @@
<input type="checkbox" name="active" checked="checked" title="<?php p($l->t('Active')); ?>" />
<label>{displayname}</label>
<span class="actions">
<a title="<?php p($l->t('Share')); ?>" class="share action" data-possible-permissions="{permissions}" data-item="{id}" data-item-type="addressbook"></a>
<a title="<?php p($l->t('Export')); ?>" class="download action"></a>
<a title="<?php p($l->t('CardDAV link')); ?>" class="globe action"></a>
<a title="<?php p($l->t('Edit')); ?>" class="edit action"></a>
<a title="<?php p($l->t('Delete')); ?>" class="delete action"></a>
<a title="<?php p($l->t('Share')); ?>" class="icon icon-share share action" data-possible-permissions="{permissions}" data-item="{id}" data-item-type="addressbook"></a>
<a title="<?php p($l->t('Export')); ?>" class="icon icon-download download action"></a>
<a title="<?php p($l->t('CardDAV link')); ?>" class="icon icon-public globe action"></a>
<a title="<?php p($l->t('Edit')); ?>" class="icon icon-rename edit action"></a>
<a title="<?php p($l->t('Delete')); ?>" class="icon icon-delete delete action"></a>
</span>
</li>
</script>