Merge pull request #227 from laboro/feature/contact_view_improve

CRM-657: Improve contact view to use responcive-cell design

Author: yshyshkin

src/OroCRM/Bundle/CallBundle/Resources/config/datagrid.yml

@@ -120,6 +120,25 @@ datagrid:
             dateTime:
                 label: orocrm.call.datagrid.date_time
                 frontend_type: datetime
+        filters:
+            columns:
+                contactName:
+                    type: string
+                    enabled: false
+                    data_name: contactName
+                accountName:
+                    type: string
+                    enabled: false
+                    data_name: account.name
+                subject:
+                    type: string
+                    data_name: call.subject
+                phone:
+                    type: string
+                    data_name: phone
+                dateTime:
+                    type: datetime
+                    data_name: call.callDateTime
         sorters:
             columns:
                 contactName:

src/OroCRM/Bundle/CallBundle/Resources/views/Call/widget/update.html.twig

@@ -1,14 +1,14 @@
 <div class="widget-content call-form">
     {% if saved is defined and saved %}
         <script type="text/javascript">
-            require(['underscore', 'oro/translator', 'oro/widget-manager', 'oro/messenger', 'oro/registry'],
-                    function(_, __, widgetManager, messenger, registry) {
-                        widgetManager.getWidgetInstance({{ app.request.get('_wid')|json_encode|raw }}, function(widget) {
-                            messenger.notificationFlashMessage('success', __('Call logged successfully'));
-                            widget.trigger('contactCallLogged');
-                            widget.remove();
-                        });
-                    });
+            require(['underscore', 'oro/translator', 'oro/widget-manager', 'oro/messenger'],
+            function(_, __, widgetManager, messenger) {
+                widgetManager.getWidgetInstance({{ app.request.get('_wid')|json_encode|raw }}, function(widget) {
+                    messenger.notificationFlashMessage('success', __('Call logged successfully'));
+                    widget.trigger('contactCallLogged');
+                    widget.remove();
+                });
+            });
         </script>
     {% else %}
 

src/OroCRM/Bundle/ContactBundle/Resources/views/Contact/view.html.twig

@@ -10,16 +10,6 @@
 {% set gridName = 'contacts-email-grid' %}
 
 {% block navButtons %}
-    {% if resource_granted('orocrm_call_create') %}
-        {{ UI.clientButton({
-            'dataUrl': path('orocrm_call_create', { 'contactId': entity.id }) ,
-            'aCss': 'no-hash log-call-button',
-            'iCss': 'icon-phone',
-            'dataId': entity.id,
-            'title' : 'Log call'|trans,
-            'label' : 'Log call'|trans
-        }) }}
-    {% endif %}
     {% if resource_granted('oro_email_create') %}
         {{ UI.clientButton({
             'dataUrl': path('orocrm_contact_email_create', { 'contactId': entity.id }) ,
@@ -30,6 +20,16 @@
             'label' : 'Send email'|trans
         }) }}
     {% endif %}
+    {% if resource_granted('orocrm_call_create') %}
+        {{ UI.clientButton({
+        'dataUrl': path('orocrm_call_create', { 'contactId': entity.id }) ,
+        'aCss': 'no-hash log-call-button',
+        'iCss': 'icon-phone',
+        'dataId': entity.id,
+        'title' : 'Log call'|trans,
+        'label' : 'Log call'|trans
+        }) }}
+    {% endif %}
     {% if resource_granted('orocrm_contact_update') %}
         {{ UI.button({
             'path' : path('orocrm_contact_update', { 'id': entity.id }),
@@ -140,18 +140,11 @@
                     })
                 }}
             </div>
-        </div>
-    {# TODO: This is a temporary list of emails for demo purposes. It will be removed when 'display activities' functionality is implemented  #}
-    {#{% if resource_granted('oro_email_view') %}#}
-        {#{{ render(controller('OroEmailBundle:Email:activities', {'emails': entity.emails})) }}#}
-    {#{% endif %}#}
 
-        {% if resource_granted('oro_email_view') %}
-        <div class="clearfix">
+            {% if resource_granted('oro_email_view') %}
             <div class="responsive-cell contact-info-col">
                 <div class="box-type1">
                     <div class="title">
-                        <div class="pull-right widget-actions-container"></div>
                         <span class="widget-title">{{ "Emails"|trans }}</span>
                     </div>
                     <div class="row-fluid">
@@ -160,22 +153,20 @@
                     </div>
                 </div>
             </div>
-        </div>
-        {% endif %}
+            {% endif %}
 
-        {% if resource_granted('orocrm_call_view') %}
-        <div class="clearfix">
-            <div class="responsive-cell contact-info-col">
-                {{
-                    oro_widget_render({
-                        'widgetType': 'block',
-                        'url': path('orocrm_call_widget_calls', {contactId: entity.id}),
-                        'title': 'Calls'|trans,
-                        'alias': 'contact_calls'
-                    })
-                }}
-            </div>
+            {% if resource_granted('orocrm_call_view') %}
+                <div class="responsive-cell contact-info-col">
+                    {{
+                        oro_widget_render({
+                            'widgetType': 'block',
+                            'url': path('orocrm_call_widget_calls', {contactId: entity.id}),
+                            'title': 'Calls'|trans,
+                            'alias': 'contact_calls'
+                        })
+                    }}
+                </div>
+            {% endif %}
         </div>
-        {% endif %}
     </div>
 {% endblock content_data %}