diff --git a/public/modules/forms/admin/controllers/admin-form.client.controller.js b/public/modules/forms/admin/controllers/admin-form.client.controller.js index 7326426a..97de0aa1 100644 --- a/public/modules/forms/admin/controllers/admin-form.client.controller.js +++ b/public/modules/forms/admin/controllers/admin-form.client.controller.js @@ -53,7 +53,7 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$windo }, { heading: $filter('translate')('SHARE_TAB'), - route: 'viewForm.share', + route: 'viewForm.share.share_form', active: false }, { diff --git a/public/modules/forms/admin/css/admin-form.css b/public/modules/forms/admin/css/admin-form.css index 96f14e9f..2f417375 100644 --- a/public/modules/forms/admin/css/admin-form.css +++ b/public/modules/forms/admin/css/admin-form.css @@ -143,7 +143,7 @@ visibility: visible !important; border: none; padding:1px; - background: #000; + background: #000; background:rgba(0, 0, 0, 0.5) !important; } @@ -168,11 +168,6 @@ margin-bottom: none; } -/*Styles for admin view tabs */ -.admin-form .tab-content { - padding-top: 3em; -} - /*Styles for add fields tab*/ .admin-form .add-field { background-color: #ddd; @@ -189,10 +184,6 @@ border-radius: 4px; } - .admin-form .oscar-field-select { - margin: 10px 0 10px; - } - .view-form-btn { border: none; } diff --git a/public/modules/forms/admin/css/configure-form.css b/public/modules/forms/admin/css/configure-form.css index 6db8d6af..a9bcd0f2 100644 --- a/public/modules/forms/admin/css/configure-form.css +++ b/public/modules/forms/admin/css/configure-form.css @@ -15,10 +15,6 @@ configure-form-directive .placeholder-tag { width: 100%; } -configure-form-directive .tab-content { - padding-top: 0; -} - configure-form-directive .ui-select input.form-control { height: 34px; padding: 6px; @@ -51,9 +47,6 @@ configure-form-directive .config-form .row.field { configure-form-directive .config-form > .row > .container:nth-of-type(odd){ border-right: 1px #ddd solid; } - configure-form-directive .config-form.design > .row > .container:nth-of-type(odd){ - border-right: none; - } configure-form-directive .config-form .row > .field-input { padding-left:0.1em; diff --git a/public/modules/forms/admin/css/design-form.css b/public/modules/forms/admin/css/design-form.css new file mode 100644 index 00000000..fbbb5871 --- /dev/null +++ b/public/modules/forms/admin/css/design-form.css @@ -0,0 +1,33 @@ +design-form-directive .ui-select input.form-control { + height: 34px; + padding: 6px; +} + +design-form-directive .config-form .btn-secondary { + border-color: #DDDDDD; +} + +design-form-directive .config-form .row.field { + padding-top: 1.5em; +} + + design-form-directive .config-form > .row > .container{ + border-right: 1px #ddd solid; + border-right: none; + } + + +design-form-directive .config-form { + max-width: 100%; +} + +design-form-directive .config-form > .row { + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); +} \ No newline at end of file diff --git a/public/modules/forms/admin/css/share-form.css b/public/modules/forms/admin/css/share-form.css index f3df2b39..9cd6b030 100644 --- a/public/modules/forms/admin/css/share-form.css +++ b/public/modules/forms/admin/css/share-form.css @@ -8,4 +8,19 @@ share-form-directive #copyEmbedded { share-form-directive .tab-content { padding-top: 50px; +} + +share-form-directive .config-form { + max-width: 100%; +} + +share-form-directive .config-form > .row { + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); } \ No newline at end of file diff --git a/public/modules/forms/admin/css/ta-theme.css b/public/modules/forms/admin/css/ta-theme.css deleted file mode 100644 index bb54fa78..00000000 --- a/public/modules/forms/admin/css/ta-theme.css +++ /dev/null @@ -1,31 +0,0 @@ -.placeholder-tag { - background-color: #999; - border-radius: 3px 3px 3px 3px; - border: 0; - color: #FFFFFF; - font-style: inherit; - font-size: 11px; - padding: 4px 5px; - margin: 0 2px 2px 2px; - font-family: inherit; - white-space: nowrap; - vertical-align: middle; - cursor: pointer !important; - display: inline!important; - width: 100%; -} - -.email-subject.ta-root .ta-editor.ta-html, .email-subject .ta-scroll-window.form-control { - min-height: 0; - overflow: hidden; - height: auto; - border-radius: 4px; - box-shadow: none; - font-size: 18px; - padding-top: 10px; -} - -.email-subject.ta-root .ta-scroll-window > .ta-bind { - min-height: 0; - outline: 0; -} \ No newline at end of file diff --git a/public/modules/forms/admin/directives/configure-form.client.directive.js b/public/modules/forms/admin/directives/configure-form.client.directive.js index 7e5d1513..be4266d3 100644 --- a/public/modules/forms/admin/directives/configure-form.client.directive.js +++ b/public/modules/forms/admin/directives/configure-form.client.directive.js @@ -1,7 +1,7 @@ 'use strict'; -angular.module('forms').directive('configureFormDirective', ['$rootScope', '$filter', '$state', '$translate', '$timeout', '$window', - function ($rootScope, $filter, $state, $translate, $timeout, $window) { +angular.module('forms').directive('configureFormDirective', ['$rootScope', '$state', '$translate', '$timeout', '$window', + function ($rootScope, $state, $translate, $timeout, $window) { return { templateUrl: 'modules/forms/admin/views/directiveViews/form/configure-form.client.view.html', restrict: 'E', @@ -28,30 +28,31 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil } }; - $scope.configureTabs = [ - { - heading: $filter('translate')('GENERAL_TAB'), - route: 'viewForm.configure.general', - active: false - }, - { - heading: $filter('translate')('SELF_NOTIFICATIONS_TAB'), - route: 'viewForm.configure.self_notifications', - active: false - }, - { - heading: $filter('translate')('RESPONDENT_NOTIFICATIONS_TAB'), - route: 'viewForm.configure.respondent_notifications', - active: false - } - ]; - $scope.emailFields = $scope.myform.form_fields.filter(function(field){ return field.fieldType === 'email'; }); $scope.formHasEmailField = ($scope.emailFields.length > 0); + /* Tab Routing Logic */ + $scope.configureTabs = [ + { + heading: $translate.instant('GENERAL_TAB'), + route: 'viewForm.configure.general', + active: false + }, + { + heading: $translate.instant('SELF_NOTIFICATIONS_TAB'), + route: 'viewForm.configure.self_notifications', + active: false + }, + { + heading: $translate.instant('RESPONDENT_NOTIFICATIONS_TAB'), + route: 'viewForm.configure.respondent_notifications', + active: false + } + ]; + $scope.go = function(tab){ tab.active = true; $state.go(tab.route); diff --git a/public/modules/forms/admin/directives/share-form.client.directive.js b/public/modules/forms/admin/directives/share-form.client.directive.js index 2ae5657b..0e5bb674 100644 --- a/public/modules/forms/admin/directives/share-form.client.directive.js +++ b/public/modules/forms/admin/directives/share-form.client.directive.js @@ -1,7 +1,7 @@ 'use strict'; -angular.module('forms').directive('shareFormDirective', ['$rootScope', '$translate', - function ($rootScope, $translate) { +angular.module('forms').directive('shareFormDirective', ['$rootScope', '$translate', '$state', + function ($rootScope, $translate, $state) { return { templateUrl: 'modules/forms/admin/views/directiveViews/form/share-form.client.view.html', restrict: 'E', @@ -11,12 +11,41 @@ angular.module('forms').directive('shareFormDirective', ['$rootScope', '$transla controller: function($scope){ $scope.actualFormURL = $scope.actualformurl; - - $scope.fullScreen = ""+ + $scope.fullScreen = ""+ "
"+ $translate.instant('POWERED_BY')+ "TellForm"+ "
"; + + /* Tab Routing Logic */ + $scope.shareTabs = [ + { + heading: $translate.instant('SHARE_YOUR_FORM'), + route: 'viewForm.share.share_form', + active: false + }, + { + heading: $translate.instant('EMBED_YOUR_FORM'), + route: 'viewForm.share.embed_form', + active: false + } + ]; + + $scope.go = function(tab){ + tab.active = true; + $state.go(tab.route); + }; + + function setActiveTab() { + $scope.shareTabs.forEach(function(tab) { + tab.active = ($state.current.name === tab.route); + }); + } + + setActiveTab(); + + $scope.$on("$stateChangeSuccess", setActiveTab()); + } }; } diff --git a/public/modules/forms/admin/views/adminTabs/shareTabs/embed_form.html b/public/modules/forms/admin/views/adminTabs/shareTabs/embed_form.html new file mode 100644 index 00000000..6eac15c6 --- /dev/null +++ b/public/modules/forms/admin/views/adminTabs/shareTabs/embed_form.html @@ -0,0 +1,17 @@ +
+
+ {{ 'COPY_AND_PASTE' | translate }} +
+
+ +
+ {{ fullScreen }} +
+ +
+
+ +
+
\ No newline at end of file diff --git a/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html b/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html new file mode 100644 index 00000000..0922f8cc --- /dev/null +++ b/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html @@ -0,0 +1,13 @@ +
+
+ {{ 'TELLFORM_URL' | translate }} +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/public/modules/forms/admin/views/directiveViews/form/share-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/share-form.client.view.html index 4b71b676..1a143935 100644 --- a/public/modules/forms/admin/views/directiveViews/form/share-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/share-form.client.view.html @@ -1,39 +1,8 @@ -
+
- -
-
- {{ 'TELLFORM_URL' | translate }} -
-
- -
-
- -
-
- - -
-
- {{ 'COPY_AND_PASTE' | translate }} -
-
- -
- {{ fullScreen }} -
- -
-
- -
-
+ +
diff --git a/public/modules/forms/config/forms.client.routes.js b/public/modules/forms/config/forms.client.routes.js index a01d4d91..41cb2eb6 100644 --- a/public/modules/forms/config/forms.client.routes.js +++ b/public/modules/forms/config/forms.client.routes.js @@ -84,13 +84,22 @@ angular.module('forms').config(['$stateProvider', templateUrl: 'modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html' }) + .state('viewForm.share', { + abstract: true, + url: '/share', + templateUrl: 'modules/forms/admin/views/adminTabs/share.html' + }).state('viewForm.share.share_form', { + url: '/share_form', + templateUrl: 'modules/forms/admin/views/adminTabs/shareTabs/share_form.html' + }).state('viewForm.share.embed_form', { + url: '/embed_form', + templateUrl: 'modules/forms/admin/views/adminTabs/shareTabs/embed_form.html' + }) + .state('viewForm.design', { url: '/design', templateUrl: 'modules/forms/admin/views/adminTabs/design.html' - }).state('viewForm.share', { - url: '/share', - templateUrl: 'modules/forms/admin/views/adminTabs/share.html' - }).state('viewForm.analyze', { + }).state('viewForm.analyze', { url: '/analyze', templateUrl: 'modules/forms/admin/views/adminTabs/analyze.html' });