mutx 0.1.69 → 0.2.0

data/lib/mutx/view/{tasks/admin → admin/tasks}/delete.mote

@@ -1,5 +1,3 @@
-% form_template = Mote.parse(File.read("#{Mutx::View.path}/tasks/admin/delete_form.mote"), self, [:args])
-
 <div class="panel panel-info">
   <!-- Default panel contents -->
   <div class="panel-heading"><h2>Delete Task</h2></div>
@@ -9,7 +7,7 @@
 
   <div class="panel-success">
     <div class="panel-body">
-      {{form_template.call(args:args)}}
+      {{ partial('admin/tasks/_delete_form', task: task)}}
     </div>
   </div>
 </div>

data/lib/mutx/view/{tasks/admin → admin/tasks}/edit.mote

@@ -1,13 +1,10 @@
-% form_template = Mote.parse(File.read("#{Mutx::View.path}/tasks/admin/create_edit_form.mote"), self, [:args])
-% args["action"]="edit"
 <div class="panel panel-info">
   <!-- Default panel contents -->
   <div class="panel-heading"><h2>Edit Task</h2></div>
 
   <div class="panel-warning">
     <div class="panel-body">
-
-      {{form_template.call(args:args)}}
+      {{ partial('admin/tasks/_form', action: 'edit', task: task) }}
 
     </div>
   </div>

data/lib/mutx/view/{tasks/admin/list.mote → admin/tasks/index.mote}

@@ -1,6 +1,4 @@
 <?
-  tasks_list = Mutx::API::Tasks.list["tasks"]
-
   if (available_custom_params = Mutx::Tasks::Custom::Params.list)
     custom_params_hash = available_custom_params.inject({}) do |res,custom|
       res[custom["_id"]]=custom
@@ -9,9 +7,6 @@
   else
     custom_params_hash = {}
   end
-
-
-
 ?>
 
 <script>
@@ -63,7 +58,7 @@
   <!-- Default panel contents -->
   <div class="panel-heading"><h2>Tasks Edition Panel</h2></div>
   <div class="panel-body">
-    <p><a class="btn btn-success" href="/admin/tasks/new">New Task</a></p>
+    <p><a class="btn btn-success" href="{{ path_for(:admin_tasks_new) }}">New Task</a></p>
   </div>
     <div class="panel-success">
       <div class="panel-body">
@@ -84,7 +79,7 @@
       </tr>
     </thead>
     <tbody>
-      % tasks_list.each do |task|
+      % tasks.each do |task|
       <? #transforms some strings
 
         info = if task["information"]
@@ -111,9 +106,9 @@
           <div class="input-group">
             <button type="button" class="btn btn-danger dropdown-toggle" data-toggle="dropdown" aria-expanded="false">Options <span class="caret"></span></button>
             <ul class="dropdown-menu" role="menu">
-              <li><a href="/admin/tasks/{{task["_id"]}}/view">View</a></li>
-              <li><a href="/admin/tasks/{{task["_id"]}}/edit">Edit</a></li>
-              <li><a href="/admin/tasks/{{task["_id"]}}/delete">Delete</a></li>
+              <li><a href="{{ path_for(:admin_tasks_show, task_id: task['_id']) }}">View</a></li>
+              <li><a href="{{ path_for(:admin_tasks_edit, task_id: task['_id']) }}">Edit</a></li>
+              <li><a href="{{ path_for(:admin_tasks_delete, task_id: task['_id']) }}">Delete</a></li>
             </ul>
           </div>
         </td>

data/lib/mutx/view/{tasks/admin → admin/tasks}/new.mote

@@ -1,5 +1,3 @@
-% form_template = Mote.parse(File.read("#{Mutx::View.path}/tasks/admin/create_edit_form.mote"), self, [:args])
-% args["action"]="add"
 <div class="panel panel-info">
   <!-- Default panel contents -->
   <div class="panel-heading"><h2>New Task</h2></div>
@@ -12,9 +10,7 @@
 
   <div class="panel-success">
     <div class="panel-body">
-
-      {{form_template.call(args:args)}}
-
+    {{ partial('admin/tasks/_form', action: 'new', task: nil) }}
     </div>
   </div>
 </div>

data/lib/mutx/view/{tasks/admin/view.mote → admin/tasks/show.mote}

@@ -1,5 +1,3 @@
-% form_template = Mote.parse(File.read("#{Mutx::View.path}/tasks/admin/create_edit_form.mote"), self, [:args])
-% args["action"]="view"
 <div class="panel panel-info">
   <!-- Default panel contents -->
   <div class="panel-heading">
@@ -7,7 +5,7 @@
   </div>  
   <div class="panel-warning">
     <div class="panel-body">
-      {{form_template.call(args:args)}}
+      {{ partial('admin/tasks/_form', action: 'view', task: task) }}
     </div>
   </div>
 </div>

data/lib/mutx/view/body.mote

@@ -1,77 +1,39 @@
 <?
-  # encoding: utf-8  
-  query_string = args[:query_string]
-
-  msg = if query_string.msg
-          message_file_path = File.read("#{Mutx::View.path}/message.mote")
-          Mote.parse(message_file_path, self, [:query_string]).call(query_string: query_string)
-        end
-
-  clean = query_string.clean || false
-
-  message = section =~ /message/i ? " onload=\"javascript:startTimer();\"" : nil
-
-  title = h1 = section.split.map{|w| w.capitalize}.join " "
-
-  javascript = Mote.parse(File.read("#{Mutx::View.path}/javascript.mote"), self, []).call()
-
-  styles = Mote.parse(File.read("#{Mutx::View.path}/styles.mote"), self, []).call()
-
-  modals = Mote.parse(File.read("#{Mutx::View.path}/modals.mote"), self, []).call()
-
-
-  args[:section] = section
-
-  git_information = Mote.parse(File.read("#{Mutx::View.path}/git_information.mote"), self, [:section]).call(section:section)
-
-  footer = Mote.parse(File.read("#{Mutx::View.path}/footer.mote"), self, []).call()
-
-  template_file_path = File.read("#{Mutx::View.path}/#{Mutx::View::Sections.path_for(section)}.mote")
-
-  content = Mote.parse(template_file_path, self, [:args]).call(args:args)
-
+  # encoding: utf-8    
   puts "Section: #{section}".colorize(:green).on_red
   puts "Viewing #{Mutx::View.path}/#{Mutx::View::Sections.path_for(section)}.mote".colorize(:green).on_red
-  section = section.gsub(" ","_").downcase
-
-  navigation_bar = Mote.parse(File.read("#{Mutx::View.path}/navigation_bar.mote"), self, [:section]).call(section:section)
 ?>
-<!DOCtype html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns ="http://www.w3.org/1999/xhtml"><head><link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"/><meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>'
+<!DOCtype html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html xmlns ="http://www.w3.org/1999/xhtml">
   <head>
-    <title>{{Mutx::Support::Configuration.project_name}} through Mutx - {{title}}</title>
+    <title>{{Mutx::Support::Configuration.project_name}} through Mutx - {{ section.split.map(&:capitalize).join(' ') }}</title>
 
     <meta content='text/html;charset=utf-8' http-equiv='Content-Type'/>
     <meta name='viewport' content='width=device-width, initial-scale=1.0'>
-    <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico"/>
-    <link href='https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css' rel='stylesheet'>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link rel="shortcut icon" type="image/x-icon" href="/img/favicon.ico"/>
+    
 
-    {{javascript}}
-
-
-
-    {{styles}}
+    {{ partial('layout/javascript') }}
+    {{ partial('layout/styles') }}
 
   </head>
 
-    <body class='padding-top: 50px;' {{message}}>
-      {{modals}}
-
-      {{navigation_bar}}
+    <body {{ section =~ /message/i ? ' onload="javascript:startTimer();"' : nil }}>
+      {{ partial('layout/modals') }}
 
-      {{msg}}
+      {{ partial('layout/navigation_bar', section: section.gsub(' ', '_').downcase) }}
 
       <div class='container'>
       <br>
-      {{git_information}}
+      {{ partial('git_information', section: section) }}
       </div>
       <div class='container'>
         
         <p>{{content}}</p>
 
-        {{footer}}
+        {{ partial('layout/footer') }}
 
       </div>
     </div>
+    {{ partial('layout/flash') }}
   </body>
 </html>

data/lib/mutx/view/{custom/params.mote → custom-params/_custom_params.mote}

@@ -4,13 +4,12 @@
   custom_params_objects = all_custom_params.select{|custom| custom_params.include? custom["_id"]}
   # puts custom_params_objects
 ?>
-<h4 title='This parameters will be passed to the test task execution'>&nbsp;&nbsp;&nbsp;Custom Parameters</h4>
+<h5 title='This parameters will be passed to the test task execution'>&nbsp;&nbsp;&nbsp;Custom Parameters</h5>
 <div class='container' style='width: inherit'>
   <li class='list-group-item' style='position:relative; with=100%'>
     <br>
     % custom_params_objects.each do |custom_param|
-    % custom = Mote.parse(File.read("#{Mutx::View.path}/custom/params/#{custom_param["type"]}.mote"), self, [:param, :no_label, :task_form])
-      {{custom.call(param:custom_param, no_label:false, task_form:false)}}
+      {{ partial("custom-params/types/#{custom_param['type']}", param: custom_param, no_label: false, task_form: false) }}
     % end
   </li>
-</div>
+</div>

data/lib/mutx/view/error_handler.mote

@@ -1,54 +1,4 @@
-<?
-javascript = Mote.parse(File.read("#{Mutx::View.path}/javascript.mote"), self, []).call()
-
-styles = Mote.parse(File.read("#{Mutx::View.path}/styles.mote"), self, []).call()
-
-navigation_bar = Mote.parse(File.read("#{Mutx::View.path}/navigation_bar.mote"), self, [:section]).call(section:"help")
-
-error_title = error_msg = ""
-
-exception = args[:exception]
-query_string = args[:query_string]
-
-
-
-if exception
-  error_title , error_msg = Mutx::Support::ErrorHandlerHelper.evaluate exception
-else
-  error_title = " An error ocurred"
-  error_msg = query_string.msg
-end
-
-?>
-
-<!DOCtype html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns ="http://www.w3.org/1999/xhtml">
-
-  <head>
-    <title>{{Mutx::Support::Configuration.project_name}} through Mutx - Error</title>
-
-    <meta content='text/html;charset=utf-8' http-equiv='Content-Type'/>
-    <meta name='viewport' content='width=device-width, initial-scale=1.0'>
-    <link rel='shortcut icon' href='/favicon'>
-    <link href='https://netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css' rel='stylesheet'>
-
-    {{javascript}}
-
-    {{styles}}
-
-  </head>
-  <body class='padding-top: 50px;'>
-
-    {{navigation_bar}}
-
-    <div class='container'>
-      <br>
-        <div class='container'>
-          <div class='alert alert-danger' role='alert'>
-            <h1>{{error_title}}</h1>
-            <p>{{error_msg}}</p>
-          </div>
-        </div>
-    </div>
-  </body>
-</html>
+<div class='alert alert-danger' role='alert'>
+  <h1>{{error_title}}</h1>
+  <p>{{error_msg}}</p>
+</div>

data/lib/mutx/view/features/index.mote

@@ -0,0 +1,9 @@
+<table class='table table-hover'>
+  % features.each do |feature|
+    <tr>
+      <td>
+        <a aria-hidden='true' href='{{ path_for(:features_file, query_string: { path: feature.gsub("/"," ") }) }}'>{{ feature }}</a>
+      </td>
+    </tr>
+  % end
+</table>

data/lib/mutx/view/git_information.mote

@@ -1,17 +1,11 @@
-<?
-# encoding: utf-8
-	branch = Mutx::Support::Git.branch
-	log_last_commit = Mutx::Support::Git.log_last_commit
-	last_commit_id = Mutx::Support::Git.get_last_commit_id
-?>
 <div class='well'>
 % if Mutx::Support::Configuration.use_git?
     <h4>
-      Working on branch <strong>{{branch}}</strong>
+      Working on branch <strong>{{ branch }}</strong>
     </h4>
 
       <small>
-        <span title='{{log_last_commit}}'>Commit ID:{{last_commit_id}}</span>
+        <span title='{{ log_last_commit }}'>Commit ID:{{ last_commit_id }}</span>
       </small>
 % else
   <h4>

data/lib/mutx/view/help/index.mote

@@ -0,0 +1,38 @@
+<?
+  title = (page == "main")? page : Mutx::Database::MongoConnector.help_title(page)
+  available_pages = Mutx::Database::MongoConnector.get_all_documentation.map{|doc| doc["title"].downcase}
+  query = query_string['s']
+?>
+
+<div class='container'>
+  <br>
+  <div class='jumbotron'>
+    <div class='container'>
+      <h1>
+        <a href='/help'>Help</a>
+        {{page.capitalize.gsub("_"," ")}}
+        <div class='col-sm-3 col-md-3 pull-right'>
+          <form class='navbar-form' role='search' action='/help/main' method='get'>
+            <div class='input-group'>
+              <input type='text' class='form-control' placeholder='Search' name='s' value="{{ query }}">
+              <div class='input-group-btn'>
+                <button  class='btn btn-info' type='submit'><i class='glyphicon glyphicon-search'></i></button>
+              </div>
+            </div>
+          </form>
+        </div>
+      </h1>
+      <!-- inicio content-->
+      % if query and !query.empty?
+        {{ partial('help/_search_result', query: query) }}
+      % else
+        % if available_pages.include? page
+          {{ partial('help/_page', page: page) }}
+        % else
+          {{ partial('help/_main') }}
+        % end
+      % end
+      <!-- fin content -->
+    </div>
+  </div>
+</div>

data/lib/mutx/view/layout/flash.mote

@@ -0,0 +1,7 @@
+<? flash.keys.each do |key| ?>
+    % value = flash[key]
+    % next unless value
+	<script type='text/javascript'>
+		$.notify("{{value[0..50]}}", "{{key}}");
+	</script>
+<? end ?>

data/lib/mutx/view/{footer.mote → layout/footer.mote}

@@ -9,4 +9,4 @@
       </div>
     </div>
   </div>
-  </footer>
+</footer>

data/lib/mutx/view/layout/javascript.mote

@@ -0,0 +1,6 @@
+<script src='/js/jquery.min.js'></script>
+<script src='/js/bootstrap.min.js'></script>
+<script src='/js/notify.min.js'></script>
+
+<script src='/js/mutx.js' type='text/javascript'></script>
+<script src='/js/jquery.json-viewer.js' type='text/javascript'></script>

data/lib/mutx/view/layout/navigation_bar.mote

@@ -0,0 +1,88 @@
+<nav class='navbar navbar-inverse navbar-fixed-top'>
+  <div class='container'>
+    <div class='navbar-header'>
+      <button type='button' class='navbar-toggle' data-toggle='collapse' data-target='.navbar-collapse'>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
+        <span class='icon-bar'></span>
+      </button>
+      <a class='navbar-brand' href='#'>{{ project_name }}</a>
+    </div>
+    <div class='collapse navbar-collapse'>
+      <ul class='nav navbar-nav'>
+        <li class='{{'active' if section =~ /^tasks?$/}}'>
+          <a href='{{ path_for(:tasks_index) }}'>
+            {{Mutx::View.icon_for('task')}}
+            Tasks
+          </a>
+        </li>
+        <li class='{{'active' if section =~ /^test/}}'>
+          <a href='{{ path_for(:tests_index) }}'>
+            {{Mutx::View.icon_for('test')}}
+            Tests
+          </a>
+        </li>
+      % if Mutx::Support::ProjectType.cucumber?
+        <li class='{{'active' if section =~ /^features?$/}}'>
+          <a href='{{ path_for(:features_index) }}'>
+            {{Mutx::View.icon_for('features')}}
+            Features
+          </a>
+        </li>
+      % end
+        <li class='{{'active' if section =~ /^repositor(?:y|ies)/}}'>
+          <a href='{{ path_for(:repositories_index) }}'>
+            {{Mutx::View.icon_for('repo')}}
+            Repositories
+          </a>
+        </li>
+        <li class='{{'active' if section =~ /^result/}}'>
+          <a href='{{ path_for(:results_index) }}'>
+            {{Mutx::View.icon_for('search')}}
+            Search results
+          </a>
+        </li>
+        <li class='{{'active' if section == "repo"}}'>
+          <a title='Open repository url' href='{{Mutx::Support::Configuration.project_url}}' target='_blank'>
+            {{Mutx::View.icon_for('left')}}
+            Code
+            {{Mutx::View.icon_for('right')}}
+          </a>
+        </li>
+        <li class='{{'active' if section =~ /^(admin|log)/}}'>
+          <a href='#' class='dropdown-toggle' data-toggle='dropdown' role= 'button' aria-expanded='false'>
+            {{Mutx::View.icon_for('admin')}}
+            Admin
+          </a>
+          <ul class='dropdown-menu' role='menu'>
+            <li><a href='{{ path_for(:admin_tasks_index) }}'>Tasks</a></li>
+            <li><a href='{{ path_for(:admin_custom_params_index) }}'>Custom Parameters</a></li>
+            <li><a href='{{ path_for(:admin_repositories_index) }}'>Repositories</a>
+            <li role="presentation" class="divider"></li>
+            <li><a href='{{ path_for(:logs_show, log_name: "mutx") }}'>Mutx Log</a>
+            <li><a href='{{ path_for(:logs_show, log_name: "sidekiq") }}'>Sidekiq Log</a>
+            <li role="presentation" class="divider"></li>
+            <!-- <li><a href='/admin/config'>Configuration</a></li>
+             -->
+          </ul>
+        </li>
+      % if $result
+        <li class='{{'active' if section == "logout"}}'>
+          <a href='{{ path_for(:logout) }}'>Logout</a>
+        </li>
+      % end
+        <li class='{{section == "help" ? 'active' : ''}}'>
+          <a href='{{ path_for(:help_index) }}'>
+            {{Mutx::View.icon_for('help')}}
+            Help
+          </a>
+        </li>
+      </ul>
+    </div>
+    <!--/.nav-collapse -->
+  </div>
+</nav>