Merge pull request #157 from ZBoxApp/issues_resolved_manager

fix dns add row, delete alert, style for sweetalert, etc

.scss-lint.yml

@@ -163,7 +163,7 @@ linters:
     max_depth: 5
 
   SelectorFormat:
-    enabled: true
+    enabled: false
     convention: hyphenated_lowercase # or 'strict_BEM', or 'hyphenated_BEM', or 'snake_case', or 'camel_case', or a regex pattern
 
   Shorthand:

package.json

@@ -27,6 +27,7 @@
     "react-router": "2.3.0",
     "react-textarea-autosize": "4.0.0",
     "react-toastr": "^2.6.0",
+    "sweetalert": "^1.1.3",
     "toastr": "^2.1.2",
     "zimbra-admin-api-js": "ZBoxApp/zimbra-admin-api-js#manager"
   },

path.json

-module.exports = {"main":{"js":"/354185bundle.js"}}
\ No newline at end of file
+module.exports = {"main":{"js":"/749216bundle.js"}}
\ No newline at end of file

src/components/companies/company_details.jsx

 // Copyright (c) 2016 ZBox, Spa. All Rights Reserved.
 // See LICENSE.txt for license information.
+//import CompanyAdmins from './company_admins.jsx';
 
 import $ from 'jquery';
 import React from 'react';
@@ -8,7 +9,6 @@ import Promise from 'bluebird';
 import CompanyInfo from './company_info.jsx';
 import CompanyMailboxPlans from './company_mailbox_plans.jsx';
 import CompanyDomains from './company_domains.jsx';
-import CompanyAdmins from './company_admins.jsx';
 import CompanyInvoices from './company_invoices.jsx';
 
 import MessageBar from '../message_bar.jsx';
@@ -136,12 +136,16 @@ export default class CompaniesDetails extends React.Component {
             );
         }
 
+        /*
+         'Administradores de dominio',
+         administradores_de_dominio: tabAdmins,
          const tabAdmins = (
          <CompanyAdmins
          company={company}
          location={this.props.location}
          />
          );
+         */
 
         const tabDomains = (
             <CompanyDomains
@@ -152,9 +156,8 @@ export default class CompaniesDetails extends React.Component {
 
         const panelTabs = (
             <PanelTab
-                tabNames={['Administradores de dominio', 'Dominios']}
+                tabNames={['Dominios']}
                 tabs={{
-                    administradores_de_dominio: tabAdmins,
                     dominios: tabDomains
                 }}
                 location={this.props.location}
@@ -170,6 +173,14 @@ export default class CompaniesDetails extends React.Component {
                 {message}
                 <div className='content animate-panel'>
                     <div className='row'>
+                        <div className='layout-back clearfix'>
+                            <div className='back-left backstage'>
+                                <div className='backbg'></div>
+                            </div>
+                            <div className='back-right backstage'>
+                                <div className='backbg'></div>
+                            </div>
+
                             <div className='col-md-6 central-content'>
                                 <CompanyInfo company={company}/>
                             </div>
@@ -177,6 +188,7 @@ export default class CompaniesDetails extends React.Component {
                                 <CompanyMailboxPlans company={company}/>
                             </div>
                         </div>
+                    </div>
                     <div className='row'>
                         <div className='col-md-12 central-content'>
                             {panelTabs}

src/components/domain/domain_details.jsx

@@ -23,6 +23,8 @@ import DomainStore from '../../stores/domain_store.jsx';
 import * as Client from '../../utils/client.jsx';
 import * as GlobalActions from '../../action_creators/global_actions.jsx';
 
+//import Constants from '../../utils/constants.jsx';
+
 export default class DomainDetails extends React.Component {
     constructor(props) {
         super(props);
@@ -170,6 +172,7 @@ export default class DomainDetails extends React.Component {
             const zonaDNS = (
                 <ZonaDNS
                     domain={domain}
+                    location={this.props.location}
                 />
             );
 
@@ -193,8 +196,9 @@ export default class DomainDetails extends React.Component {
                         titlePage='Dominios'
                         descriptionPage='Dominios de correos creados'
                     />
-                    {message}
+
                     <div className='content animate-panel'>
+                        {message}
                         <div className='row'>
                             <div className='layout-back clearfix'>
                                 <div className='back-left backstage'>

src/components/domain/domains.jsx

@@ -115,7 +115,9 @@ export default class Domains extends React.Component {
         });
     }
     componentWillReceiveProps(newProps) {
-        if (this.props.location.query.page !== newProps.location.query.page) {
+        const condition = this.props.location.query.page !== newProps.location.query.page;
+
+        if (condition) {
             const page = parseInt(newProps.location.query.page, 10) || 1;
 
             GlobalActions.emitStartLoading();
@@ -127,6 +129,8 @@ export default class Domains extends React.Component {
             };
 
             this.getDomains();
+        } else {
+            GlobalActions.emitEndLoading();
         }
     }
     componentDidMount() {

src/sass/components/_module.scss

@@ -14,6 +14,7 @@
 @import 'panels';
 @import 'progress_bar';
 @import 'progress_task';
+@import 'sweetalert';
 @import 'tabs';
 @import 'tooltip';
 @import 'tour';

src/sass/utils/_variables.scss

@@ -97,3 +97,27 @@ $bg-import-error: #ffe8e8;
 // color ProgressBar
 
 $bg-progresss-bar: #5bc0de;
+
+// alert sweetalert
+
+$h2-color: #575757;
+$p-color: #797979;
+$bg-error-container: #f1f1f1;
+$bg-icon: rgb(234, 125, 125);
+$bg-after: #f06e57;
+$focus-shadow: rgb(196, 230, 245);
+$focus-border: rgb(180, 219, 237);
+$placeholder-color: rgba(#575757, 40);
+$btn-blue: #8cd4f5;
+$btn-gray: #c1c1c1;
+$input-border-color: rgb(215, 215, 215);
+$btn-focus-one: rgba(128, 179, 235, .5);
+$btn-focus-two: rgba(0, 0, 0, .05);
+$focus-cancel-color: rgba(197, 205, 211, .8);
+$focus-cancel-color2: rgba(0, 0, 0, .0470588);
+$sweet-red:     #f27474;
+$sweet-orange:  #f8bb86;
+$sweet-blue:    #c9dae1;
+$sweet-green:   #a5dc86;
+$keyframe-bg-color: #f8d486;
+$keyframe-bg-color2: #f8bb86;