Renamed buddyPicture directive to buddyPictureCapture to avoid name conflicts.

src/styles/components/_buddypicturecapture.scss

@@ -19,7 +19,7 @@
  *
  */
 
-.buddyPicture {
+.buddyPictureCapture {
   .picture {
     display: block;
     margin-bottom: 5px;

src/styles/main.scss

@@ -38,7 +38,7 @@
 @import "components/rightslide";
 @import "components/bar";
 @import "components/buddylist";
-@import "components/buddypicture";
+@import "components/buddypicturecapture";
 @import "components/settings";
 @import "components/chat";
 @import "components/usability";

static/js/directives/buddypicturecapture.js

@@ -18,8 +18,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-define(['jquery', 'underscore', 'text!partials/buddypicture.html'], function($, _, template) {
+define(['jquery', 'underscore', 'text!partials/buddypicturecapture.html'], function($, _, template) {
 
+	// buddyPictureCapture
 	return ["$compile", function($compile) {
 
 		var controller = ['$scope', 'safeApply', '$timeout', '$q', function($scope, safeApply, $timeout, $q) {

static/js/directives/directives.js

@@ -25,7 +25,7 @@ define([
 	'directives/onescape',
 	'directives/statusmessage',
 	'directives/buddylist',
-	'directives/buddypicture',
+	'directives/buddypicturecapture',
 	'directives/settings',
 	'directives/chat',
 	'directives/audiovideo',
@@ -41,14 +41,14 @@ define([
 	'directives/pdfcanvas',
 	'directives/odfcanvas',
 	'directives/presentation',
-	'directives/youtubevideo',], function(_, onEnter, onEscape, statusMessage, buddyList, buddyPicture, settings, chat, audioVideo, usability, audioLevel, fileInfo, screenshare, roomBar, socialShare, page, contactRequest, defaultDialog, pdfcanvas, odfcanvas, presentation, youtubevideo) {
+	'directives/youtubevideo',], function(_, onEnter, onEscape, statusMessage, buddyList, buddyPictureCapture, settings, chat, audioVideo, usability, audioLevel, fileInfo, screenshare, roomBar, socialShare, page, contactRequest, defaultDialog, pdfcanvas, odfcanvas, presentation, youtubevideo) {
 
 	var directives = {
 		onEnter: onEnter,
 		onEscape: onEscape,
 		statusMessage: statusMessage,
 		buddyList: buddyList,
-		buddyPicture: buddyPicture,
+		buddyPictureCapture: buddyPictureCapture,
 		settings: settings,
 		chat: chat,
 		audioVideo: audioVideo,

static/partials/buddypicturecapture.html

@@ -1,4 +1,4 @@
-<div class="buddyPicture">
+<div class="buddyPictureCapture">
 	<img class="picture" ng-show="user.buddyPicture" ng-src="{{user.buddyPicture}}" alt="" width="46" height="46" />
 	<div class="collapse showTakePicture" collapse="!showTakePicture">
 		<div class="videoPicture">

static/partials/settings.html

@@ -9,7 +9,7 @@
           <label class="col-xs-4 control-label">{{_('Your picture')}}</label>
             <div class="col-xs-8">
               <label>
-                <buddy-picture></buddy-picture>
+                <buddy-picture-capture></buddy-picture-capture>
               </label>
             </div>
         </div>