app/controllers/conversationmessages_controller.rb app/helpers/conversationmessages_helper.rb app/models/conversation.rb app/models/conversationmessage.rb app/views/conversationmessages/index.html.erb db/migrate/20090628222525_create_conversationmessages.rb db/migrate/20090628225235_add_methodto_conversationmessages.rb db/migrate/20090628230004_create_conversations.rb db/migrate/20090628230754_add_conversation_id_to_conversations.rb db/migrate/20090628233034_rename_conversationmessage_type_to_direction.rb db/migrate/20090712175027_add_conversation_debug_settings.rb public/images/icons/arrow_left.png public/images/icons/arrow_right.png test/fixtures/conversationmessages.yml test/fixtures/conversations.yml test/functional/conversationmessages_controller_test.rb test/unit/conversation_test.rb test/unit/conversationmessage_test.rb test/unit/helpers/conversationmessages_helper_test.rb @@ -30,6 +30,13 @@ <%= error_message_on(:settings, :mail_usetls) %> </p> + <p> + <%= f.check_box :conversation_logging_smtp, { :checked => friendly_nil(@settings.conversation_logging_smtp), :style => "float: left;" } %> + <%= f.label :conversation_logging_smtp, 'Enable conversation logging?' %> + (Your password and username will be visible in the<br />"Notification method debugging" section for admins<br />if you enable this) + <%= error_message_on(:settings, :conversation_logging_smtp) %> + </p> + <p><%= submit_tag "Save Settings" %></p> <% end %> </div> app/views/settings/email.html.erb @@ -14,6 +14,13 @@ <%= label_txtfd_err(f, :xmpp_user, 'XMPP username', @settings.xmpp_user, :settings) %> <%= label_pwdfd_err(f, :xmpp_pass, 'XMPP password', @settings.xmpp_pass, :settings) %> <%= label_txtfd_err(f, :xmpp_resource, 'XMPP resource', @settings.xmpp_resource, :settings) %> + <p> + <%= f.check_box :conversation_logging_xmpp, { :checked => friendly_nil(@settings.conversation_logging_xmpp), :style => "float: left;" } %> + <%= f.label :conversation_logging_xmpp, 'Enable conversation logging?' %> + (Your password and username will be visible in the<br />"Notification method debugging" section for admins<br />if you enable this) + <%= error_message_on(:settings, :conversation_logging_xmpp) %> + </p> + <p><%= submit_tag "Save Settings" %></p> <% end %> </div> app/views/settings/xmpp.html.erb @@ -39,6 +39,7 @@ <h3>Miscellaneous</h3> <ul> + <li><%= link_to "Notification method debugging", :controller => "conversationmessages" %></li> <li><%= link_to "Blacklist", :controller => "blacklist" %></li> </ul> app/views/setup/index.html.erb @@ -19,7 +19,7 @@ <span class="sensor-okay-text"><%= @db_connections %></span> <% end %> </dd> - <dt>Maximum allowed connection</dt> + <dt>Maximum allowed connections</dt> <dd><%= @db_connections_max %></dd> </dl> app/views/vitals/index.html.erb @@ -469,3 +469,39 @@ #nodes-edit { margin-top: 10px; } + +/* + * Notification method debugging + */ + +.conversations-conversations { + margin-top: 15px; +} + +.conversations-conversation-title { + font-weight: bold; +} + +.conversations-conversation-messages { + list-style-type: none; + margin: 0px; + padding: 0px; + margin-top: 5px; + margin-bottom: 5px; +} + +.conversations-conversation-message-sent { + color: #000000; + background-color: #ffb5b5; + padding-left: 10px; +} + +.conversations-conversation-message-received { + color: #000000; + background-color: #c1ffb5; + padding-left: 15px; +} + +#conversations-clear { + margin-top: 15px; +} public/stylesheets/sections.css 662c20da6d5a9fdc63768dc414c12f540fdccf81 lennartkoopmann lennart@scopeport.org http://github.com/lennartkoopmann/scopeport-web-interface/commit/ee009d761f4ec83c80a3503f50d0a89536fef171 ee009d761f4ec83c80a3503f50d0a89536fef171 2009-07-12T12:53:28-07:00 2009-07-12T12:53:28-07:00 Now supporting conversation logging of current server version. Server update and migration needed. 8e4917eb606a38c9df64f55f705e59c59d4d1769 lennartkoopmann lennart@scopeport.org