Skip to content

I
intranet-wall
Commit 94ad66fe authored by Frank Bergmann's avatar Frank Bergmann
Browse files
Options

- Wall: 

  Removed idea-management variabls and replaced with first "Wall" version
parent 3420ba36
Pipeline #1007 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 43 additions and 158 deletions
      sql/postgresql/intranet-wall-create.sql
      View file @ 94ad66fe
      ......@@ -9,6 +9,15 @@
      SELECT im_lang_add_message('en_US','intranet-wall','Comments','Comments');
      SELECT im_lang_add_message('en_US','intranet-wall','Status','Status');
      SELECT im_lang_add_message('en_US','intranet-wall','Type','Type');
      SELECT im_lang_add_message('en_US','intranet-wall','Thumbs','Thumbs');
      SELECT im_lang_add_message('en_US','intranet-wall','Name','Name');
      SELECT im_lang_add_message('en_US','intranet-wall','Description_of_activities','Description of Activities');
      ---------------------------------------------------------
      -- Wall Menu
      --
      ......
      www/index.adp
      View file @ 94ad66fe
      ......@@ -19,11 +19,11 @@ function thumbs_change (name, object) {
      <if @show_template_p@>
      <table>
      <tr valign=top>
      <td width="60%">
      <td width="100%">
      </if>
      <h1>@page_title@</h1>
      <p>#intranet-wall-management.Description_of_activities#</p>
      <p>#intranet-wall.Description_of_activities#</p>
      <form method=post action="/intranet-helpdesk/action">
      <%= [export_form_vars {return_url} ] %>
      ......@@ -32,150 +32,34 @@ function thumbs_change (name, object) {
      <table class="list">
      <tr class="list-header">
      <if @user_is_admin_p@>
      <th class="list-narrow" align=center>
      <input type=checkbox name="_dummy" onclick="acs_ListCheckAll('wall_list', this.checked)" title="Check/uncheck all rows">
      </th>
      </if>
      <th class="list-narrow">#intranet-wall-management.Votes#</th>
      <th class="list-narrow">#intranet-wall-management.Name#</th>
      <th class="list-narrow">#intranet-wall.User#</th>
      <th class="list-narrow">#intranet-wall.Object#</th>
      <th class="list-narrow">#intranet-wall.Name#</th>
      </tr>
      <multiple name=wall>
      <if @wall.rownum@ odd><tr class="list-odd" valign=top></if>
      <else><tr class="list-even" valign=top></else>
      <if @user_is_admin_p@>
      <td class="list-narrow">
      <input type=checkbox name=tid value=@wall.wall_id@ id='ticket,@wall.wall_id@'>
      </td>
      </if>
      <if @wall.rownum@ odd><tr class="list-odd" valign=top></if>
      <else><tr class="list-even" valign=top></else>
      <td align=center>
      <div style="width: 50px; height: 35px; border: solid 1px #ccc; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; text-align: center">
      <div style="color: #333; margin-bottom: -0.1em; letter-spacing: -1px; font-weight: bold; font-size: 200%">
      <if "" ne @wall.thumbs_up_count@>
      @wall.thumbs_up_count@
      </div>
      <if 1 eq @wall.thumbs_up_count@>#intranet-wall-management.Thumb#</if>
      <else>#intranet-wall-management.Thumbs#</else>
      </div>
      </if>
      <if "up" eq @wall.thumbs_direction@>
      <a href="@wall.thumbs_undo_url;noquote@" onmouseover="thumbs_change('thumbs_@wall.rownum@', Thumbs_up_pale)" onmouseout="thumbs_change('thumbs_@wall.rownum@', Thumbs_up_pressed)">
      <img src="@thumbs_up_pressed_24_gif;noquote@" name="thumbs_@wall.rownum@" title="#intranet-wall-management.Press_here_to_redraw_your_vote_for_this_wall#" border='0' style='margin-top:3px'></a><br>
      </if>
      <else>
      <a href="@wall.thumbs_up_url;noquote@" onmouseover="thumbs_change('thumbs_@wall.rownum@', Thumbs_up_pressed)" onmouseout="thumbs_change('thumbs_@wall.rownum@', Thumbs_up_pale)">
      <img src="@thumbs_up_pale_24_gif;noquote@" name="thumbs_@wall.rownum@" title="#intranet-wall-management.Press_here_to_vote_for_this_wall#" border='0' style='margin-top:3px'></a><br>
      </else>
      <%= [im_portrait_html $user_id] %>
      </td>
      <td align=left>
      <a href=@container_object_url@>@container_object_type_l10n@ @container_object_name@</a> /<br>
      <a href=@specific_object_url@>@specific_object_type_l10n@ @specific_object_name@</a>
      </td>
      <td class="list-narrow">
      <a href="@wall.wall_url;noquote@">@wall.project_name@</a>
      <br>
      @wall.wall_description;noquote@
      <br>
      #intranet-wall-management.From#: <a href="@wall.creator_url;noquote@">@wall.creator_name@</a>
      |
      <a href="@wall.wall_url;noquote@">
      @wall.comment_count@
      <if @wall.comment_count@ eq 1>#intranet-wall-management.Comment#</if>
      <else>#intranet-wall-management.Comments#</else></a>
      |
      <if @wall.comment_count@>
      </if>
      #intranet-wall-management.Status#: @wall.ticket_status@
      |
      #intranet-wall-management.Type#: @wall.ticket_type@
      |
      <a href="@wall.comments_url;noquote@"
      ><%= [im_gif comments [lang::message::lookup "" intranet-wall-management.Comment_on_wall "Comment on wall"]]
      %></a>
      |
      <a href="@wall.dollar_url;noquote@"
      ><%= [im_gif money_dollar [lang::message::lookup "" intranet-wall-management.Share_development_costs "Share development costs"]]
      %></a>
      @wall.message@
      </td>
      </tr>
      </multiple>
      <if @ticket_bulk_actions_p@>
      <tfoot>
      <tr valign=top>
      <td align=left colspan=3 valign=top>
      <%= [im_category_select \
      -translate_p 1 \
      -package_key "intranet-helpdesk" \
      -plain_p 1 \
      -include_empty_p 1 \
      -include_empty_name "" \
      "Intranet Ticket Action" \
      action_id \
      ]
      %>
      <input type=submit value='#intranet-helpdesk.Update_Tickets#'>
      </td>
      </tr>
      </tfoot>
      </if>
      </table>
      </form>
      <if @show_template_p@>
      </td>
      <td align=left width="40%">
      </if>
      <if @survey_count@></if>
      <else>
      <h1>#intranet-wall-management.Increase_the_Weight_of_your_Votes#</h1>
      #intranet-wall-management.You_havent_yet_filled_our_one_of_the_following_surveys#.<br>
      #intranet-wall-management.Filling_out_the_survey_will_increase_the_weight_of_your_votes#:<br>
      &nbsp;
      <ul>
      <li>Are you a potential ]po[ user?<br>
      Then please take the <a href="/simple-survey/one?return_url=&survey_id=438275">Potential User Feedback</a>
      <br>&nbsp;
      <li>Are you a productive ]po[ user?<br>
      Then please take the <a href="/simple-survey/one?return_url=&survey_id=438249">Productive User Feedback</a>
      <br>&nbsp;
      <li>Are you a ]po[ partner? <br>
      Then please take the <a href="/simple-survey/one?return_url=&survey_id=305439">Partner Survey</a>.
      <br>&nbsp;
      </ul>
      </else>
      <h1>Create a new Wall</h1>
      <p>
      #intranet-wall-management.Please_check_for_duplicate_wall#
      </p>
      <form action="/intranet-wall-management/wall-new" method=POST>
      <%= [export_form_vars return_url] %>
      <table width="100%">
      <tr class=rowodd>
      <td>#intranet-wall-management.Title#:</td>
      <td><input type=text size=40 name=wall_title value="#intranet-wall-management.Catchy_phrase_for_your_wall#"></td>
      </tr>
      <tr class=roweven>
      <td>#intranet-wall-management.Description#:</td>
      <td><textarea name=wall_description cols=30 rows=3>#intranet-wall-management.One_or_two_paragraphs_to_describe_your_wall#</textarea></td>
      </tr>
      <tr class=rowodd>
      <td>#intranet-wall-management.Submit#:</td>
      <td><input type=submit></td>
      </tr>
      </table>
      </form>
      <if @show_template_p@>
      </td>
      </tr>
      ......
      www/index.tcl
      View file @ 94ad66fe
      ......@@ -89,43 +89,35 @@ foreach form_var [ad_ns_set_keys $form_vars] {
      set wall_sql [lang::message::format $wall_sql $substitution_list]
      # append wall_sql "\nLIMIT 10"
      # ---------------------------------------------------------------
      # Create the main walls multirow
      # ---------------------------------------------------------------
      set user_id 0
      set wall_id 0
      set forum_topic_id 0
      set ticket_description ""
      db_multirow -extend { ticket_status ticket_type thumbs_up_count thumbs_direction wall_description comment_count wall_url project_name wall_id type thumbs_down_url thumbs_up_url thumbs_undo_url dollar_url comments_url creator_url creator_name } wall wall_query $wall_sql {
      db_multirow -extend { container_object_url container_object_type_l10n specific_object_url specific_object_type_l10n } wall wall_query $wall_sql {
      set container_object_url [util_memoize [list db_string container_object_url "
      select url
      from im_biz_object_urls
      where object_type = '$container_object_type' and
      url_type = 'view'
      "]]
      append container_object_url $container_object_id
      set container_object_type_l10n [lang::message::lookup "" intranet-core.$container_object_type $container_object_type]
      set specific_object_url [util_memoize [list db_string specific_object_url "
      select url
      from im_biz_object_urls
      where object_type = '$specific_object_type' and
      url_type = 'view'
      "]]
      append specific_object_url $specific_object_id
      set specific_object_type_l10n [lang::message::lookup "" intranet-core.$specific_object_type $specific_object_type]
      set wall_id $container_object_id
      set type "wall_project_tasks"
      set thumbs_up_count 0
      set comment_count 0
      set thumbs_direction "up"
      set project_name $container_object_name
      set wall_description "adsf"
      set ticket_status "status"
      set ticket_type "type"
      set wall_url [export_vars -base "/intranet-wall/redirect-to-ticket" {{ticket_id $wall_id} return_url}]
      set dollar_url [export_vars -base "/intranet-wall/dollar-action" {return_url ticket_id}]
      set comments_url [export_vars -base "/intranet-forum/new" {return_url {parent_id $forum_topic_id}}]
      set wall_description [ns_quotehtml [string range $ticket_description 0 $max_description_len]]
      if {[string length $wall_description] >= $max_description_len} { append wall_description "... (<a href='$wall_url'>more</a>)" }
      set creator_name $user_name
      if {[regexp {^([a-z0-9A-Z\-_]*)@} $creator_name match username_body]} { set creator_name $username_body }
      set creator_url [export_vars -base "/intranet/users/view" {{user_id $user_id}}]
      set thumbs_up_url [export_vars -base "/intranet-wall/thumbs-action" {return_url {ticket_id $wall_id} {direction up}}]
      set thumbs_down_url [export_vars -base "/intranet-wall/thumbs-action" {return_url {ticket_id $wall_id} {direction down}}]
      set thumbs_undo_url [export_vars -base "/intranet-wall/thumbs-action" {return_url {ticket_id $wall_id} {direction undo}}]
      }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment