diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/TarjaAssinaturaDao.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/TarjaAssinaturaDao.java
index afe8979..1ec5cde 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/TarjaAssinaturaDao.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/TarjaAssinaturaDao.java
@@ -3,6 +3,17 @@ package br.com.centralit.api.dao;
 import br.com.centralit.framework.dao.arquitetura.CitGenericDAO;
 
 
-public interface TarjaAssinaturaDao extends CitGenericDAO {
-
-}
+/**
+ * <p><img src="http://centralit.com.br/images/logo_central.png"></p>
+ *
+ * <p><b>Company: </b> Central IT - Governan&ccedil;a Corporativa - </p>
+ *
+ * <p><b>Description: </b></p>
+ * Interface DAO para itera&ccedil;&atilde;o com banco de dados para os objetos de {@link TarjaAssinaturaDao}
+ *
+ * @since 14 de abr de 2016 - 10:21:47
+ * @version 1.0.0
+ * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
+ *
+ */
+public interface TarjaAssinaturaDao extends CitGenericDAO {}
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/dao/TarjaAssinaturaDaoHibernate.java b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/TarjaAssinaturaDaoHibernate.java
new file mode 100644
index 0000000..da88891
--- /dev/null
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/dao/TarjaAssinaturaDaoHibernate.java
@@ -0,0 +1,28 @@
+package br.com.centralit.api.dao;
+
+import org.springframework.stereotype.Repository;
+
+import br.com.centralit.api.model.TarjaAssinatura;
+import br.com.centralit.framework.dao.arquitetura.CitGenericDAOImpl;
+
+/**
+ * <p><img src="http://centralit.com.br/images/logo_central.png"></p>
+ *
+ * <p><b>Company: </b> Central IT - Governan&ccedil;a Corporativa - </p>
+ *
+ * <p><b>Description: </b></p>
+ * Interface DAO para itera&ccedil;&atilde;o com banco de dados para os objetos de {@link TarjaAssinaturaDao}
+ *
+ * @since 14 de abr de 2016 - 10:21:47
+ * @version 1.0.0
+ * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
+ *
+ */
+@Repository("tarjaAssinaturaDao")
+public class TarjaAssinaturaDaoHibernate extends CitGenericDAOImpl implements TarjaAssinaturaDao {
+
+	public TarjaAssinaturaDaoHibernate() {
+		super(TarjaAssinatura.class);
+	}
+
+}
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinatura.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinatura.java
index d6af645..1d2267f 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinatura.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinatura.java
@@ -32,7 +32,6 @@ public class TarjaAssinatura extends PersistentObjectAudit{
 	private String descricao;
 
 	@ManyToOne(fetch = FetchType.LAZY)
-	@Column (nullable = false)
 	@JsonView({ ViewsEcm.TarjaAssinaturaEditview.class })
 	private Dominio tipoAssinatura;
 
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinaturaVH.java b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinaturaVH.java
new file mode 100644
index 0000000..1188630
--- /dev/null
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/model/TarjaAssinaturaVH.java
@@ -0,0 +1,42 @@
+package br.com.centralit.api.model;
+
+import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonView;
+
+import br.com.centralit.api.framework.json.ViewsEcm;
+
+public class TarjaAssinaturaVH implements Serializable{
+
+	private static final long serialVersionUID = -82446677470229523L;
+
+	@JsonView({ ViewsEcm.TarjaAssinaturaEditview.class })
+	private TarjaAssinatura assinaturaInterna;
+
+	@JsonView({ ViewsEcm.TarjaAssinaturaEditview.class })
+	private TarjaAssinatura assinaturaCertificado;
+
+
+	public TarjaAssinatura getAssinaturaInterna() {
+
+		return assinaturaInterna;
+	}
+
+
+	public void setAssinaturaInterna(TarjaAssinatura assinaturaInterna) {
+
+		this.assinaturaInterna = assinaturaInterna;
+	}
+
+
+	public TarjaAssinatura getAssinaturaCertificado() {
+
+		return assinaturaCertificado;
+	}
+
+
+	public void setAssinaturaCertificado(TarjaAssinatura assinaturaCertificado) {
+
+		this.assinaturaCertificado = assinaturaCertificado;
+	}
+}
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java
index 1915688..db39193 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/TarjaAssinaturaService.java
@@ -3,15 +3,16 @@ package br.com.centralit.api.service;
 import org.springframework.web.multipart.MultipartFile;
 
 import br.com.centralit.api.model.TarjaAssinatura;
+import br.com.centralit.api.model.TarjaAssinaturaVH;
 import br.com.centralit.framework.service.arquitetura.GenericService;
 
-
 /**
  * <p><img src="http://centralit.com.br/images/logo_central.png"></p>
  *
  * <p><b>Company: </b> Central IT - Governan&ccedil;a Corporativa - </p>
  *
  * <p><b>Description: </b></p>
+ * Classe de servi&ccedil;os para a entidade TarjaAssinatura, a qual mant&eacute;m as regras de neg&oacute;cio.
  *
  * @since 13 de abr de 2016 - 13:40:36
  * @version 1.0.0
@@ -31,4 +32,30 @@ public interface TarjaAssinaturaService extends GenericService<TarjaAssinatura, 
 	 * @param idConfiguracao
 	 */
 	void uploadAnexoImagemTarja(MultipartFile file, Long idOrganizacao, Long idConfiguracao);
+
+	/**
+	 *
+	 * M&eacute;todo respons&aacute;vel por retornar todas as tarjas de assinatura existentes no banco.
+	 * Normalmente existem apenas dois tipos fixos de tarjas:</br>
+	 * <ul>
+	 * <li>Tarja de assinatura interna</li>
+	 * <li>Tarja de assinatura de certificado digital</li>
+	 * </ul>
+	 *
+	 * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
+	 *
+	 * @return
+	 */
+	TarjaAssinaturaVH getAllTarjas ();
+
+	/**
+	 *
+	 * M&eacute;todo respons&aacute;vel por salvar os dois tipos de tarjas de assinatura ao mesmo tempo
+	 *
+	 * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
+	 *
+	 * @param tarjaAssinaturaVH
+	 * @return
+	 */
+	TarjaAssinaturaVH save (TarjaAssinaturaVH tarjaAssinaturaVH);
 }
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
index 8dc4fe7..e271be3 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/InicializarEcmServiceImpl.java
@@ -344,7 +344,7 @@ public class InicializarEcmServiceImpl extends UtilStartup {
 		pgTarjaAssinatura = this.paginaService.saveIfNotExist(pgTarjaAssinatura);
 
 		Menu menuTarjaAssinatura = new Menu("Tarja de Assinatura", pgTarjaAssinatura, menuCadastroBasico, 0, 9, null, null, null, null, modulo);
-		menuTarjaAssinatura.setIncludes(this.gerarArquivosMenu(menuTarjaAssinatura, this.CIT_ECM_WEB_ANGULAR, "Tarja de Assinatura", true, true, true));
+		menuTarjaAssinatura.setIncludes(this.gerarArquivosMenu(menuTarjaAssinatura, this.CIT_ECM_WEB_ANGULAR, "TarjaAssinatura", true, false, true));
 		this.menuService.mergeIfNotExist(menuTarjaAssinatura);
 	}
 
diff --git a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
index 01f36ed..fe76bef 100644
--- a/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
+++ b/cit-ecm-api/src/main/java/br/com/centralit/api/service/impl/TarjaAssinaturaServiceImpl.java
@@ -1,6 +1,8 @@
 package br.com.centralit.api.service.impl;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,12 +13,27 @@ import org.springframework.web.multipart.MultipartFile;
 
 import br.com.centralit.api.dao.TarjaAssinaturaDao;
 import br.com.centralit.api.model.TarjaAssinatura;
+import br.com.centralit.api.model.TarjaAssinaturaVH;
 import br.com.centralit.api.service.OrganizacaoService;
 import br.com.centralit.api.service.TarjaAssinaturaService;
 import br.com.centralit.framework.model.AnexoImagem;
 import br.com.centralit.framework.model.Organizacao;
+import br.com.centralit.framework.model.arquitetura.PersistentObject;
 import br.com.centralit.framework.service.arquitetura.GenericServiceImpl;
 
+/**
+ * <p><img src="http://centralit.com.br/images/logo_central.png"></p>
+ *
+ * <p><b>Company: </b> Central IT - Governan&ccedil;a Corporativa - </p>
+ *
+ * <p><b>Description: </b></p>
+ * Classe de servi&ccedil;os para a entidade TarjaAssinatura, a qual mant&eacute;m as regras de neg&oacute;cio.
+ *
+ * @since 13 de abr de 2016 - 13:40:36
+ * @version 1.0.0
+ * @author ciro.junior (<a href="mailto:ciro.junior@centralit.com.br">ciro.junior@centralit.com.br</a>)
+ *
+ */
 @Service("tarjaAssinaturaService")
 public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatura, Long> implements TarjaAssinaturaService {
 
@@ -34,6 +51,15 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
 		this.validator = validator;
 	}
 
+	public TarjaAssinaturaVH save (TarjaAssinaturaVH tarjaAssinaturaVH){
+		TarjaAssinaturaVH tarjaAssinaturaVHSaved = new TarjaAssinaturaVH();
+		if(tarjaAssinaturaVH.getAssinaturaInterna() != null && tarjaAssinaturaVH.getAssinaturaCertificado() != null){
+			tarjaAssinaturaVHSaved.setAssinaturaInterna(this.merge(tarjaAssinaturaVH.getAssinaturaInterna()));
+			tarjaAssinaturaVHSaved.setAssinaturaCertificado(this.merge(tarjaAssinaturaVH.getAssinaturaCertificado()));
+		}
+		return tarjaAssinaturaVHSaved;
+	}
+
 	@Override
 	public TarjaAssinatura merge(TarjaAssinatura tarjaAssinatura) {
 		this.validarEntidade(tarjaAssinatura, this.validator);
@@ -60,4 +86,26 @@ public class TarjaAssinaturaServiceImpl extends GenericServiceImpl<TarjaAssinatu
 		}
 	}
 
+	/**{@inheritDoc}*/
+	@Override
+	public TarjaAssinaturaVH getAllTarjas () {
+
+		TarjaAssinaturaVH tarjaAssinaturaVH = new TarjaAssinaturaVH();
+		List<PersistentObject> tarjas = tarjaAssinaturaDao.findAll();
+		List<TarjaAssinatura> tarjasAssinatura = new ArrayList<>();
+		for (PersistentObject item : tarjas) {
+			if(item instanceof TarjaAssinatura){
+				tarjasAssinatura.add((TarjaAssinatura) item);
+			}
+		}
+		for (TarjaAssinatura tarjaAssinatura : tarjasAssinatura) {
+			if(tarjaAssinatura.getTipoAssinatura().getCodigo() == 1L){
+				tarjaAssinaturaVH.setAssinaturaInterna(tarjaAssinatura);
+				continue;
+			}
+			tarjaAssinaturaVH.setAssinaturaCertificado(tarjaAssinatura);
+		}
+		return tarjaAssinaturaVH;
+	}
+
 }
diff --git a/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java b/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
index 68813bb..6f4ef16 100644
--- a/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
+++ b/cit-ecm-web/src/main/java/br/com/centralit/controller/TarjaAssinaturaController.java
@@ -3,22 +3,34 @@ package br.com.centralit.controller;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 
+import br.com.centralit.api.framework.json.ViewsEcm;
 import br.com.centralit.api.model.TarjaAssinatura;
+import br.com.centralit.api.model.TarjaAssinaturaVH;
 import br.com.centralit.api.service.TarjaAssinaturaService;
 import br.com.centralit.framework.controller.GenericController;
+import br.com.centralit.framework.json.ResponseBodyWrapper;
+import br.com.centralit.framework.view.ResultResponseVH;
 
+@Controller
 @RequestMapping("/rest/tarjaAssinatura")
 public class TarjaAssinaturaController extends GenericController<TarjaAssinatura> {
 
 	@Autowired
 	private TarjaAssinaturaService tarjaAssinaturaService;
 
+	@Override
+	public Class<ViewsEcm.TarjaAssinaturaEditview> getEditView() {
+		return ViewsEcm.TarjaAssinaturaEditview.class;
+	}
+
 	@ResponseBody
 	@RequestMapping(value = "/uploadFileLogo", method = RequestMethod.POST)
 	public void uploadFileHandle(@RequestParam(value = "filename", required = false) String name,
@@ -28,4 +40,25 @@ public class TarjaAssinaturaController extends GenericController<TarjaAssinatura
 
 		this.tarjaAssinaturaService.uploadAnexoImagemTarja(file, idOrganizacao, Long.parseLong(idTarjaAssinatura));
 	}
+
+	@ResponseBody
+	@RequestMapping(value = "/getAllTarjas", method = RequestMethod.GET, produces = "application/json")
+	public ResponseBodyWrapper getAllTarjas () {
+
+		ResultResponseVH<TarjaAssinaturaVH> resultResponseVH = new ResultResponseVH<TarjaAssinaturaVH>(this.tarjaAssinaturaService.getAllTarjas());
+		ResponseBodyWrapper responseBody = new ResponseBodyWrapper(resultResponseVH, this.getEditView());
+
+		return responseBody;
+
+	}
+
+	@ResponseBody
+	@RequestMapping(value = "save", method = RequestMethod.POST, produces = "application/json")
+	public ResponseBodyWrapper save(@RequestBody TarjaAssinaturaVH tarjaAssinaturaVH) throws Exception {
+
+		ResponseBodyWrapper responseBody = new ResponseBodyWrapper(this.tarjaAssinaturaService.save(tarjaAssinaturaVH), getEditView());
+
+		return responseBody;
+	}
+
 }
diff --git a/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java b/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
index b197b14..f6c9b1a 100644
--- a/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
+++ b/cit-ecm-web/src/main/java/br/com/centralit/listener/StartupListenerEcm.java
@@ -402,8 +402,14 @@ public class StartupListenerEcm extends UtilStartup implements ApplicationListen
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.NOME_NOVO_SUPORTE ", "Nome do suporte", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.NOVO_TIPO_SUPORTE ", "Novo tipo suporte de documento", dominio, modulo));
 		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.TIPO_SUPORTE_DOCUMENTO ", "Tipo suporte de documento", dominio, modulo));
-
-
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.TARJAS_ASSINATURA", "Tarjas de assinatura", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.LOGO_TARJA_ASSINATURA", "Logotipo da tarja de assinatura", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.DADOS_TARJA_ASSINATURA_INTERNA", "Dados da tarja de assinatura interna", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.TIPO_ASSINATURA", "Tipo de assinatura", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.CONTEUDO_HTML", "Conteúdo HTML", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.DADOS_TARJA_ASSINATURA_CERTIFICADO_DIGITAL", "Dados da tarja de assinatura com certificado digital", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.ASSINATURA_CERTIFICADO_DIGITAL", "Assinatura com certificado digital", dominio, modulo));
+		internacionalizacaoList.add(new Internacionalizacao("ECM.LABEL.ASSINATURA_INTERNA", "Assinatura interna", dominio, modulo));
 	}
 
 	/**
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
index 8daa458..6921d53 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/controller/TarjaAssinaturaController.js
@@ -7,46 +7,57 @@ citApp.controller('TarjaAssinaturaController',
                   '$timeout',
                   'TarjaAssinaturaRepository',
                   'DominioRepository',
+                  'FileUploader',
                   function TarjaAssinaturaController($scope,
                                                      $filter,
                                                      $translate,
                                                      $timeout,
                                                      TarjaAssinaturaRepository,
-                                                     DominioRepository) {
+                                                     DominioRepository,
+                                                     FileUploader) {
 
   $scope.resetForm = function() {
     $scope.tarjaAssinatura = {
-    		assinaturaInterna : {},
-    		assinaturaCertificado : {}
+        assinaturaInterna : {},
+        assinaturaCertificado : {}
     };
     $scope.tipoAssinaturaInterna = {};
     $scope.tipoAssinaturaCertificado = {};
 
-    $scope.edit = true;
+    $scope.edit = false;
     $timeout(function(){
-      $scope.tarjaAssinaturaForm.$submitted = false;
-      $scope.tarjaAssinaturaForm.$setPristine();
+      if($scope.tarjaAssinaturaInternaForm && $scope.tarjaAssinaturaCertificadoForm){
+        $scope.tarjaAssinaturaInternaForm.$submitted = false;
+        $scope.tarjaAssinaturaCertificadoForm.$submitted = false;
+        $scope.tarjaAssinaturaInternaForm.$setPristine();
+        $scope.tarjaAssinaturaCertificadoForm.$setPristine();
+      }
     });
   };
+  $scope.resetForm();
 
-  DominioRepository.buscaDominioByCodigoAndChave('tipoAssinatura', 1).then(function(result) {
+  DominioRepository.buscaDominioByCodigoAndChave(1, 'tipoAssinatura').then(function(result) {
     $scope.tipoAssinaturaInterna = result.originalElement;
   });
-  DominioRepository.buscaDominioByCodigoAndChave('tipoAssinatura', 2).then(function(result) {
-	  $scope.tipoAssinaturaCertificado = result.originalElement;
+  DominioRepository.buscaDominioByCodigoAndChave(2, 'tipoAssinatura').then(function(result) {
+    $scope.tipoAssinaturaCertificado = result.originalElement;
   });
 
-  // Atualiza pagina de pesquisa
-  $scope.atualizaPaginaPesquisa = function () {
-    angular.element('#searchTarjaAssinatura').scope().fetchResult();
-  };
+  $scope.getAllTarjas = function(){
+      $scope.setLoadingGet(true);
+      TarjaAssinaturaRepository.getAllTarjas().then(function(result) {
+        $scope.tarjaAssinatura = result.originalElement;
+        $scope.setLoading(false);
+      });
+    };
+    $scope.getAllTarjas();
 
-  $scope.saveOrUpdate = function(){
+  $scope.saveOrUpdate = function(formAssinaturaInterna, formAssinaturaCertificado){
 
-    $scope.tarjaAssinaturaInternaForm.$submitted = true;
-    $scope.tarjaAssinaturaCertificadoForm.$submitted = true;
+    formAssinaturaInterna.$submitted = true;
+    formAssinaturaCertificado.$submitted = true;
 
-    if($scope.tarjaAssinaturaInternaForm.$invalid || $scope.tarjaAssinaturaCertificadoForm.$invalid){
+    if(formAssinaturaInterna.$invalid || formAssinaturaCertificado.$invalid){
         $scope.showAlert('error', $translate.instant('MSG.MN001'), " ", false);
         return;
     }
@@ -56,27 +67,21 @@ citApp.controller('TarjaAssinaturaController',
     TarjaAssinaturaRepository.save($scope.tarjaAssinatura).then(function(result) {
       $scope.tarjaAssinatura = result.originalElement;
       $scope.showAlert("success", $translate.instant('MSG.REGISTRO_SALVO'));
-      form.$submitted = false;
+      formAssinaturaInterna.$submitted = false;
+      formAssinaturaCertificado.$submitted = false;
       $scope.setLoading(false);
+      if(uploaderLogoTarjaAssinaturaInterna.queue.length > 0 || uploaderLogoTarjaAssinaturaCertificado > 0){
+        uploaderLogoTarjaAssinaturaInterna.uploadAll();
+        uploaderLogoTarjaAssinaturaCertificado.uploadAll();
+      }
     });
-	if(uploaderLogoTarja.queue.length > 0){
-		uploaderLogoTarja.uploadAll();
-	}
   };
 
-  $scope.getAllTarjas = function(){
-    $scope.setLoadingGet(true);
-    TarjaAssinaturaRepository.findAllTarjas().then(function(result) {
-    angular.forEach(result, function(item){
-		$scope.contrato.valorTotalItens += item.valorTotalItem;
-	});
-      $scope.tarjaAssinatura = result.originalElement;
-      $scope.edit = edit;
-      $scope.setLoading(false);
-    });
-  };
-
-  $scope.getAllTarjas();
+  $scope.cancelarEdicao = function () {
+    $scope.resetForm();
+    $scope.getAllTarjas();
+    $scope.edit= false
+  }
 
 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
   var uploaderLogoTarjaAssinaturaInterna = $scope.uploaderLogoTarjaAssinaturaInterna = new FileUploader({
@@ -135,57 +140,57 @@ citApp.controller('TarjaAssinaturaController',
 
 //INSTANCIA DO OBJETO PARA FAZER UPLOAD
   var uploaderLogoTarjaAssinaturaCertificado = $scope.uploaderLogoTarjaAssinaturaCertificado = new FileUploader({
-	  autoUpload: false,
-	  queueLimit: 1,
-	  url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id +
-	  '&idTarjaAssinatura=' + $scope.tarjaAssinatura.assinaturaCertificado.id
+    autoUpload: false,
+    queueLimit: 1,
+    url : '/cit-ecm-web/rest/tarjaAssinatura/uploadFileLogo?idOrganizacao=' + $scope.usuarioLogado.organizacao.id +
+    '&idTarjaAssinatura=' + $scope.tarjaAssinatura.assinaturaCertificado.id
   });
 
   // FILTERS
   uploaderLogoTarjaAssinaturaCertificado.filters.push({
-	  name: 'imageFilter',
-	  fn: function(item , options) {
-		  var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
-		  return '|jpg|png|jpeg|bmp|gif|'.indexOf(type) !== -1;
-	  }
+    name: 'imageFilter',
+    fn: function(item , options) {
+      var type = '|' + item.type.slice(item.type.lastIndexOf('/') + 1) + '|';
+      return '|jpg|png|jpeg|bmp|gif|'.indexOf(type) !== -1;
+    }
   });
 
   // CALLBACKS
   uploaderLogoTarjaAssinaturaCertificado.onWhenAddingFileFailed = function(item , filter, options) {
-	  uploaderLogoTarjaAssinaturaCertificado.clearQueue();
-	  console.info('onWhenAddingFileFailed', item, filter, options);
+    uploaderLogoTarjaAssinaturaCertificado.clearQueue();
+    console.info('onWhenAddingFileFailed', item, filter, options);
   };
   uploaderLogoTarjaAssinaturaCertificado.onAfterAddingFile = function(fileItem) {
-	  console.info('onAfterAddingFile', fileItem);
+    console.info('onAfterAddingFile', fileItem);
   };
   uploaderLogoTarjaAssinaturaCertificado.onAfterAddingAll = function(addedFileItems) {
-	  console.info('onAfterAddingAll', addedFileItems);
+    console.info('onAfterAddingAll', addedFileItems);
   };
   uploaderLogoTarjaAssinaturaCertificado.onBeforeUploadItem = function(item) {
-	  console.info('onBeforeUploadItem', item);
+    console.info('onBeforeUploadItem', item);
   };
   uploaderLogoTarjaAssinaturaCertificado.onProgressItem = function(fileItem, progress) {
-	  console.info('onProgressItem', fileItem, progress);
+    console.info('onProgressItem', fileItem, progress);
   };
   uploaderLogoTarjaAssinaturaCertificado.onProgressAll = function(progress) {
-	  console.info('onProgressAll', progress);
+    console.info('onProgressAll', progress);
   };
   uploaderLogoTarjaAssinaturaCertificado.onSuccessItem = function(fileItem, response, status, headers) {
-	  console.info('onSuccessItem', fileItem, response, status, headers);
+    console.info('onSuccessItem', fileItem, response, status, headers);
   };
   uploaderLogoTarjaAssinaturaCertificado.onErrorItem = function(fileItem, response, status, headers) {
-	  console.info('onErrorItem', fileItem, response, status, headers);
+    console.info('onErrorItem', fileItem, response, status, headers);
   };
   uploaderLogoTarjaAssinaturaCertificado.onCancelItem = function(fileItem, response, status, headers) {
-	  console.info('onCancelItem', fileItem, response, status, headers);
+    console.info('onCancelItem', fileItem, response, status, headers);
   };
   uploaderLogoTarjaAssinaturaCertificado.onCompleteItem = function(fileItem, response, status, headers) {
-	  console.info('onCompleteItem', fileItem, response, status, headers);
+    console.info('onCompleteItem', fileItem, response, status, headers);
   };
   uploaderLogoTarjaAssinaturaCertificado.onCompleteAll = function() {
-	  uploaderLogoTarjaAssinaturaCertificado.clearQueue();
-	  $scope.getTarjaAssinatura($scope.tarjaAssinatura);
-	  console.info('onCompleteAll');
+    uploaderLogoTarjaAssinaturaCertificado.clearQueue();
+    $scope.getTarjaAssinatura($scope.tarjaAssinatura);
+    console.info('onCompleteAll');
   };
 
 }]);
diff --git a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
index 83e033d..00622d7 100644
--- a/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
+++ b/cit-ecm-web/src/main/webapp/assets/js/angular/custom/repository/TarjaAssinaturaRepository.js
@@ -5,8 +5,8 @@ citApp.factory('TarjaAssinaturaRepository', ['RestangularEcm', 'AbstractReposito
     function TarjaAssinaturaRepository() {
     	AbstractRepository.call(this, restangularEcm, 'rest/tarjaAssinatura');
 
-		this.findAllTarjas = function() {
-			return restangular.one(this.route).getList("findAllTarjas").then();
+		this.getAllTarjas = function() {
+			return restangularEcm.one(this.route + "/getAllTarjas" ).get();
 		};
     }
 
diff --git a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html
index 732fcaf..cc50e76 100644
--- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html
+++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinatura.html
@@ -1,2 +1,2 @@
+<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaEdit.html'"></div>
 <!-- <div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaList.html'" ng-show="workspace.$showSearch"></div> -->
-<div ng-include src="'/cit-ecm-web/html/tarjaAssinatura/tarjaAssinaturaEdit.html'" ng-show="workspace.$showEdit"></div>
diff --git a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
index 9b2f44b..c124241 100644
--- a/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
+++ b/cit-ecm-web/src/main/webapp/html/tarjaAssinatura/tarjaAssinaturaEdit.html
@@ -1,9 +1,8 @@
-<div id="editTarjaAssinatura" class="page-content clearfix"
-	ng-controller="TarjaAssinaturaController">
+<div id="editTarjaAssinatura" class="page-content clearfix" ng-controller="TarjaAssinaturaController">
 	<div class="bar-buttons-action fixed">
 		<div class="row">
 			<div class="col-sm-8 text-left">
-				<button class="btn btn-clear" ng-click="saveOrUpdate(tarjaAssinaturaForm)" ng-show="edit">
+				<button class="btn btn-clear" ng-click="saveOrUpdate(tarjaAssinaturaInternaForm, tarjaAssinaturaCertificadoForm)" ng-show="edit">
 					<i class="fa fa-save green"></i>
 					<translate>LABEL.SALVAR</translate>
 				</button>
@@ -15,9 +14,9 @@
 					<i class="fa fa-pencil blue"></i>
 					<translate>LABEL.EDITAR</translate>
 				</button>
-				<button class="btn btn-clear" ng-click="$showPageSearchWorkspace(workspace); atualizaPaginaPesquisa();">
-					<i class="fa fa-search"></i>
-					<translate>LABEL.PESQUISAR</translate>
+				<button class="btn btn-clear" ng-show="edit" ng-click="cancelarEdicao()">
+					<i class="fa fa-times"></i>
+					<translate>LABEL.CANCELAR</translate>
 				</button>
 			</div>
 			<!-- .col -->
@@ -29,65 +28,129 @@
 		</div><!-- .row -->
 	</div><!-- .bar-buttons-action -->
 
-	<h1 class="title"><translate>ECM.LABEL.TARJAS_ASSINATURA</translate></h1>
-	</br>
+<!-- 	<h1 class="title"><translate>ECM.LABEL.TARJAS_ASSINATURA</translate></h1> -->
+<!-- 	</br> -->
 	<breadcrumb ng-workspace="workspace"></breadcrumb>
 
-	<form name="tarjaAssinaturaForm">
-		<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
-		<fieldset>
-			<legend>
-				<translate>ECM.LABEL.DADOS_TARJA_ASSINATURA</translate>
-			</legend>
-		</fieldset>
-		<div class="row">
-			<div class="col-md-6">
-				<label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
-					ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaForm" ng-obrigatorio="true"
-					ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
-			</div>
-			<div class="col-md-4">
-				<label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="LABEL.TIPO_ASSINATURA" ng-type="text"
-							ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura" form="tarjaAssinaturaForm"
-							ng-obrigatorio="false" ng-type="text" />
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-md-12">
-				<div class="form-group">
-					<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted}">
-						<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
-						<i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaForm.$submitted" class='fa fa-warning red'
-							tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
-							tooltip-placement='top'></i>
-					</label>
-					<div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"
-						ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>
-					<iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe>
+	<tabset class="tabbable margin-top margin-bottom">
+		<tab>
+			<tab-heading><translate>ECM.LABEL.ASSINATURA_INTERNA</translate></tab-heading>
+
+			<form name="tarjaAssinaturaInternaForm">
+				<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
+				<fieldset>
+					<legend>
+						<translate>ECM.LABEL.DADOS_TARJA_ASSINATURA_INTERNA</translate>
+					</legend>
+				</fieldset>
+				<div class="row">
+					<div class="col-md-6">
+						<label-input ng-id="tarjaAssinatura.assinaturaInterna.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
+							ng-model="tarjaAssinatura.assinaturaInterna.descricao" form="tarjaAssinaturaInternaForm" ng-obrigatorio="true"
+							ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
+					</div>
+					<div class="col-md-4">
+						<label-input ng-id="tarjaAssinatura.assinaturaInterna.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
+									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaInterna.tipoAssinatura.descricao" form="tarjaAssinaturaInternaForm"
+									ng-obrigatorio="false" ng-type="text" />
+					</div>
 				</div>
-			</div>
-		</div>
-		<div class="row">
-			<div class="col-sm-12">
-				<div class="form-group">
-					<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
-					<div nv-file-drop="" uploader="uploaderLogoTarja" onclick="$('#uploadLogoTarjaAssinatura').click();">
-						<div nv-file-over="" uploader="uploaderLogoTarja" over-class="another-file-over-class" class="well my-drop-zone">
-							<span ng-show="uploaderLogoTarja.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
-							<span ng-show="uploaderLogoTarja.queue.length > 0">{{uploaderLogoTarja.queue[0].file.name}}</span>
+				<div class="row">
+					<div class="col-sm-12">
+						<div class="form-group">
+							<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
+							<div nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaInterna" onclick="$('#uploadLogoTarjaAssinaturaInterna').click();">
+								<div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaInterna" over-class="another-file-over-class" class="well my-drop-zone">
+									<span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
+									<span ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0">{{uploaderLogoTarjaAssinaturaInterna.queue[0].file.name}}</span>
+								</div>
+							</div>
+							<input id="uploadLogoTarjaAssinaturaInterna" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaInterna" ng-show="false" />
+							<div ng-show="uploaderLogoTarjaAssinaturaInterna.queue.length > 0 && tarjaAssinatura.assinaturaInterna.anexoImagem.anexo == undefined">
+								<div ng-thumb="{ file: uploaderLogoTarjaAssinaturaInterna.queue._file, width: auto, height: auto }"></div>
+							</div>
+						</div><!-- .form-group -->
+						<div ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">
+							<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaInterna.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
 						</div>
 					</div>
-					<input id="uploadLogoTarjaAssinatura" type="file" nv-file-select="" uploader="uploaderLogoTarja" ng-show="false" />
-					<div ng-show="uploaderLogoTarja.queue.length > 0 && tarjaAssinatura.anexoImagem.anexo == undefined">
-						<div ng-thumb="{ file: uploaderLogoTarja.queue._file, width: auto, height: auto }"></div>
+				</div>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="form-group">
+							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaInternaForm.$submitted}">
+								<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
+								<i ng-show="!tarjaAssinatura.assinaturaInterna.conteudo && tarjaAssinaturaInternaForm.$submitted" class='fa fa-warning red'
+									tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
+									tooltip-placement='top'></i>
+							</label>
+							<div id="tarjaAssinatura.assinaturaInterna.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"
+								ng-model="tarjaAssinatura.assinaturaInterna.conteudo" ></div>
+							<iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe>
+						</div>
 					</div>
-				</div><!-- .form-group -->
-				<div>
-					<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
 				</div>
+			</form>
+		</tab>
+		<tab>
+			<tab-heading><translate>ECM.LABEL.ASSINATURA_CERTIFICADO_DIGITAL</translate></tab-heading>
 
-			</div>
-		</div>
-	</form>
+			<form name="tarjaAssinaturaCertificadoForm">
+				<p><small>( <span class="red">*</span> ) <translate>LABEL.CAMPOS_OBRIGATORIOS</translate></small></p>
+				<fieldset>
+					<legend>
+						<translate>ECM.LABEL.DADOS_TARJA_ASSINATURA_CERTIFICADO_DIGITAL</translate>
+					</legend>
+				</fieldset>
+				<div class="row">
+					<div class="col-md-6">
+						<label-input ng-id="tarjaAssinatura.assinaturaCertificado.descricao" ng-label="LABEL.DESCRICAO" ng-type="text"
+							ng-model="tarjaAssinatura.assinaturaCertificado.descricao" form="tarjaAssinaturaCertificadoForm" ng-obrigatorio="true"
+							ng-custom-maxlength="100" ng-type="text" ng-disabled="!edit" />
+					</div>
+					<div class="col-md-4">
+						<label-input ng-id="tarjaAssinatura.assinaturaCertificado.tipoAssinatura" ng-label="ECM.LABEL.TIPO_ASSINATURA" ng-type="text"
+									ng-disabled="true" ng-model="tarjaAssinatura.assinaturaCertificado.tipoAssinatura.descricao" form="tarjaAssinaturaCertificadoForm"
+									ng-obrigatorio="false" ng-type="text" />
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-12">
+						<div class="form-group">
+							<label class="control-label"><translate>ECM.LABEL.LOGO_TARJA_ASSINATURA</translate></label>
+							<div nv-file-drop="" uploader="uploaderLogoTarjaAssinaturaCertificado" onclick="$('#uploadLogoTarjaAssinaturaCertificado').click();">
+								<div nv-file-over="" uploader="uploaderLogoTarjaAssinaturaCertificado" over-class="another-file-over-class" class="well my-drop-zone">
+									<span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length <= 0"><translate>MSG.ARRASTE_SOLTE_ARQUIVO</translate></span>
+									<span ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0">{{uploaderLogoTarjaAssinaturaCertificado.queue[0].file.name}}</span>
+								</div>
+							</div>
+							<input id="uploadLogoTarjaAssinaturaCertificado" type="file" nv-file-select="" uploader="uploaderLogoTarjaAssinaturaCertificado" ng-show="false" />
+							<div ng-show="uploaderLogoTarjaAssinaturaCertificado.queue.length > 0 && tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo == undefined">
+								<div ng-thumb="{ file: uploaderLogoTarjaAssinaturaCertificado.queue._file, width: auto, height: auto }"></div>
+							</div>
+						</div><!-- .form-group -->
+						<div ng-show="tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo">
+							<img ng-src="data:image/JPEG;base64,{{tarjaAssinatura.assinaturaCertificado.anexoImagem.anexo}}" class="img-thumbnail" style="max-width: 300px; height: auto;">
+						</div>
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-md-12">
+						<div class="form-group">
+							<label class="control-label block" ng-class="{'has-error': !tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaCertificadoForm.$submitted}">
+								<translate>ECM.LABEL.CONTEUDO_HTML</translate> <span class="red">*</span>
+								<i ng-show="!tarjaAssinatura.assinaturaCertificado.conteudo && tarjaAssinaturaCertificadoForm.$submitted" class='fa fa-warning red'
+									tooltip="{{$translate.instant('ECM.LABEL.CONTEUDO_HTML') + ' ' +$translate.instant('LABEL.CAMPO_OBRIGATORIO')}}"
+									tooltip-placement='top'></i>
+							</label>
+							<div id="tarjaAssinatura.assinaturaCertificado.conteudo" ckeditor="options" ng-if='edit' ready="onReady()"
+								ng-model="tarjaAssinatura.assinaturaCertificado.conteudo" ></div>
+							<iframe id="visualizacaoConteudoTarjaAssinatura" allowfullscreen class="iframe-report" ng-show="!edit"></iframe>
+						</div>
+					</div>
+				</div>
+			</form>
+		</tab>
+	</tabset>
 </div>
 <!-- .page-content -->
--
libgit2 0.21.2