msgtplui - Tweak navbar in expanded view

diff --git a/ext/msgtplui/ang/msgtplui.css b/ext/msgtplui/ang/msgtplui.css
index ecbc08c312615d78ebecc3949a056d62c471fe49..362005623b67e09f9e92bb9b711c9d37023e6023 100644 (file)
--- a/ext/msgtplui/ang/msgtplui.css
+++ b/ext/msgtplui/ang/msgtplui.css
@@ -1,3 +1,3 @@
-.ui-dialog.msgtplui-expanded .ui-dialog-titlebar {
+.ui-dialog.msgtplui-dialog .ui-dialog-titlebar {
   display:none;
 }

diff --git a/ext/msgtplui/ang/msgtplui/EditContent.html b/ext/msgtplui/ang/msgtplui/EditContent.html
index 39a7fe1f5f946f03ba63fae386ac0884a87f383f..7c34efe3c6cfde008eda779a413d4419bc99e545 100644 (file)
--- a/ext/msgtplui/ang/msgtplui/EditContent.html
+++ b/ext/msgtplui/ang/msgtplui/EditContent.html
@@ -35,7 +35,7 @@
       />
        
       <div class="btn-group btn-group-xs pull-right" role="toolbar" aria-label="{{::ts('HTML Content: Toolbar')}}" ng-show="accordions.msg_html">
-        <button type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull('msg_html', {language: 'html'})">
+        <button type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull(ts('HTML Content'), 'msg_html', {language: 'html'})">
           <span class="fa fa-expand" aria-hidden="true"></span>
         </button>
         <button type="button" class="btn btn-default" title="{{::ts('Open preview')}}" ng-click="$ctrl.openPreview('msg_html')">
@@ -67,7 +67,7 @@
       />
       &nbsp;
       <div class="btn-group btn-group-xs pull-right" role="toolbar" aria-label="{{::ts('Text Content: Toolbar')}}" ng-show="accordions.msg_text">
-        <button type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull('msg_text', {language: 'smarty'})">
+        <button type="button" class="btn btn-default" title="{{::ts('Open large editor')}}" ng-click="$ctrl.openFull(ts('Text Content'), 'msg_text', {language: 'smarty'})">
           <span class="fa fa-expand" aria-hidden="true"></span>
         </button>
         <button type="button" class="btn btn-default" title="{{::ts('Open preview')}}" ng-click="$ctrl.openPreview('msg_text')">

diff --git a/ext/msgtplui/ang/msgtplui/EditContent.js b/ext/msgtplui/ang/msgtplui/EditContent.js
index 1d1626ad9f9632c20f38f662db03d46463f525c4..3bd3a4607727ae475479cc58642797eb82053074 100644 (file)
--- a/ext/msgtplui/ang/msgtplui/EditContent.js
+++ b/ext/msgtplui/ang/msgtplui/EditContent.js
@@ -18,8 +18,9 @@
         }, opts);
       };
 
-      $ctrl.openFull = function(fld, monacoOptions) {
+      $ctrl.openFull = function(title, fld, monacoOptions) {
         var model = {
+          title: title,
           monacoOptions: $ctrl.monacoOptions(angular.extend({crmHeightPct: 0.80}, monacoOptions)),
           openPreview: function() { return $ctrl.openPreview(model.field); },
           record: $ctrl.options.record,
@@ -28,7 +29,7 @@
         };
         var options = CRM.utils.adjustDialogDefaults({
           // show: {effect: 'slideDown'},
-          dialogClass: 'msgtplui-expanded',
+          dialogClass: 'msgtplui-dialog',
           autoOpen: false,
           height: '90%',
           width: '90%'

diff --git a/ext/msgtplui/ang/msgtplui/ExpandedEdit.html b/ext/msgtplui/ang/msgtplui/ExpandedEdit.html
index 96168ee5f8cf6ec4c6ea680acc30a27b6237cedf..d2258e6695dca28b1d828339d5536322402d6ab9 100644 (file)
--- a/ext/msgtplui/ang/msgtplui/ExpandedEdit.html
+++ b/ext/msgtplui/ang/msgtplui/ExpandedEdit.html
@@ -4,6 +4,11 @@
 
     <nav class="navbar navbar-default">
       <div class="container-fluid">
+        <div class="navbar-header">
+          <div class="navbar-brand">
+            {{::model.title}}
+          </div>
+        </div>
         <div class="navbar-form navbar-right">
           <div class="form-group">
             <button type="button" class="btn btn-default" ng-click="model.openPreview()">