0.9 final und Vidoes Agenturverbundbug behoben

cloud/templates/cloud/cloud_main.html

@@ -183,8 +183,9 @@ a.disabled {
       </div>     
       </div>
       <div class="modal-footer">        
-        <button type="button" class="btn btn-danger" data-dismiss="modal">Abrechen</button>&nbsp;
+        
-        <button id="doUpdateName" type="button" class="btn btn-success" data-dismiss="modal" onclick="javascript:updateName()" disabled="false">Speichern</button>
+        <button id="doUpdateName" type="button" class="btn btn-primary" data-dismiss="modal" onclick="javascript:updateName()" disabled="false">Speichern</button>&nbsp;
+        <button type="button" class="btn btn" data-dismiss="modal">Abbrechen</button>
       </div>
     </div>
   </div>
@@ -461,8 +462,8 @@ a.disabled {
         Die Datei <b><span id="doublefile_name"></span></b> ist bereits vorhanden. Soll die Datei ersetzt oder beide behalten werden?
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-danger" data-dismiss="modal" onclick="javascript:replaceFileDirectChoice(filetodo_ex, 1)">Alte Datei ersetzen</button>&nbsp;&nbsp;
+        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="javascript:replaceFileDirectChoice(filetodo_ex, 1)">Alte Datei ersetzen</button>&nbsp;&nbsp;
-        <button type="button" class="btn btn-success" data-dismiss="modal" onclick="javascript:replaceFileDirectChoice(filetodo_ex, 0)">Beide behalten</button>
+        <button type="button" class="btn btn" data-dismiss="modal" onclick="javascript:replaceFileDirectChoice(filetodo_ex, 0)">Beide behalten</button>
       </div>
     </div>
   </div>
@@ -1109,7 +1110,7 @@ function addDirAction(){
 <script type="text/javascript">
 
 //CHANGE
-var VIDEOURL = "URcOGJvRwlc"
+var VIDEOURL = "-rX5xcDMwXQ"
 var MODALNAME = "#youtubevideoinformation"
 var VIDEOTITLE = "Informationsvideo Dateien"
 

dasettings/forms.py

@@ -181,7 +181,7 @@ class UserProfileForm(forms.ModelForm):
 			image = Image.open(photo.image)
 			rotatet_image = image.rotate(rotation, expand=True)
 			cropped_image = rotatet_image.crop((x, y, w+x, h+y))			
-			resized_image = cropped_image.resize((300, 300), Image.ANTIALIAS)
+			resized_image = cropped_image.resize((416, 416), Image.ANTIALIAS)
 			resized_image.save(photo.image.path)
 			return photo
 		except:

dasettings/templates/dasettings/settings.html

@@ -223,20 +223,20 @@ var defaultsettingsview = "profil";
 -->
 <script type="text/javascript">
 
-//CHANGE
+//CHANGEhttps://youtu.be/
-var VIDEOURL_agn = "URcOGJvRwlc"
+var VIDEOURL_agn = "kbxFXJL12oQ"
 var MODALNAME_agn = "#youtubevideoinformation_agencynetwork"
 var VIDEOTITLE_agn = "Informationsvideo Agenturverbünde"
-//CHANGE
+//CHANGEhttps://youtu.be/
-var VIDEOURL_structure = "URcOGJvRwlc"
+var VIDEOURL_structure = "5AO_F8MQ2h4"
 var MODALNAME_structure = "#youtubevideoinformation_structure"
 var VIDEOTITLE_structure = "Informationsvideo Struktur"
 //CHANGE
-var VIDEOURL_users = "URcOGJvRwlc"
+var VIDEOURL_users = "_4VITgmZEH0"
 var MODALNAME_users = "#youtubevideoinformation_users"
 var VIDEOTITLE_users = "Informationsvideo Mitarbeiter und Gruppen"
 //CHANGE
-var VIDEOURL_agency = "URcOGJvRwlc"
+var VIDEOURL_agency = "6p0Kr0VEvtQ"
 var MODALNAME_agency = "#youtubevideoinformation_agency"
 var VIDEOTITLE_agency = "Informationsvideo Agentur und Agenturfunktionen"
 
@@ -277,13 +277,13 @@ $(document).ready(function(){
       player_users = new YT.Player('video-placeholder_users', {
           width: 760,
           height: 500,
-          videoId: VIDEOURL_agn,        
+          videoId: VIDEOURL_users,        
       });
 
       player_agency = new YT.Player('video-placeholder_agency', {
           width: 760,
           height: 500,
-          videoId: VIDEOURL_agn,        
+          videoId: VIDEOURL_agency,        
       });
   }
 

dasettings/templates/dasettings/structure_content.html

@@ -68,6 +68,7 @@ noclickeffect:active { border-style: outset !important;}
 		              <td>		    
 		              <button style="float: right" type="button" class="btn btn-secondary btn-sm " onclick="javascript:delTask({{task.pk}})" data-toggle="tooltip" data-placement="top" title="Tätigkeit löschen"><i class="fas fa-trash"></i></button>          
 	        			 <button style="float: right" class="btn btn-sm btn-secondary mr-1 " onclick="javascript:updateTaskComplete({{task.pk}})" data-toggle="tooltip" data-placement="top" title="Tätigkeit bearbeiten"><small><i class="fas fa-pen"></i></small></button>
+	        			 
 		              </td>              
 		          </tr>
 		          {% endif %}
@@ -378,7 +379,7 @@ function mainmodalTaskSave(){
 	        		newtaskareaname = data['data']['areaname'];
 	        		taskcreatedby = data['data']['taskcreator_fullname'];
 	        		taskcreateddate =  data['data']['createdate'];
-	        		$("#areatask_" + taskaddtoarea).prepend('<tr id="task_'+newtaskid+'"><td><a href="/standards/standard/'+newtaskid+'/task"  id="taskname_td_area_'+newtaskid+'">'+newtaskname+'</a></td><td>'+newtaskareaname+'</td><td>'+taskcreatedby+'</td><td>'+taskcreateddate+'</td><td><button style="float: right" class="btn btn-primary btn-sm" onclick="javascript:updateTaskComplete('+newtaskid+')" data-toggle="tooltip" data-placement="top" title="Tätigkeit bearbeiten"><small><i class="fas fa-pen"></i></small></button><button style="float: right" type="button" class="btn btn-danger btn-sm mr-1" onclick="javascript:delTask('+newtaskid+')" data-toggle="tooltip" data-placement="top" title="Tätigkeit löschen"><i class="fas fa-trash"></i></button></td> ></tr>');
+	        		$("#areatask_" + taskaddtoarea).prepend('<tr id="task_'+newtaskid+'"><td><a href="/standards/standard/'+newtaskid+'/task"  id="taskname_td_area_'+newtaskid+'">'+newtaskname+'</a></td><td>'+newtaskareaname+'</td><td>'+taskcreatedby+'</td><td>'+taskcreateddate+'</td><td><button style="float: right" type="button" class="btn btn-secondary btn-sm " onclick="javascript:delTask('+newtaskid+')" data-toggle="tooltip" data-placement="top" title="Tätigkeit löschen"><i class="fas fa-trash"></i></button><button style="float: right" class="btn btn-secondary btn-sm mr-1" onclick="javascript:updateTaskComplete('+newtaskid+')" data-toggle="tooltip" data-placement="top" title="Tätigkeit bearbeiten"><small><i class="fas fa-pen"></i></small></button></td> ></tr>');
 	        	}
 
 	        	else{	        		

dasettings/templates/dasettings/user_usprof.html

@@ -403,8 +403,8 @@ function addUserToGroup(userid, groupid){
 /* CROPPER */
     $("#id_x").val(0);
     $("#id_y").val(0);
-    $("#id_width").val(300);
+    $("#id_width").val(416);
-    $("#id_height").val(300);
+    $("#id_height").val(416);
     $("#id_rotation").val(0);
 
     function clearImgField(){      

digitaleagentur/settings.py

@@ -14,35 +14,32 @@ import os
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 
-############################################## LOCAL #####################################
+############################################## PROD #####################################
-BASE_URL = "http://localhost:8000/"
+BASE_URL = "https://digitale-agentur.com/"
 CRONAPIKEY = "gCddsaz6NOnE9QbXZM5LasdEk122D"
 MAILINFOKEY = "jka7sd8iukashdna78skduJAHDsu6dilaksdjba65a68iadbhjak"
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
-# Database
+# MAIL PROD
-# https://docs.djangoproject.com/en/2.2/ref/settings/#databases
+EMAIL_HOST = 'smtp.strato.de'
-# DEV
+EMAIL_PORT = 587
+EMAIL_USE_TLS = True
+EMAIL_HOST_USER = "noreply@digitale-agentur.com"
+EMAIL_HOST_PASSWORD = "48c3n6YggZBuPyShtqOQ"
+DEFAULT_FROM_EMAIL = "noreply@digitale-agentur.com"
+
+# PROD
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
         'NAME' : 'digitaleagentur',
-        'USER' : 'root',
+        'USER' : 'digitaleagentur',
-        'PASSWORD' : '',
+        'PASSWORD' : 'H9hzbzyBqtUCnZlIwL1qSrzh',
         'PORT' : 3306
     }
 }
-
+############################################## PROD #####################################
-# MAIL DEV
-EMAIL_HOST = 'gymhum.de'
-EMAIL_PORT = 587
-EMAIL_USE_TLS = True
-EMAIL_HOST_USER = "holger.trampe"
-EMAIL_HOST_PASSWORD = "Motte2016_!"
-DEFAULT_FROM_EMAIL = "holger.trampe@gymhum.de"
-
-################################################### LOCAL ###############################
 
 
 

message/templates/message/message.html

@@ -182,7 +182,7 @@
 <script type="text/javascript">
 
 //CHANGE
-var VIDEOURL = "URcOGJvRwlc"
+var VIDEOURL = "s9-Nr7dEiZ0"
 var MODALNAME = "#youtubevideoinformation"
 var VIDEOTITLE = "Informationsvideo Mitteilungen"
 

news/templates/news/news_management.html

@@ -270,7 +270,7 @@ $('#news_tabs a').on('click', function (e) {
 <script type="text/javascript">
 
 //CHANGE
-var VIDEOURL = "URcOGJvRwlc"
+var VIDEOURL = "zB1icna9YaA"
 var MODALNAME = "#youtubevideoinformation"
 var VIDEOTITLE = "Informationsvideo News"
 

orga/templates/orga/orga_main.html

@@ -6,7 +6,9 @@
 <div class="content-section">
   <h3>{{request.user.profile.agency.name}}</h3>
   <hr>
-  <h4>Organigramm</h4>  
+  <h4>Organigramm&nbsp;
+    <small><i onclick="javascript:$('#youtubevideoinformation').modal('toggle');" class="far fa-play-circle"></i></small>
+  </h4>  
   {% if invisible_users > 0%}
       <div class="alert alert-danger" role="alert">
         Achtung! {{invisible_users}} Mitarbeiter sind anderen Mitarbeitern untergeordnet, die nicht im Organigramm sichtbar sein sollen. Bitte prüfen sie die Zuordnung der übergeordneten Mitarbeiter!
@@ -159,4 +161,64 @@ $('#diagram').append(html.join(''));
 
 
 </script>
+
+<!-- YOUTUBE PART START -->
+<!--
+//COPY THAT
+<small><i onclick="javascript:$('#youtubevideoinformation').modal('toggle');" class="far fa-play-circle"></i></small>
+-->
+<script type="text/javascript">
+
+//CHANGE
+var VIDEOURL = "Ca3Ez895CLU"
+var MODALNAME = "#youtubevideoinformation"
+var VIDEOTITLE = "Informationsvideo News"
+
+$(document).ready(function(){     
+
+    $("#modaltitle_video").html(VIDEOTITLE);    
+
+    //VIDEOCONTROLS
+    $( MODALNAME ).on('shown.bs.modal', function(e){
+      player.playVideo();
+    });
+
+    $( MODALNAME ).on('hidden.bs.modal', function(e){
+      player.pauseVideo();
+    });
+});
+   //VIDEOPLAYER
+  var player;
+
+  function onYouTubeIframeAPIReady() {
+      player = new YT.Player('video-placeholder', {
+          width: 760,
+          height: 500,
+          videoId: VIDEOURL,        
+      });
+  }
+
+</script>
+<script src="https://www.youtube.com/iframe_api"></script>
+<!-- VIDEOMODAL -->
+<div class="modal fade" id="youtubevideoinformation" tabindex="-1"  role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="modaltitle_video"></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body" style="min-height: 500px;">
+        <div id="video-placeholder"></div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>        
+      </div>
+    </div>
+  </div>
+</div>
+<!-- YOUTUBE PART ENDE -->
+
 {% endblock content %}

organizer/templates/organizer/organizer_management.html

@@ -128,7 +128,7 @@ function saveDefQL(){
 <script type="text/javascript">
 
 //CHANGE
-var VIDEOURL = "URcOGJvRwlc"
+var VIDEOURL = "DpcazmKv5R0"
 var MODALNAME = "#youtubevideoinformation"
 var VIDEOTITLE = "Informationsvideo Organizer"
 

standards/templates/standards/standards_management.html

@@ -334,7 +334,7 @@
 <script type="text/javascript">
 
 //CHANGE
-var VIDEOURL = "URcOGJvRwlc"
+var VIDEOURL = "5HhvQnknJ-A"
 var MODALNAME = "#youtubevideoinformation"
 var VIDEOTITLE = "Informationsvideo Standards"
 

standards/templates/standards/standards_single_agn.html

@@ -156,8 +156,8 @@
         <small>Es wird ein neuer Standard in Ihrer Agentur mit den Informationen dieses Standards erstellt.</small>
       </div>
       <div class="modal-footer">                
-        <button type="button" class="btn btn-danger" data-dismiss="modal">Abbrechen</button>&nbsp;
+        <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="javascript:doCopy()">Standard übernehmen</button>&nbsp;
-        <button type="button" class="btn btn-success" data-dismiss="modal" onclick="javascript:doCopy()">Standard übernehmen</button>
+        <button type="button" class="btn btn" data-dismiss="modal">Abbrechen</button>
       </div>
     </div>
   </div>

standards/views.py

@@ -647,7 +647,7 @@ def CopyStandard(request, pk):
 		tempdatafile.save()
 		new_standard.addedfiles.add(tempdatafile)
 
-	return redirect('standard-update', new_standard.pk)
+	return redirect('standard-add', new_standard.pk)
 
 @login_required
 def StandardArea(request, pk):

users/templates/users/dashboard.html

@@ -92,7 +92,7 @@
 <script type="text/javascript">
 
 //CHANGE
-var VIDEOURL = "URcOGJvRwlc"
+var VIDEOURL = "zB1icna9YaA"
 var MODALNAME = "#youtubevideoinformation"
 var VIDEOTITLE = "Informationsvideo News"